From a43c2749ba273f59f7f30d1cb5ecb083ecdcce4d Mon Sep 17 00:00:00 2001
From: Rob Falkenstein <rob.falkenstein@rz.uni-freiburg.de>
Date: Mon, 9 Feb 2026 16:00:20 +0100
Subject: [PATCH 001/141] added fwolf-ilias as authority for WAC and
 ActiveRecord and removed Context from unmaintaned components

---
 docs/development/maintenance.md | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/docs/development/maintenance.md b/docs/development/maintenance.md
index b0cddc26a8c3..0e2cbdb11d84 100755
--- a/docs/development/maintenance.md
+++ b/docs/development/maintenance.md
@@ -176,12 +176,12 @@ of ILIAS. The file contains the following fields:
 [//]: # (BEGIN ActiveRecord)
 
 * **ActiveRecord**
-    * Authority to Sign off on Conceptual Changes: MISSING
-    * Authority to Sign off on Code Changes: MISSING
+    * Authority to Sign off on Conceptual Changes: [fwolf-ilias](https://docu.ilias.de/go/usr/29018)
+    * Authority to Sign off on Code Changes: [fwolf-ilias](https://docu.ilias.de/go/usr/29018)
     * Authority to Curate Test Cases: MISSING
-    * Authority to (De-)Assign Authorities: MISSING
-    * Assignee for Issues: MISSING
-    * Assignee for Security Reports: MISSING
+    * Authority to (De-)Assign Authorities: [fwolf-ilias](https://docu.ilias.de/go/usr/29018)
+    * Assignee for Issues: [fwolf-ilias](https://docu.ilias.de/go/usr/29018)
+    * Assignee for Security Reports: [fwolf-ilias](https://docu.ilias.de/go/usr/29018)
     * Unit-specific Guidelines, Rules, and Regulations: [LINK MISSING]('')
 
 [//]: # (END ActiveRecord)
@@ -1558,12 +1558,12 @@ of ILIAS. The file contains the following fields:
 [//]: # (BEGIN WebAccessChecker)
 
 * **Web Access Checker**
-    * Authority to Sign off on Conceptual Changes: MISSING 
-    * Authority to Sign off on Code Changes: [ukohnle](https://docu.ilias.de/go/usr/21855)
+    * Authority to Sign off on Conceptual Changes: [fwolf-ilias](https://docu.ilias.de/go/usr/29018)
+    * Authority to Sign off on Code Changes: [fwolf-ilias](https://docu.ilias.de/go/usr/29018), [ukohnle](https://docu.ilias.de/go/usr/21855)
     * Authority to Curate Test Cases: [AUTHOR MISSING](https://docu.ilias.de/go/pg/64423_4793)
-    * Authority to (De-)Assign Authorities: MISSING
-    * Assignee for Issues: MISSING
-    * Assignee for Security Reports: MISSING
+    * Authority to (De-)Assign Authorities: [fwolf-ilias](https://docu.ilias.de/go/usr/29018)
+    * Assignee for Issues: [fwolf-ilias](https://docu.ilias.de/go/usr/29018)
+    * Assignee for Security Reports: [fwolf-ilias](https://docu.ilias.de/go/usr/29018)
     * Unit-specific Guidelines, Rules, and Regulations: [LINK MISSING]('')
 
 [//]: # (END WebAccessChecker)
@@ -1650,7 +1650,6 @@ of ILIAS. The file contains the following fields:
 
 The following directories are currently unmaintained:
 
-* ILIAS/Context
 * ILIAS/CSV
 * ILIAS/EventHandling
 

From a0a524563f73741f9a72f135a810363c5a34ace2 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Wed, 11 Feb 2026 14:45:58 +0100
Subject: [PATCH 002/141] 45544: No questions after import on same ILIAS
 installation

---
 components/ILIAS/COPage/PC/Question/QuestionManager.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/ILIAS/COPage/PC/Question/QuestionManager.php b/components/ILIAS/COPage/PC/Question/QuestionManager.php
index e0fc3829caa7..10f4206b9c29 100755
--- a/components/ILIAS/COPage/PC/Question/QuestionManager.php
+++ b/components/ILIAS/COPage/PC/Question/QuestionManager.php
@@ -47,7 +47,11 @@ public function resolveQuestionReferences(
         foreach ($nodes as $node) {
             $qref = $node->getAttribute("QRef");
             if (isset($a_mapping[$qref])) {
-                $node->setAttribute("QRef", "il__qst_" . $a_mapping[$qref]["pool"]);
+                $new_id = (int) ($a_mapping[$qref]["pool"] ?? 0);
+                if ($new_id === 0 && isset($a_mapping[$qref]["test"])) {    // changed with 10
+                    $new_id = $a_mapping[$qref]["test"];
+                }
+                $node->setAttribute("QRef", "il__qst_" . $new_id);
                 $updated = true;
             }
         }

From b363faba208c66251f784426f471d03dfb9eb150 Mon Sep 17 00:00:00 2001
From: mjansen <mjansen@databay.de>
Date: Wed, 11 Feb 2026 09:44:04 +0100
Subject: [PATCH 003/141] SAML: Add activation check in authentication process

(cherry picked from commit bd4a80d8afa7672151194c6a5f48b0ab27482bf5)
---
 .../ILIAS/Saml/classes/class.ilAuthProviderSaml.php   | 11 +++++++++++
 lang/ilias_de.lang                                    |  1 +
 lang/ilias_en.lang                                    |  3 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/components/ILIAS/Saml/classes/class.ilAuthProviderSaml.php b/components/ILIAS/Saml/classes/class.ilAuthProviderSaml.php
index 7ad59282fe7e..81afe48f9496 100755
--- a/components/ILIAS/Saml/classes/class.ilAuthProviderSaml.php
+++ b/components/ILIAS/Saml/classes/class.ilAuthProviderSaml.php
@@ -25,6 +25,7 @@ class ilAuthProviderSaml extends ilAuthProvider implements ilAuthProviderAccount
     private const string LOG_COMPONENT = 'auth';
 
     private const string ERR_WRONG_LOGIN = 'err_wrong_login';
+    private const string ERR_PROVIDER_INACTIVE = 'auth_saml_idp_deactivated_auth_failed';
 
     private const string SESSION_TMP_ATTRIBUTES = 'tmp_attributes';
     private const string SESSION_TMP_RETURN_TO = 'tmp_return_to';
@@ -83,6 +84,16 @@ private function determineUidFromAttributes(): void
 
     public function doAuthentication(ilAuthStatus $status): bool
     {
+        if (!$this->idp->isActive()) {
+            $this->getLogger()->info(
+                'SAML IdP with id {idp_id} is not active.',
+                ['idp_id' => $this->idp->getIdpId()]
+            );
+            $status->setStatus(ilAuthStatus::STATUS_AUTHENTICATION_FAILED);
+            $status->setTranslatedReason($this->lng->txt(self::ERR_PROVIDER_INACTIVE));
+            return false;
+        }
+
         if ([] === $this->attributes) {
             $this->getLogger()->warning('Could not parse any attributes from SAML response.');
             $this->handleAuthenticationFail($status, self::ERR_WRONG_LOGIN);
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 3c0dda007fce..fa19408b418b 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -2125,6 +2125,7 @@ auth#:#auth_saml_deleted_idp#:#Der Identity-Provider wurde gelöscht.
 auth#:#auth_saml_enable#:#SAML-Unterstützung aktivieren
 auth#:#auth_saml_err_sqlite_driver#:#Die SAML-Authentifizierung benötigt die SQLite-Treiber für PHP. Bitte installieren Sie diese und versuchen Sie es erneut.
 auth#:#auth_saml_idp#:#IDP
+auth#:#auth_saml_idp_deactivated_auth_failed#:#Der IDP ist nicht aktiviert, Authentifizierung gescheitert.
 auth#:#auth_saml_idp_selection_table_desc#:#Bitte wählen Sie den Identity-Provider aus, mit dem Sie sich einloggen möchten.
 auth#:#auth_saml_idp_selection_table_title#:#Identity-Provider
 auth#:#auth_saml_idp_settings#:#IDP Einstellungen
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index 38f11d985a92..1e4458283d30 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -2125,7 +2125,8 @@ auth#:#auth_saml_deleted_idp#:#The Identity Provider has been deleted.
 auth#:#auth_saml_enable#:#Enable SAML Support
 auth#:#auth_saml_err_sqlite_driver#:#The SAML authentication requires the SQLite driver for PHP. Please install the SQLite package and try again.
 auth#:#auth_saml_idp#:#IDP
-auth#:#auth_saml_idp_selection_table_desc#:#Bitte wählen Sie den Identity Provider mit dem Sie sich anmelden möchten.
+auth#:#auth_saml_idp_deactivated_auth_failed#:#Authentication failed, the identity provider is disabled.
+auth#:#auth_saml_idp_selection_table_desc#:#Please select the identity provider you want to log in with.
 auth#:#auth_saml_idp_selection_table_title#:#Identity Provider Selection
 auth#:#auth_saml_idp_settings#:#IDP Settings
 auth#:#auth_saml_idps#:#SAML IDP List

From 9201b23d16c7b97972ea09d566522268cc2b5618 Mon Sep 17 00:00:00 2001
From: mjansen <mjansen@databay.de>
Date: Wed, 11 Feb 2026 09:17:59 +0100
Subject: [PATCH 004/141] OIDC: Add activation check in authentication process

---
 .../class.ilAuthProviderOpenIdConnect.php      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/components/ILIAS/OpenIdConnect/classes/class.ilAuthProviderOpenIdConnect.php b/components/ILIAS/OpenIdConnect/classes/class.ilAuthProviderOpenIdConnect.php
index 8aba3b2b070d..59400714c05f 100755
--- a/components/ILIAS/OpenIdConnect/classes/class.ilAuthProviderOpenIdConnect.php
+++ b/components/ILIAS/OpenIdConnect/classes/class.ilAuthProviderOpenIdConnect.php
@@ -24,6 +24,9 @@ class ilAuthProviderOpenIdConnect extends ilAuthProvider
 {
     private const OIDC_AUTH_IDTOKEN = 'oidc_auth_idtoken';
 
+    private const ERR_AUTH_FAILED = 'auth_oidc_failed';
+    private const ERR_AUTH_WRONG_LOGIN = 'err_wrong_login';
+
     private readonly ilOpenIdConnectSettings $settings;
     /** @var array $body */
     private readonly ilLogger $logger;
@@ -65,6 +68,13 @@ public function handleLogout(): void
 
     public function doAuthentication(ilAuthStatus $status): bool
     {
+        if (!$this->settings->getActive()) {
+            $status->setStatus(ilAuthStatus::STATUS_AUTHENTICATION_FAILED);
+            $status->setTranslatedReason($this->lng->txt(self::ERR_AUTH_FAILED));
+            $this->logger->info('Authentication aborted, OIDC authentication is disabled');
+            return false;
+        }
+
         try {
             $oidc = $this->initClient();
             $oidc->setRedirectURL(ILIAS_HTTP_PATH . '/openidconnect.php');
@@ -107,7 +117,7 @@ public function doAuthentication(ilAuthStatus $status): bool
             $this->logger->warning($e->getMessage());
             $this->logger->warning((string) $e->getCode());
             $status->setStatus(ilAuthStatus::STATUS_AUTHENTICATION_FAILED);
-            $status->setTranslatedReason($this->lng->txt('auth_oidc_failed'));
+            $status->setTranslatedReason($this->lng->txt(self::ERR_AUTH_FAILED));
             return false;
         }
     }
@@ -121,7 +131,7 @@ private function handleUpdate(ilAuthStatus $status, $user_info): ilAuthStatus
             $this->logger->error('Received invalid user credentials: ');
             $this->logger->dump($user_info, ilLogLevel::ERROR);
             $status->setStatus(ilAuthStatus::STATUS_AUTHENTICATION_FAILED);
-            $status->setReason('err_wrong_login');
+            $status->setReason(self::ERR_AUTH_WRONG_LOGIN);
             return $status;
         }
 
@@ -132,7 +142,7 @@ private function handleUpdate(ilAuthStatus $status, $user_info): ilAuthStatus
             $this->logger->error('Could not determine valid external account, value is empty or not a string.');
             $this->logger->dump($user_info, ilLogLevel::ERROR);
             $status->setStatus(ilAuthStatus::STATUS_AUTHENTICATION_FAILED);
-            $status->setReason('err_wrong_login');
+            $status->setReason(self::ERR_AUTH_WRONG_LOGIN);
             return $status;
         }
 
@@ -156,7 +166,7 @@ private function handleUpdate(ilAuthStatus $status, $user_info): ilAuthStatus
             //$_GET['target'] = $this->getCredentials()->getRedirectionTarget();// TODO PHP8-REVIEW Please eliminate this. Mutating the request is not allowed and will not work in ILIAS 8.
         } catch (ilOpenIdConnectSyncForbiddenException) {
             $status->setStatus(ilAuthStatus::STATUS_AUTHENTICATION_FAILED);
-            $status->setReason('err_wrong_login');
+            $status->setReason(self::ERR_AUTH_WRONG_LOGIN);
         }
 
         return $status;

From 636b5355e746a8dd007bce024c0c24796cfe3308 Mon Sep 17 00:00:00 2001
From: Matthias Kunkel <mkunkel@me.com>
Date: Wed, 11 Feb 2026 15:43:04 +0100
Subject: [PATCH 005/141] =?UTF-8?q?Typo=20Benachrichtigungs-Einstellungen?=
 =?UTF-8?q?=20=E2=86=92=20Benachrichtigungseinstellungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit a0d7c9a79174a4753ac1f2e9328d8f18bc71a222)
---
 lang/ilias_de.lang | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index fa19408b418b..5ca54927432f 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -3027,9 +3027,9 @@ chatroom#:#messages#:#Nachrichten
 chatroom#:#no_further_users#:#Keine weiteren Benutzer anwesend.
 chatroom#:#no_messages#:#Es sind keine Nachrichten für den ausgewählten Zeitraum verfügbar.
 chatroom#:#no_username_given#:#Bitte wählen Sie einen Anmeldenamen!
-chatroom#:#osc_browser_noti_no_permission_error#:#Bitte entfernen Sie die ILIAS-Domain von der Liste der blockierten Websites in den Benachrichtigungs-Einstellungen Ihres Browsers oder Betriebssystems. Andernfalls kann ILIAS keine Browser-Benachrichtigungen zustellen.
+chatroom#:#osc_browser_noti_no_permission_error#:#Bitte entfernen Sie die ILIAS-Domain von der Liste der blockierten Websites in den Benachrichtigungseinstellungen Ihres Browsers oder Betriebssystems. Andernfalls kann ILIAS keine Browser-Benachrichtigungen zustellen.
 chatroom#:#osc_browser_noti_no_support_error#:#Browser-Benachrichtigungen werden mit Ihrem aktuellem Browser nicht unterstützt. Bitte stellen Sie sicher, dass Sie via HTTPS auf ILIAS zugreifen, und Ihr Browser als <a href="https://caniuse.com/#feat=notifications" target="_blank" rel="noopener noreferrer">unterstützter Browser</a> aufgelistet wird.
-chatroom#:#osc_browser_noti_req_permission_error#:#Die Browser-Benachrichtigungen konnten nicht aktiviert werden, da Sie den Zugriff in Ihrem Browser verweigert haben. Bitte entfernen Sie die ILIAS-Domain von der Liste der blockierten Websites in den Benachrichtigungs-Einstellungen Ihres Browsers oder Betriebssystems.
+chatroom#:#osc_browser_noti_req_permission_error#:#Die Browser-Benachrichtigungen konnten nicht aktiviert werden, da Sie den Zugriff in Ihrem Browser verweigert haben. Bitte entfernen Sie die ILIAS-Domain von der Liste der blockierten Websites in den Benachrichtigungseinstellungen Ihres Browsers oder Betriebssystems.
 chatroom#:#osc_enable_browser_notifications_info#:#Wenn aktiviert, erhalten Sie beim Eintreffen neuer Chats oder Chat-Nachrichten eine Browser-Benachrichtigung, wenn zwischen zwei Chat-Beiträgen mehr als %s Minute(n) vergangen ist/sind. Befindet sich ILIAS im Hintergrund und arbeiten Sie in anderen Browser-Tabs, oder ist der Browser ausgeblendet, erhalten Sie ebenfalls eine Benachrichtigung.
 chatroom#:#osc_enable_browser_notifications_label#:#Browser-Benachrichtigungen
 chatroom#:#osc_noti_title#:#Neue Chat-Nachricht
@@ -10154,7 +10154,7 @@ forum#:#new_post#:#Neuer Beitrag
 forum#:#new_thread_with_post#:#Neues Thema mit Beitrag
 forum#:#no_forum_selected#:#Kein Forum für die Verschiebeaktion ausgewählt!
 forum#:#not_allowed_to_merge_into_another_forum#:#Es ist nicht möglich Themen verschiedener Foren zusammenzuführen.
-forum#:#notification_settings#:#Benachrichtigungs-Einstellungen
+forum#:#notification_settings#:#Benachrichtigungseinstellungen
 forum#:#notify_censored#:#Zensierte Beiträge
 forum#:#notify_modified#:#Geänderte Beiträge
 forum#:#notify_post_deleted#:#Gelöschte Beiträge

From b9a0ab7fcc7f8671fcee0c0bad557f2034cfcb1c Mon Sep 17 00:00:00 2001
From: Aleksandr Litvin <litvin@leifos.de>
Date: Wed, 11 Feb 2026 16:14:31 +0000
Subject: [PATCH 006/141] fix no role bug 0047137 (#11108)

* fix no role bug 0047137

* remove comment
---
 .../Membership/classes/class.ilMembershipGUI.php     | 12 ++++++++----
 lang/ilias_de.lang                                   |  1 +
 lang/ilias_en.lang                                   |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/components/ILIAS/Membership/classes/class.ilMembershipGUI.php b/components/ILIAS/Membership/classes/class.ilMembershipGUI.php
index 4d0b6609128a..e4022452aa3a 100755
--- a/components/ILIAS/Membership/classes/class.ilMembershipGUI.php
+++ b/components/ILIAS/Membership/classes/class.ilMembershipGUI.php
@@ -61,6 +61,7 @@ public function __construct(ilObjectGUI $repository_gui, ilObject $repository_ob
         $this->tpl = $DIC->ui()->mainTemplate();
         $this->ctrl = $DIC->ctrl();
         $this->lng->loadLanguageModule('trac');
+        $this->lng->loadLanguageModule('mmbr');
         $this->logger = $DIC->logger()->mmbr();
         $this->access = $DIC->access();
         $this->user = $DIC->user();
@@ -575,8 +576,13 @@ public function updateParticipants(): void
                 $post_roles[$usr_id][] = $adminRoleId;
             }
 
+            if (!isset($post_roles[$usr_id]) || empty($post_roles[$usr_id])) {
+                $this->tpl->setOnScreenMessage('failure', $this->lng->txt('mmbr_role_error'), true);
+                $this->ctrl->redirect($this, 'participants');
+            }
+
             // Validate the role ids in the post data
-            foreach ((array) $post_roles[$usr_id] as $role_id) {
+            foreach ((array) ($post_roles[$usr_id] ?? []) as $role_id) {
                 if (!array_key_exists($role_id, $assignableLocalRoles)) {
                     $this->tpl->setOnScreenMessage('failure', $this->lng->txt('msg_no_perm_perm'), true);
                     $this->ctrl->redirect($this, 'participants');
@@ -618,7 +624,7 @@ public function updateParticipants(): void
         }
 
         foreach ($participants as $usr_id) {
-            $this->getMembersObject()->updateRoleAssignments($usr_id, (array) $post_roles[$usr_id]);
+            $this->getMembersObject()->updateRoleAssignments($usr_id, (array) ($post_roles[$usr_id] ?? []));
 
             // Disable notification for all of them
             $this->getMembersObject()->updateNotification($usr_id, false);
@@ -1186,7 +1192,6 @@ public function confirmRefuseSubscribers(): void
             $this->tpl->setOnScreenMessage('failure', $this->lng->txt("crs_no_subscribers_selected"), true);
             $this->ctrl->redirect($this, 'participants');
         }
-        $this->lng->loadLanguageModule('mmbr');
         $c_gui = new ilConfirmationGUI();
         // set confirm/cancel commands
         $c_gui->setFormAction($this->ctrl->getFormAction($this, "refuseSubscribers"));
@@ -1419,7 +1424,6 @@ public function confirmRefuseFromList(): void
             $this->tpl->setOnScreenMessage('failure', $this->lng->txt("no_checkbox"), true);
             $this->ctrl->redirect($this, 'participants');
         }
-        $this->lng->loadLanguageModule('mmbr');
         $c_gui = new ilConfirmationGUI();
 
         // set confirm/cancel commands
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 5ca54927432f..588f6cedd46d 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -12806,6 +12806,7 @@ mmbr#:#mmbr_awrn_my_groups_courses_info#:#Alle Mitglieder von Gruppen und Kursen
 mmbr#:#mmbr_btn_mail_selected_users#:#Mail verschicken
 mmbr#:#mmbr_info_delete_sure_unsubscribe#:#Wollen Sie wirklich die Mitgliedschaft für die folgenden Kurse und Gruppen beenden?
 mmbr#:#mmbr_memberships#:#Mitgliedschaften
+mmbr#:#mmbr_role_error#:#Mitglieder müssen mindestens eine Rolle haben.
 mmbr#:#mmbr_selected_users#:#Ausgewählte Teilnehmer
 mmbr#:#mmbr_unsubscribed_from_objs#:#Sie wurden von den ausgewählten Objekten abgemeldet.
 mme#:#add_languages#:#Sprache hinzufügen
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index 1e4458283d30..06c2a6135ee2 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -12779,6 +12779,7 @@ mmbr#:#mmbr_awrn_my_groups_courses_info#:#All members of groups or courses of th
 mmbr#:#mmbr_btn_mail_selected_users#:#Send Mail
 mmbr#:#mmbr_info_delete_sure_unsubscribe#:#Are you sure you want to unsubscribe from the following objects?
 mmbr#:#mmbr_memberships#:#Memberships
+mmbr#:#mmbr_role_error#:#Members must have at least one role assigned.
 mmbr#:#mmbr_selected_users#:#Selected Participants
 mmbr#:#mmbr_unsubscribed_from_objs#:#You have been unsubscribed from the selected objects.
 mme#:#add_languages#:#Add Language

From 9dead2b1d54b6f5d103178d5fa6e00c6346d63a6 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Wed, 11 Feb 2026 17:19:39 +0100
Subject: [PATCH 007/141] =?UTF-8?q?44522:=20Die=20gew=C3=A4hlte=20Option?=
 =?UTF-8?q?=20springt=20auf=20die=20erste=20Stelle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ILIAS/Repository/Service/Form/class.FormAdapterGUI.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php b/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php
index 8a4d133db6b6..3715802c998f 100755
--- a/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php
+++ b/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php
@@ -410,10 +410,6 @@ public function radio(
     ): self {
         $this->values[$key] = $value;
         $field = $this->ui->factory()->input()->field()->radio($title, $description);
-        if (!is_null($value)) {
-            $field = $field->withOption($value, "");    // dummy to prevent exception, will be overwritten by radioOption
-            $field = $field->withValue($value);
-        }
         $this->addField(
             $key,
             $field
@@ -425,6 +421,9 @@ public function radioOption(string $value, string $title, string $description =
     {
         if ($field = $this->getLastField()) {
             $field = $field->withOption($value, $title, $description);
+            if (($this->values[$this->last_key] ?? null) === $value) {
+                $field = $field->withValue($value);
+            }
             $this->replaceLastField($field);
         }
         return $this;

From 38922adcd2d7f87804a92c9aad8d3c62f808f302 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Wed, 11 Feb 2026 17:41:08 +0100
Subject: [PATCH 008/141] =?UTF-8?q?43942:=20Failed=20test:=20Read=20only?=
 =?UTF-8?q?=20f=C3=BCr=20Administration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ILIAS/Help/Administration/class.ilHelpModuleTableGUI.php   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/ILIAS/Help/Administration/class.ilHelpModuleTableGUI.php b/components/ILIAS/Help/Administration/class.ilHelpModuleTableGUI.php
index e2fab9b5f5aa..7a0f4bc57477 100755
--- a/components/ILIAS/Help/Administration/class.ilHelpModuleTableGUI.php
+++ b/components/ILIAS/Help/Administration/class.ilHelpModuleTableGUI.php
@@ -60,9 +60,8 @@ public function __construct(
 
         $this->setFormAction($ilCtrl->getFormAction($a_parent_obj));
         $this->setRowTemplate("tpl.help_module_row.html", "components/ILIAS/Help/Administration");
-        $this->addCommandButton("saveOrdering", $lng->txt("sorting_save"));
-
         if ($this->has_write_permission) {
+            $this->addCommandButton("saveOrdering", $lng->txt("sorting_save"));
             $this->addMultiCommand("confirmHelpModulesDeletion", $lng->txt("delete"));
         }
     }

From 6d84ad35ee6e41a30ef3b6441419bf3141e2e27d Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Wed, 11 Feb 2026 18:18:15 +0100
Subject: [PATCH 009/141] 45296: Missing lang var #exc_received_peer_feedback#

---
 .../ILIAS/Exercise/PeerReview/class.ilExPeerReviewGUI.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/Exercise/PeerReview/class.ilExPeerReviewGUI.php b/components/ILIAS/Exercise/PeerReview/class.ilExPeerReviewGUI.php
index bc902b78aba9..5bd5d2eaef2b 100755
--- a/components/ILIAS/Exercise/PeerReview/class.ilExPeerReviewGUI.php
+++ b/components/ILIAS/Exercise/PeerReview/class.ilExPeerReviewGUI.php
@@ -378,7 +378,7 @@ public function buildSubmissionPropertiesAndActions(\ILIAS\Exercise\Assignment\P
                     else {
                         $builder->addProperty(
                             $builder::SEC_PEER_FEEDBACK,
-                            $lng->txt("exc_received_peer_feedback"),
+                            $lng->txt("exc_received_feedback"),
                             $lng->txt("exc_peer_review_show_received_none")
                         );
                     }

From 3afa6bd0e1c8d5cc847625d08769bcc5bd62a772 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Wed, 11 Feb 2026 18:33:37 +0100
Subject: [PATCH 010/141] 44236: Exercise - Download Selected Submissions

---
 .../ILIAS/Exercise/Submission/SubmissionManager.php    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/ILIAS/Exercise/Submission/SubmissionManager.php b/components/ILIAS/Exercise/Submission/SubmissionManager.php
index 9c02439198bb..d17a454deb79 100644
--- a/components/ILIAS/Exercise/Submission/SubmissionManager.php
+++ b/components/ILIAS/Exercise/Submission/SubmissionManager.php
@@ -620,10 +620,12 @@ protected function copySubmissionFilesToDir(
                 $dir = $to_path . DIRECTORY_SEPARATOR . $targetdir;
                 \ilFileUtils::makeDirParents($dir);
                 $file = $dir . DIRECTORY_SEPARATOR . $targetfile;
-                file_put_contents(
-                    $file,
-                    $stream->getContents()
-                );
+                if (!is_null($stream)) {
+                    file_put_contents(
+                        $file,
+                        $stream->getContents()
+                    );
+                }
 
                 // unzip blog/portfolio
 

From 579a87b1688939a301044c0e2be44f7bb5732fd2 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Wed, 11 Feb 2026 18:43:25 +0100
Subject: [PATCH 011/141] 33630: Duplicate 'variable_ID' in
 wsp#:#search_no_match#:#Your search did not match any results.

---
 .../PersonalWorkspace/classes/class.ilSingleUserShareGUI.php    | 2 +-
 lang/ilias_de.lang                                              | 2 +-
 lang/ilias_en.lang                                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/ILIAS/PersonalWorkspace/classes/class.ilSingleUserShareGUI.php b/components/ILIAS/PersonalWorkspace/classes/class.ilSingleUserShareGUI.php
index 8d989cb5d2e6..fc7e87106443 100755
--- a/components/ILIAS/PersonalWorkspace/classes/class.ilSingleUserShareGUI.php
+++ b/components/ILIAS/PersonalWorkspace/classes/class.ilSingleUserShareGUI.php
@@ -99,7 +99,7 @@ protected function saveShare(): void
                 }
                 $this->ctrl->returnToParent($this);
             } else {
-                $this->tpl->setOnScreenMessage('failure', $this->lng->txt('search_no_match'), true);
+                $this->tpl->setOnScreenMessage('failure', $this->lng->txt('wsp_search_no_match'), true);
             }
         }
         $this->ctrl->redirect($this);
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 588f6cedd46d..27e2b514f71f 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -17993,7 +17993,6 @@ wopi#:#wopi_url_byline#:#Vollständige URL des WOPI-Discovery, diese muss über
 wsp#:#element_already_shared#:#Die Ressource ist für diese Person bereits freigegeben.
 wsp#:#element_shared#:#Die Ressource wurde freigegeben.
 wsp#:#error_creating_certificate_pdf#:#Das Zertifikat konnte nicht erstellt werden. Bitte kontaktieren Sie Ihre technische Betreuung und bitten um die Prüfung des Zertifikatsservers.
-wsp#:#search_no_match#:#Ihre Suche ergab keine Treffer.
 wsp#:#share#:#Freigeben
 wsp#:#share_content#:#Ressource freigeben
 wsp#:#share_with#:#Anmeldename
@@ -18015,6 +18014,7 @@ wsp#:#wsp_permission_registered_info#:#Dieses Objekt ist für alle registrierten
 wsp#:#wsp_permission_removed#:#Der Eintrag wurde gelöscht.
 wsp#:#wsp_permissions#:#Freigabe
 wsp#:#wsp_personal_resources_description#:#Hier können Sie persönliche Dateien, Blogs und Nachweise verwalten.
+wsp#:#wsp_search_no_match#:#Ihre Suche ergab keine Treffer.
 wsp#:#wsp_send_mail#:#Mail senden
 wsp#:#wsp_set_permission_all#:#Internet/WWW
 wsp#:#wsp_set_permission_all_password#:#Internet/WWW mit Passwort
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index 06c2a6135ee2..1617f7f9bbce 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -17963,7 +17963,6 @@ wopi#:#wopi_url_byline#:#Complete URL of the WOPI Discovery, which must be acces
 wsp#:#element_already_shared#:#This object is already shared with this user.
 wsp#:#element_shared#:#Object shared.
 wsp#:#error_creating_certificate_pdf#:#The certificate could not be created. Please contact the administrator to check the certificate server.
-wsp#:#search_no_match#:#Your search did not match any results.
 wsp#:#share#:#Share
 wsp#:#share_content#:#Share Object
 wsp#:#share_with#:#Username
@@ -17985,6 +17984,7 @@ wsp#:#wsp_permission_registered_info#:#This object is shared with all registered
 wsp#:#wsp_permission_removed#:#Entry has been removed.
 wsp#:#wsp_permissions#:#Share
 wsp#:#wsp_personal_resources_description#:#Here you can manage your private files, blogs and artifacts.
+wsp#:#wsp_search_no_match#:#Your search did not match any results.
 wsp#:#wsp_send_mail#:#Send Mail
 wsp#:#wsp_set_permission_all#:#World Wide Web
 wsp#:#wsp_set_permission_all_password#:#World Wide Web with Password

From 14cd7b5f1d00e36d9bfdf8d07df438d6397facfe Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Wed, 11 Feb 2026 21:12:42 +0100
Subject: [PATCH 012/141] =?UTF-8?q?44687:=20Metadaten=20doppelt=20im=20Akt?=
 =?UTF-8?q?ionenmen=C3=BC=20im=20Kontextmen=C3=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Page/class.PageQueryActionHandler.php     | 37 +++++++------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/components/ILIAS/COPage/Page/class.PageQueryActionHandler.php b/components/ILIAS/COPage/Page/class.PageQueryActionHandler.php
index 4e29040eea21..e75693a289df 100755
--- a/components/ILIAS/COPage/Page/class.PageQueryActionHandler.php
+++ b/components/ILIAS/COPage/Page/class.PageQueryActionHandler.php
@@ -370,39 +370,30 @@ public function getActionsDropDown(): \ILIAS\UI\Component\Dropdown\Standard
                     $ctrl->getLinkTargetByClass([get_class($this->page_gui), "ilnewsitemgui"], "editNews")
                 );
             }
+        }
 
+        if ($this->page_gui->use_meta_data) {
             if (($md_link = $this->page_gui->getMetaDataLink()) !== "") {
                 $items[] = $ui->factory()->link()->standard(
                     $lng->txt("meta_data"),
                     $md_link
                 );
-            }
-        }
-
-        if ($this->page_gui->use_meta_data) {
-            $mdgui = new \ilObjectMetaDataGUI(
-                $this->page_gui->meta_data_rep_obj,
-                $this->page_gui->meta_data_type,
-                $this->page_gui->meta_data_sub_obj_id
-            );
-            $mdtab = $mdgui->getTab();
-            if ($mdtab) {
-                $items[] = $ui->factory()->link()->standard(
-                    $lng->txt("meta_data"),
-                    $mdtab
+            } else {
+                $mdgui = new \ilObjectMetaDataGUI(
+                    $this->page_gui->meta_data_rep_obj,
+                    $this->page_gui->meta_data_type,
+                    $this->page_gui->meta_data_sub_obj_id
                 );
+                $mdtab = $mdgui->getTab();
+                if ($mdtab) {
+                    $items[] = $ui->factory()->link()->standard(
+                        $lng->txt("meta_data"),
+                        $mdtab
+                    );
+                }
             }
         }
 
-
-        if ($this->page_gui->getEnabledNews()) {
-            $items[] = $ui->factory()->link()->standard(
-                $lng->txt("news"),
-                $ctrl->getLinkTargetByClass([get_class($this->page_gui), \ilNewsItemGUI::class], "editNews")
-            );
-        }
-
-
         // additional page actions
         foreach ($this->page_gui->getAdditionalPageActions() as $item) {
             $items[] = $item;

From 48f269301ef6c476931861223dcacde45cc78753 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 08:15:12 +0100
Subject: [PATCH 013/141] tax: fixed taxonomy creation in categories

---
 .../ILIAS/Repository/classes/class.ilRepositoryGUI.php       | 5 +----
 .../GlobalScreen/classes/class.ilTaxonomyGSToolProvider.php  | 4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/components/ILIAS/Repository/classes/class.ilRepositoryGUI.php b/components/ILIAS/Repository/classes/class.ilRepositoryGUI.php
index 8fdc66ff78c8..b69c69f693a1 100755
--- a/components/ILIAS/Repository/classes/class.ilRepositoryGUI.php
+++ b/components/ILIAS/Repository/classes/class.ilRepositoryGUI.php
@@ -134,14 +134,13 @@ public function executeCommand(): void
         ) {
             $this->ctrl->redirectToURL('./login.php?cmd=force_login');
         }
-
         $this->tool_context->claim()->repository();
 
         // check creation mode
         // determined by "new_type" parameter
         $new_type = $this->request->getNewType();
 
-        if ($new_type !== "" && $new_type !== "sty") {
+        if ($new_type !== "" && $new_type !== "sty" && $new_type !== "tax") {
             $this->creation_mode = true;
             $ilHelp->setScreenIdComponent($new_type);
             $ilHelp->setDefaultScreenId(ilHelpGUI::ID_PART_SCREEN, "create");
@@ -194,7 +193,6 @@ public function executeCommand(): void
         if ($cmd === "showRepTree") {
             $next_class = "";
         }
-
         switch ($next_class) {
             // forward asynchronous file uploads to the upload handler.
             // possible via dropzones in list guis or global template
@@ -223,7 +221,6 @@ public function executeCommand(): void
                     }
                     $this->gui_obj->setCreationMode($this->creation_mode);
                     $this->ctrl->setReturn($this, "return");
-
                     $this->show();
                 } else {	//
                     $cmd = (string) $this->ctrl->getCmd("");
diff --git a/components/ILIAS/Taxonomy/GlobalScreen/classes/class.ilTaxonomyGSToolProvider.php b/components/ILIAS/Taxonomy/GlobalScreen/classes/class.ilTaxonomyGSToolProvider.php
index 2cd06d51fded..e6bc46238de0 100755
--- a/components/ILIAS/Taxonomy/GlobalScreen/classes/class.ilTaxonomyGSToolProvider.php
+++ b/components/ILIAS/Taxonomy/GlobalScreen/classes/class.ilTaxonomyGSToolProvider.php
@@ -91,7 +91,9 @@ private function getEditTree(array $gui_path, int $tax_id, string $cmd, string $
         $gui = $this->dic->taxonomy()->internal()->gui();
         $params = $gui->http()->request()->getQueryParams();
         $current_tax_node = (int) ($params["tax_node"] ?? null);
-        $tax_exp->setPathOpen($current_tax_node);
+        if ($current_tax_node > 0) {
+            $tax_exp->setPathOpen($current_tax_node);
+        }
 
 
         return $tax_exp->getHTML();

From ae5684986b493e30e28aab916894da021f47f671 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 12 Feb 2026 09:57:06 +0100
Subject: [PATCH 014/141] User: Fix Duplicate Entries in Search

See: https://mantis.ilias.de/view.php?id=47191
---
 .../User/src/Search/class.EndpointGUI.php     | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/components/ILIAS/User/src/Search/class.EndpointGUI.php b/components/ILIAS/User/src/Search/class.EndpointGUI.php
index 64eea85b7c1a..e61ef4adb64e 100644
--- a/components/ILIAS/User/src/Search/class.EndpointGUI.php
+++ b/components/ILIAS/User/src/Search/class.EndpointGUI.php
@@ -100,18 +100,25 @@ private function buildResponse(): string
             ])
         );
 
-        $response = array_map(
-            static fn(AutocompleteItem $v) => $v->getTagArray(),
-            array_merge(
-                $this->endpoint_configurator->getAdditionalAnswerElements(
-                    $this->current_user,
-                    $autocomplete_query
+        $response = array_values(
+            array_reduce(
+                array_merge(
+                    $this->endpoint_configurator->getAdditionalAnswerElements(
+                        $this->current_user,
+                        $autocomplete_query
+                    ),
+                    $this->profile_data_repository->searchUsers(
+                        $this->settings_data_repository,
+                        $this->field_configuration_repository,
+                        $autocomplete_query
+                    )
                 ),
-                $this->profile_data_repository->searchUsers(
-                    $this->settings_data_repository,
-                    $this->field_configuration_repository,
-                    $autocomplete_query
-                )
+                static function (array $c, AutocompleteItem $v): array {
+                    $tag_array = $v->getTagArray();
+                    $c[$tag_array['display']] = $tag_array;
+                    return $c;
+                },
+                []
             )
         );
 

From 5768fd691b15e22c25a7cc48ea06756910282c1a Mon Sep 17 00:00:00 2001
From: Tim Schmitz <schmitz@leifos.de>
Date: Thu, 12 Feb 2026 10:06:11 +0100
Subject: [PATCH 015/141] Poll: fix links written to navigation history (46936)

---
 components/ILIAS/Poll/classes/class.ilObjPollGUI.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/Poll/classes/class.ilObjPollGUI.php b/components/ILIAS/Poll/classes/class.ilObjPollGUI.php
index 183c52b993c0..486177e82fef 100755
--- a/components/ILIAS/Poll/classes/class.ilObjPollGUI.php
+++ b/components/ILIAS/Poll/classes/class.ilObjPollGUI.php
@@ -274,7 +274,7 @@ public function executeCommand(): void
         // add entry to navigation history
         if (!$this->getCreationMode() &&
             $this->getAccessHandler()->checkAccess("read", "", $this->node_id)) {
-            $link = $this->ctrl->getLinkTargetByClass("ilrepositorygui", "frameset");
+            $link = $this->ctrl->getLinkTargetByClass("ilrepositorygui");
             $this->nav_history->addItem($this->node_id, $link, "poll");
         }
 

From ac1c5f7415ff9e6442ccb4e916e50b7c6c9fa3d8 Mon Sep 17 00:00:00 2001
From: Marvin Beym <79150442+mBeym@users.noreply.github.com>
Date: Thu, 12 Feb 2026 11:09:20 +0100
Subject: [PATCH 016/141] ilSessionStatistics prepared statement & Generator
 (#10972)

* Use PHP "Generators"
* Use "Prepared Statements"
---
 .../classes/class.ilSessionStatistics.php     | 139 ++++++++++++------
 1 file changed, 96 insertions(+), 43 deletions(-)

diff --git a/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php b/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
index 8ed679c53efe..87ef2573771e 100755
--- a/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
+++ b/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
@@ -22,6 +22,10 @@ class ilSessionStatistics
 {
     private const int SLOT_SIZE = 15;
 
+    protected static ?ilDBStatement $number_of_active_raw_sessions_statement = null;
+    protected static ?ilDBStatement $aggregated_raw_data_statement = null;
+    protected static ?ilDBStatement $raw_data_statement = null;
+
     /**
      * Is session statistics active at all?
      */
@@ -171,35 +175,26 @@ protected static function getNumberOfActiveRawSessions(int $a_time): int
 
         $ilDB = $DIC['ilDB'];
 
-        $sql = 'SELECT COUNT(*) counter FROM usr_session_stats_raw' .
-            ' WHERE (end_time IS NULL OR end_time >= ' . $ilDB->quote($a_time, 'integer') . ')' .
-            ' AND start_time <= ' . $ilDB->quote($a_time, 'integer') .
-            ' AND ' . $ilDB->in('type', ilSessionControl::$session_types_controlled, false, 'integer');
-        $res = $ilDB->query($sql);
-        $row = $ilDB->fetchAssoc($res);
+        $statement = self::getNumberOfActiveRawSessionsPreparedStatement();
+        $row = $DIC->database()->fetchAssoc($DIC->database()->execute($statement, [$a_time, $a_time]));
         return (int) $row['counter'];
     }
 
     /**
      * Read raw data for timespan
+     * @return Generator<list<array{start_time: int, end_time: ?int, end_context: ?int}>>
      */
-    protected static function getRawData(int $a_begin, int $a_end): array
+    protected static function getRawData(int $a_begin, int $a_end): Generator
     {
         global $DIC;
 
-        $ilDB = $DIC['ilDB'];
-
-        $sql = 'SELECT start_time,end_time,end_context FROM usr_session_stats_raw' .
-            ' WHERE start_time <= ' . $ilDB->quote($a_end, 'integer') .
-            ' AND (end_time IS NULL OR end_time >= ' . $ilDB->quote($a_begin, 'integer') . ')' .
-            ' AND ' . $ilDB->in('type', ilSessionControl::$session_types_controlled, false, 'integer') .
-            ' ORDER BY start_time';
-        $res = $ilDB->query($sql);
-        $all = [];
-        while ($row = $ilDB->fetchAssoc($res)) {
-            $all[] = $row;
+        $res = $DIC->database()->execute(
+            self::getRawDataPreparedStatement(),
+            [$a_end, $a_begin]
+        );
+        while ($row = $DIC->database()->fetchAssoc($res)) {
+            yield $row;
         }
-        return $all;
     }
 
     /**
@@ -256,15 +251,76 @@ public static function aggretateRaw(int $a_now): void
         self::deleteAggregatedRaw($a_now);
     }
 
-    /**
-     * Aggregate statistics data for one slot
-     *
-     */
-    public static function aggregateRawHelper(int $a_begin, int $a_end): void
+    protected static function getNumberOfActiveRawSessionsPreparedStatement(): ilDbStatement
     {
-        global $DIC;
+        if (self::$number_of_active_raw_sessions_statement === null) {
+            global $DIC;
+            self::$number_of_active_raw_sessions_statement = $DIC->database()->prepare(
+                'SELECT COUNT(*) counter FROM usr_session_stats_raw '
+                . 'WHERE (end_time IS NULL OR end_time >= ?) '
+                . 'AND start_time <= ? '
+                . 'AND ' . $DIC->database()->in('type', ilSessionControl::$session_types_controlled, false, 'integer'),
+                [ilDBConstants::T_INTEGER, ilDBConstants::T_INTEGER]
+            );
+        }
 
-        $ilDB = $DIC['ilDB'];
+        return self::$number_of_active_raw_sessions_statement;
+    }
+
+    protected static function getAggregatedRawDataPreparedStatement(): ilDBStatement
+    {
+        if (!self::$aggregated_raw_data_statement) {
+            global $DIC;
+            self::$aggregated_raw_data_statement = $DIC->database()->prepareManip(
+                'UPDATE usr_session_stats '
+                . 'SET active_min = ?, '
+                . 'active_max = ?, '
+                . 'active_avg = ?, '
+                . 'active_end = ?, '
+                . 'opened = ?, '
+                . 'closed_manual = ?, '
+                . 'closed_expire = ?, '
+                . 'closed_login = ?, '
+                . 'closed_misc = ? '
+                . 'WHERE slot_begin = ? AND slot_end = ?',
+                [
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER
+                ]
+            );
+        }
+
+        return self::$aggregated_raw_data_statement;
+    }
+
+    protected static function getRawDataPreparedStatement(): ilDBStatement
+    {
+        if (!self::$raw_data_statement) {
+            global $DIC;
+            self::$raw_data_statement = $DIC->database()->prepare(
+                'SELECT start_time,end_time,end_context FROM usr_session_stats_raw' .
+                ' WHERE start_time <= %s' .
+                ' AND (end_time IS NULL OR end_time >= %s)' .
+                ' AND ' . $DIC->database()->in('type', ilSessionControl::$session_types_controlled, false, ilDBConstants::T_INTEGER) .
+                ' ORDER BY start_time',
+                [ilDBConstants::T_INTEGER, ilDBConstants::T_INTEGER]
+            );
+        }
+        return self::$raw_data_statement;
+    }
+
+    public static function aggregateRawHelper(int $a_begin, int $a_end)
+    {
+        global $DIC;
 
         // "relevant" closing types
         $separate_closed = [
@@ -355,24 +411,21 @@ public static function aggregateRawHelper(int $a_begin, int $a_end): void
         }
         unset($events);
 
-        // save aggregated data
-        $fields = [
-            'active_min' => ['integer', $active_min],
-            'active_max' => ['integer', $active_max],
-            'active_avg' => ['integer', $active_avg],
-            'active_end' => ['integer', $active_end],
-            'opened' => ['integer', $opened_counter],
-            'closed_manual' => ['integer', (int) ($closed_counter[ilSession::SESSION_CLOSE_USER] ?? 0)],
-            'closed_expire' => ['integer', (int) ($closed_counter[ilSession::SESSION_CLOSE_EXPIRE] ?? 0)],
-            'closed_login' => ['integer', (int) ($closed_counter[ilSession::SESSION_CLOSE_LOGIN] ?? 0)],
-            'closed_misc' => ['integer', (int) ($closed_counter[0] ?? 0)],
-        ];
-        $ilDB->update(
-            'usr_session_stats',
-            $fields,
+
+        $DIC->database()->execute(
+            self::getAggregatedRawDataPreparedStatement(),
             [
-                'slot_begin' => ['integer', $a_begin],
-                'slot_end' => ['integer', $a_end]
+                'active_min' => $active_min,
+                'active_max' => $active_max,
+                'active_avg' => $active_avg,
+                'active_end' => $active_end,
+                'opened' => $opened_counter,
+                'closed_manual' => (int) ($closed_counter[ilSession::SESSION_CLOSE_USER] ?? 0),
+                'closed_expire' => (int) ($closed_counter[ilSession::SESSION_CLOSE_EXPIRE] ?? 0),
+                'closed_login' => (int) ($closed_counter[ilSession::SESSION_CLOSE_LOGIN] ?? 0),
+                'closed_misc' => (int) ($closed_counter[0] ?? 0),
+                'slot_begin' => $a_begin,
+                'slot_end' => $a_end,
             ]
         );
     }

From 6bd783dac9a2b369400f2c5377726f4c585183fb Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 12 Feb 2026 12:01:34 +0100
Subject: [PATCH 017/141] Revert "ilSessionStatistics prepared statement &
 Generator (#10972)"

This reverts commit ac1c5f7415ff9e6442ccb4e916e50b7c6c9fa3d8.
---
 .../classes/class.ilSessionStatistics.php     | 139 ++++++------------
 1 file changed, 43 insertions(+), 96 deletions(-)

diff --git a/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php b/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
index 87ef2573771e..8ed679c53efe 100755
--- a/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
+++ b/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
@@ -22,10 +22,6 @@ class ilSessionStatistics
 {
     private const int SLOT_SIZE = 15;
 
-    protected static ?ilDBStatement $number_of_active_raw_sessions_statement = null;
-    protected static ?ilDBStatement $aggregated_raw_data_statement = null;
-    protected static ?ilDBStatement $raw_data_statement = null;
-
     /**
      * Is session statistics active at all?
      */
@@ -175,26 +171,35 @@ protected static function getNumberOfActiveRawSessions(int $a_time): int
 
         $ilDB = $DIC['ilDB'];
 
-        $statement = self::getNumberOfActiveRawSessionsPreparedStatement();
-        $row = $DIC->database()->fetchAssoc($DIC->database()->execute($statement, [$a_time, $a_time]));
+        $sql = 'SELECT COUNT(*) counter FROM usr_session_stats_raw' .
+            ' WHERE (end_time IS NULL OR end_time >= ' . $ilDB->quote($a_time, 'integer') . ')' .
+            ' AND start_time <= ' . $ilDB->quote($a_time, 'integer') .
+            ' AND ' . $ilDB->in('type', ilSessionControl::$session_types_controlled, false, 'integer');
+        $res = $ilDB->query($sql);
+        $row = $ilDB->fetchAssoc($res);
         return (int) $row['counter'];
     }
 
     /**
      * Read raw data for timespan
-     * @return Generator<list<array{start_time: int, end_time: ?int, end_context: ?int}>>
      */
-    protected static function getRawData(int $a_begin, int $a_end): Generator
+    protected static function getRawData(int $a_begin, int $a_end): array
     {
         global $DIC;
 
-        $res = $DIC->database()->execute(
-            self::getRawDataPreparedStatement(),
-            [$a_end, $a_begin]
-        );
-        while ($row = $DIC->database()->fetchAssoc($res)) {
-            yield $row;
+        $ilDB = $DIC['ilDB'];
+
+        $sql = 'SELECT start_time,end_time,end_context FROM usr_session_stats_raw' .
+            ' WHERE start_time <= ' . $ilDB->quote($a_end, 'integer') .
+            ' AND (end_time IS NULL OR end_time >= ' . $ilDB->quote($a_begin, 'integer') . ')' .
+            ' AND ' . $ilDB->in('type', ilSessionControl::$session_types_controlled, false, 'integer') .
+            ' ORDER BY start_time';
+        $res = $ilDB->query($sql);
+        $all = [];
+        while ($row = $ilDB->fetchAssoc($res)) {
+            $all[] = $row;
         }
+        return $all;
     }
 
     /**
@@ -251,77 +256,16 @@ public static function aggretateRaw(int $a_now): void
         self::deleteAggregatedRaw($a_now);
     }
 
-    protected static function getNumberOfActiveRawSessionsPreparedStatement(): ilDbStatement
-    {
-        if (self::$number_of_active_raw_sessions_statement === null) {
-            global $DIC;
-            self::$number_of_active_raw_sessions_statement = $DIC->database()->prepare(
-                'SELECT COUNT(*) counter FROM usr_session_stats_raw '
-                . 'WHERE (end_time IS NULL OR end_time >= ?) '
-                . 'AND start_time <= ? '
-                . 'AND ' . $DIC->database()->in('type', ilSessionControl::$session_types_controlled, false, 'integer'),
-                [ilDBConstants::T_INTEGER, ilDBConstants::T_INTEGER]
-            );
-        }
-
-        return self::$number_of_active_raw_sessions_statement;
-    }
-
-    protected static function getAggregatedRawDataPreparedStatement(): ilDBStatement
-    {
-        if (!self::$aggregated_raw_data_statement) {
-            global $DIC;
-            self::$aggregated_raw_data_statement = $DIC->database()->prepareManip(
-                'UPDATE usr_session_stats '
-                . 'SET active_min = ?, '
-                . 'active_max = ?, '
-                . 'active_avg = ?, '
-                . 'active_end = ?, '
-                . 'opened = ?, '
-                . 'closed_manual = ?, '
-                . 'closed_expire = ?, '
-                . 'closed_login = ?, '
-                . 'closed_misc = ? '
-                . 'WHERE slot_begin = ? AND slot_end = ?',
-                [
-                    ilDBConstants::T_INTEGER,
-                    ilDBConstants::T_INTEGER,
-                    ilDBConstants::T_INTEGER,
-                    ilDBConstants::T_INTEGER,
-                    ilDBConstants::T_INTEGER,
-                    ilDBConstants::T_INTEGER,
-                    ilDBConstants::T_INTEGER,
-                    ilDBConstants::T_INTEGER,
-                    ilDBConstants::T_INTEGER,
-                    ilDBConstants::T_INTEGER,
-                    ilDBConstants::T_INTEGER
-                ]
-            );
-        }
-
-        return self::$aggregated_raw_data_statement;
-    }
-
-    protected static function getRawDataPreparedStatement(): ilDBStatement
-    {
-        if (!self::$raw_data_statement) {
-            global $DIC;
-            self::$raw_data_statement = $DIC->database()->prepare(
-                'SELECT start_time,end_time,end_context FROM usr_session_stats_raw' .
-                ' WHERE start_time <= %s' .
-                ' AND (end_time IS NULL OR end_time >= %s)' .
-                ' AND ' . $DIC->database()->in('type', ilSessionControl::$session_types_controlled, false, ilDBConstants::T_INTEGER) .
-                ' ORDER BY start_time',
-                [ilDBConstants::T_INTEGER, ilDBConstants::T_INTEGER]
-            );
-        }
-        return self::$raw_data_statement;
-    }
-
-    public static function aggregateRawHelper(int $a_begin, int $a_end)
+    /**
+     * Aggregate statistics data for one slot
+     *
+     */
+    public static function aggregateRawHelper(int $a_begin, int $a_end): void
     {
         global $DIC;
 
+        $ilDB = $DIC['ilDB'];
+
         // "relevant" closing types
         $separate_closed = [
             ilSession::SESSION_CLOSE_USER,
@@ -411,21 +355,24 @@ public static function aggregateRawHelper(int $a_begin, int $a_end)
         }
         unset($events);
 
-
-        $DIC->database()->execute(
-            self::getAggregatedRawDataPreparedStatement(),
+        // save aggregated data
+        $fields = [
+            'active_min' => ['integer', $active_min],
+            'active_max' => ['integer', $active_max],
+            'active_avg' => ['integer', $active_avg],
+            'active_end' => ['integer', $active_end],
+            'opened' => ['integer', $opened_counter],
+            'closed_manual' => ['integer', (int) ($closed_counter[ilSession::SESSION_CLOSE_USER] ?? 0)],
+            'closed_expire' => ['integer', (int) ($closed_counter[ilSession::SESSION_CLOSE_EXPIRE] ?? 0)],
+            'closed_login' => ['integer', (int) ($closed_counter[ilSession::SESSION_CLOSE_LOGIN] ?? 0)],
+            'closed_misc' => ['integer', (int) ($closed_counter[0] ?? 0)],
+        ];
+        $ilDB->update(
+            'usr_session_stats',
+            $fields,
             [
-                'active_min' => $active_min,
-                'active_max' => $active_max,
-                'active_avg' => $active_avg,
-                'active_end' => $active_end,
-                'opened' => $opened_counter,
-                'closed_manual' => (int) ($closed_counter[ilSession::SESSION_CLOSE_USER] ?? 0),
-                'closed_expire' => (int) ($closed_counter[ilSession::SESSION_CLOSE_EXPIRE] ?? 0),
-                'closed_login' => (int) ($closed_counter[ilSession::SESSION_CLOSE_LOGIN] ?? 0),
-                'closed_misc' => (int) ($closed_counter[0] ?? 0),
-                'slot_begin' => $a_begin,
-                'slot_end' => $a_end,
+                'slot_begin' => ['integer', $a_begin],
+                'slot_end' => ['integer', $a_end]
             ]
         );
     }

From b8f2499fdec54745467e978d0ff1a39f36c0fdd5 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 12 Feb 2026 11:51:10 +0100
Subject: [PATCH 018/141] Object/User: Fix Lookup of Name of Owner

See: https://mantis.ilias.de/view.php?id=47238
---
 components/ILIAS/ILIASObject/classes/class.ilObject.php      | 2 +-
 components/ILIAS/User/src/Profile/DatabaseDataRepository.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/ILIASObject/classes/class.ilObject.php b/components/ILIAS/ILIASObject/classes/class.ilObject.php
index 0c77757f1da0..45825a269908 100755
--- a/components/ILIAS/ILIASObject/classes/class.ilObject.php
+++ b/components/ILIAS/ILIASObject/classes/class.ilObject.php
@@ -503,7 +503,7 @@ final public static function _lookupOwnerName(int $owner_id): string
 
         $owner = null;
         if ($owner_id != -1) {
-            if (ilObject::_exists($owner_id)) {
+            if (ilObjUser::userExists([$owner_id])) {
                 $owner = new ilObjUser($owner_id);
             }
         }
diff --git a/components/ILIAS/User/src/Profile/DatabaseDataRepository.php b/components/ILIAS/User/src/Profile/DatabaseDataRepository.php
index 1f4c9dd0cfbe..1a36f3d79079 100644
--- a/components/ILIAS/User/src/Profile/DatabaseDataRepository.php
+++ b/components/ILIAS/User/src/Profile/DatabaseDataRepository.php
@@ -69,7 +69,9 @@ public function getSingle(int $id): Data
 
         $base_data = $this->db->fetchObject($base_query);
         if ($base_data === null) {
-            return $this->getDefault()->withId($id);
+            throw \InvalidArgumentException(
+                'This user does not exist.'
+            );
         }
 
         return $this->buildFromData(

From 1ac6595ad8e13e0ab9e7187f444f95b921aab4a2 Mon Sep 17 00:00:00 2001
From: Stefan Meyer <meyer@leifos.de>
Date: Thu, 12 Feb 2026 12:02:45 +0100
Subject: [PATCH 019/141] Merge pull request #11069 from
 leifos-gmbh/11_mantis_ilias_47072

DidacticTemplate: fix incorrect icon displaying
---
 ...s.ilDidacticTemplateSettingsTableDataRetrieval.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/components/ILIAS/DidacticTemplate/classes/Setting/class.ilDidacticTemplateSettingsTableDataRetrieval.php b/components/ILIAS/DidacticTemplate/classes/Setting/class.ilDidacticTemplateSettingsTableDataRetrieval.php
index 4d8055fe8bcb..0fe63f943b97 100755
--- a/components/ILIAS/DidacticTemplate/classes/Setting/class.ilDidacticTemplateSettingsTableDataRetrieval.php
+++ b/components/ILIAS/DidacticTemplate/classes/Setting/class.ilDidacticTemplateSettingsTableDataRetrieval.php
@@ -129,12 +129,11 @@ protected function getRecords(Order $order, Range $range): array
             foreach ($tpl->getAssignments() as $obj_type) {
                 $icon_label = $this->lng->txt('objs_' . $obj_type);
             }
-            if ($icon_path) {
-                $icon = $this->ui_factory->symbol()->icon()->custom(
-                    $icon_path,
-                    $icon_label
-                );
-            }
+
+            $icon = ($icon_path !== "") ? $this->ui_factory->symbol()->icon()->custom(
+                $icon_path,
+                $icon_label
+            ) : null;
 
             $icon_active = $this->ui_factory->symbol()->icon()->custom(
                 $tpl->isEnabled() ?

From 67b1ad11e03090939a0a11e4aa11b4383152b2a2 Mon Sep 17 00:00:00 2001
From: Stefan Meyer <meyer@leifos.de>
Date: Thu, 12 Feb 2026 12:07:03 +0100
Subject: [PATCH 020/141] Merge pull request #11068 from
 leifos-gmbh/11_mantis_ilias_47075

DidacticTemplate: fix edit-import
---
 .../classes/Setting/class.ilDidacticTemplateSettingsGUI.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/ILIAS/DidacticTemplate/classes/Setting/class.ilDidacticTemplateSettingsGUI.php b/components/ILIAS/DidacticTemplate/classes/Setting/class.ilDidacticTemplateSettingsGUI.php
index c02dc74d5109..b3eee10d3251 100755
--- a/components/ILIAS/DidacticTemplate/classes/Setting/class.ilDidacticTemplateSettingsGUI.php
+++ b/components/ILIAS/DidacticTemplate/classes/Setting/class.ilDidacticTemplateSettingsGUI.php
@@ -792,9 +792,9 @@ public function editImportForm(): ilPropertyFormGUI
 
     public function editImport(ilDidacticTemplateSetting $a_settings): void
     {
-        ilDidacticTemplateObjSettings::transferAutoGenerateStatus($a_settings->getId(), $a_settings->getId());
-        $assignments = ilDidacticTemplateObjSettings::getAssignmentsByTemplateID($a_settings->getId());
-        $a_settings->delete();
+        ilDidacticTemplateObjSettings::transferAutoGenerateStatus($this->setting->getId(), $a_settings->getId());
+        $assignments = ilDidacticTemplateObjSettings::getAssignmentsByTemplateID($this->setting->getId());
+        $this->setting->delete();
         foreach ($assignments as $obj) {
             ilDidacticTemplateObjSettings::assignTemplate($obj["ref_id"], $obj["obj_id"], $a_settings->getId());
         }

From 94dadf59bbc8e0ff32673eaa96017b023d8cb82b Mon Sep 17 00:00:00 2001
From: Marvin Beym <79150442+mBeym@users.noreply.github.com>
Date: Thu, 12 Feb 2026 11:09:20 +0100
Subject: [PATCH 021/141] ilSessionStatistics prepared statement & Generator
 (#10972)

* Use PHP "Generators"
* Use "Prepared Statements"
---
 .../classes/class.ilSessionStatistics.php     | 139 ++++++++++++------
 1 file changed, 96 insertions(+), 43 deletions(-)

diff --git a/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php b/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
index 8ed679c53efe..87ef2573771e 100755
--- a/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
+++ b/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
@@ -22,6 +22,10 @@ class ilSessionStatistics
 {
     private const int SLOT_SIZE = 15;
 
+    protected static ?ilDBStatement $number_of_active_raw_sessions_statement = null;
+    protected static ?ilDBStatement $aggregated_raw_data_statement = null;
+    protected static ?ilDBStatement $raw_data_statement = null;
+
     /**
      * Is session statistics active at all?
      */
@@ -171,35 +175,26 @@ protected static function getNumberOfActiveRawSessions(int $a_time): int
 
         $ilDB = $DIC['ilDB'];
 
-        $sql = 'SELECT COUNT(*) counter FROM usr_session_stats_raw' .
-            ' WHERE (end_time IS NULL OR end_time >= ' . $ilDB->quote($a_time, 'integer') . ')' .
-            ' AND start_time <= ' . $ilDB->quote($a_time, 'integer') .
-            ' AND ' . $ilDB->in('type', ilSessionControl::$session_types_controlled, false, 'integer');
-        $res = $ilDB->query($sql);
-        $row = $ilDB->fetchAssoc($res);
+        $statement = self::getNumberOfActiveRawSessionsPreparedStatement();
+        $row = $DIC->database()->fetchAssoc($DIC->database()->execute($statement, [$a_time, $a_time]));
         return (int) $row['counter'];
     }
 
     /**
      * Read raw data for timespan
+     * @return Generator<list<array{start_time: int, end_time: ?int, end_context: ?int}>>
      */
-    protected static function getRawData(int $a_begin, int $a_end): array
+    protected static function getRawData(int $a_begin, int $a_end): Generator
     {
         global $DIC;
 
-        $ilDB = $DIC['ilDB'];
-
-        $sql = 'SELECT start_time,end_time,end_context FROM usr_session_stats_raw' .
-            ' WHERE start_time <= ' . $ilDB->quote($a_end, 'integer') .
-            ' AND (end_time IS NULL OR end_time >= ' . $ilDB->quote($a_begin, 'integer') . ')' .
-            ' AND ' . $ilDB->in('type', ilSessionControl::$session_types_controlled, false, 'integer') .
-            ' ORDER BY start_time';
-        $res = $ilDB->query($sql);
-        $all = [];
-        while ($row = $ilDB->fetchAssoc($res)) {
-            $all[] = $row;
+        $res = $DIC->database()->execute(
+            self::getRawDataPreparedStatement(),
+            [$a_end, $a_begin]
+        );
+        while ($row = $DIC->database()->fetchAssoc($res)) {
+            yield $row;
         }
-        return $all;
     }
 
     /**
@@ -256,15 +251,76 @@ public static function aggretateRaw(int $a_now): void
         self::deleteAggregatedRaw($a_now);
     }
 
-    /**
-     * Aggregate statistics data for one slot
-     *
-     */
-    public static function aggregateRawHelper(int $a_begin, int $a_end): void
+    protected static function getNumberOfActiveRawSessionsPreparedStatement(): ilDbStatement
     {
-        global $DIC;
+        if (self::$number_of_active_raw_sessions_statement === null) {
+            global $DIC;
+            self::$number_of_active_raw_sessions_statement = $DIC->database()->prepare(
+                'SELECT COUNT(*) counter FROM usr_session_stats_raw '
+                . 'WHERE (end_time IS NULL OR end_time >= ?) '
+                . 'AND start_time <= ? '
+                . 'AND ' . $DIC->database()->in('type', ilSessionControl::$session_types_controlled, false, 'integer'),
+                [ilDBConstants::T_INTEGER, ilDBConstants::T_INTEGER]
+            );
+        }
 
-        $ilDB = $DIC['ilDB'];
+        return self::$number_of_active_raw_sessions_statement;
+    }
+
+    protected static function getAggregatedRawDataPreparedStatement(): ilDBStatement
+    {
+        if (!self::$aggregated_raw_data_statement) {
+            global $DIC;
+            self::$aggregated_raw_data_statement = $DIC->database()->prepareManip(
+                'UPDATE usr_session_stats '
+                . 'SET active_min = ?, '
+                . 'active_max = ?, '
+                . 'active_avg = ?, '
+                . 'active_end = ?, '
+                . 'opened = ?, '
+                . 'closed_manual = ?, '
+                . 'closed_expire = ?, '
+                . 'closed_login = ?, '
+                . 'closed_misc = ? '
+                . 'WHERE slot_begin = ? AND slot_end = ?',
+                [
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER,
+                    ilDBConstants::T_INTEGER
+                ]
+            );
+        }
+
+        return self::$aggregated_raw_data_statement;
+    }
+
+    protected static function getRawDataPreparedStatement(): ilDBStatement
+    {
+        if (!self::$raw_data_statement) {
+            global $DIC;
+            self::$raw_data_statement = $DIC->database()->prepare(
+                'SELECT start_time,end_time,end_context FROM usr_session_stats_raw' .
+                ' WHERE start_time <= %s' .
+                ' AND (end_time IS NULL OR end_time >= %s)' .
+                ' AND ' . $DIC->database()->in('type', ilSessionControl::$session_types_controlled, false, ilDBConstants::T_INTEGER) .
+                ' ORDER BY start_time',
+                [ilDBConstants::T_INTEGER, ilDBConstants::T_INTEGER]
+            );
+        }
+        return self::$raw_data_statement;
+    }
+
+    public static function aggregateRawHelper(int $a_begin, int $a_end)
+    {
+        global $DIC;
 
         // "relevant" closing types
         $separate_closed = [
@@ -355,24 +411,21 @@ public static function aggregateRawHelper(int $a_begin, int $a_end): void
         }
         unset($events);
 
-        // save aggregated data
-        $fields = [
-            'active_min' => ['integer', $active_min],
-            'active_max' => ['integer', $active_max],
-            'active_avg' => ['integer', $active_avg],
-            'active_end' => ['integer', $active_end],
-            'opened' => ['integer', $opened_counter],
-            'closed_manual' => ['integer', (int) ($closed_counter[ilSession::SESSION_CLOSE_USER] ?? 0)],
-            'closed_expire' => ['integer', (int) ($closed_counter[ilSession::SESSION_CLOSE_EXPIRE] ?? 0)],
-            'closed_login' => ['integer', (int) ($closed_counter[ilSession::SESSION_CLOSE_LOGIN] ?? 0)],
-            'closed_misc' => ['integer', (int) ($closed_counter[0] ?? 0)],
-        ];
-        $ilDB->update(
-            'usr_session_stats',
-            $fields,
+
+        $DIC->database()->execute(
+            self::getAggregatedRawDataPreparedStatement(),
             [
-                'slot_begin' => ['integer', $a_begin],
-                'slot_end' => ['integer', $a_end]
+                'active_min' => $active_min,
+                'active_max' => $active_max,
+                'active_avg' => $active_avg,
+                'active_end' => $active_end,
+                'opened' => $opened_counter,
+                'closed_manual' => (int) ($closed_counter[ilSession::SESSION_CLOSE_USER] ?? 0),
+                'closed_expire' => (int) ($closed_counter[ilSession::SESSION_CLOSE_EXPIRE] ?? 0),
+                'closed_login' => (int) ($closed_counter[ilSession::SESSION_CLOSE_LOGIN] ?? 0),
+                'closed_misc' => (int) ($closed_counter[0] ?? 0),
+                'slot_begin' => $a_begin,
+                'slot_end' => $a_end,
             ]
         );
     }

From e9eb66b9350f68ef3c4820bd93f526d5710265cd Mon Sep 17 00:00:00 2001
From: mjansen <mjansen@databay.de>
Date: Thu, 12 Feb 2026 12:06:01 +0100
Subject: [PATCH 022/141] [Feature] Authentication: Add missing types /
 Simplify code / Privatize / Fix typos

---
 ...class.ilAuthDestroyExpiredSessionsCron.php |   2 +-
 .../classes/class.ilSession.php               |   2 +-
 .../classes/class.ilSessionStatistics.php     | 187 ++++++++++--------
 .../classes/class.ilSessionStatisticsGUI.php  |   2 +-
 4 files changed, 103 insertions(+), 90 deletions(-)

diff --git a/components/ILIAS/Authentication/classes/Cron/class.ilAuthDestroyExpiredSessionsCron.php b/components/ILIAS/Authentication/classes/Cron/class.ilAuthDestroyExpiredSessionsCron.php
index 20e7b429c4d0..7f38fe762170 100755
--- a/components/ILIAS/Authentication/classes/Cron/class.ilAuthDestroyExpiredSessionsCron.php
+++ b/components/ILIAS/Authentication/classes/Cron/class.ilAuthDestroyExpiredSessionsCron.php
@@ -87,7 +87,7 @@ public function run(): JobResult
         $result->setStatus(JobResult::STATUS_OK);
 
         $num_destroyed_sessions = ilSession::_destroyExpiredSessions();
-        ilSessionStatistics::aggretateRaw(time());
+        ilSessionStatistics::aggregateRaw(time());
         $result->setMessage('Number of destroyed sessions: ' . $num_destroyed_sessions);
 
         return $result;
diff --git a/components/ILIAS/Authentication/classes/class.ilSession.php b/components/ILIAS/Authentication/classes/class.ilSession.php
index 2279aef3d375..cf9cef39f946 100755
--- a/components/ILIAS/Authentication/classes/class.ilSession.php
+++ b/components/ILIAS/Authentication/classes/class.ilSession.php
@@ -195,7 +195,7 @@ public static function _writeData(string $a_session_id, string $a_data): bool
             if ($r->getInt(0, 50) === 2) {
                 // get time _before_ destroying expired sessions
                 self::_destroyExpiredSessions();
-                ilSessionStatistics::aggretateRaw($now);
+                ilSessionStatistics::aggregateRaw($now);
             }
         }
 
diff --git a/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php b/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
index 87ef2573771e..9c0b97ede4c3 100755
--- a/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
+++ b/components/ILIAS/Authentication/classes/class.ilSessionStatistics.php
@@ -22,29 +22,25 @@ class ilSessionStatistics
 {
     private const int SLOT_SIZE = 15;
 
-    protected static ?ilDBStatement $number_of_active_raw_sessions_statement = null;
-    protected static ?ilDBStatement $aggregated_raw_data_statement = null;
-    protected static ?ilDBStatement $raw_data_statement = null;
+    private static ?ilDBStatement $number_of_active_raw_sessions_statement = null;
+    private static ?ilDBStatement $aggregated_raw_data_statement = null;
+    private static ?ilDBStatement $raw_data_statement = null;
 
-    /**
-     * Is session statistics active at all?
-     */
     public static function isActive(): bool
     {
         global $DIC;
 
+        /** @var ilSetting $ilSetting */
         $ilSetting = $DIC['ilSetting'];
 
         return (bool) $ilSetting->get('session_statistics', '1');
     }
 
-    /**
-     * Create raw data entry
-     */
     public static function createRawEntry(string $a_session_id, int $a_session_type, int $a_timestamp, int $a_user_id): void
     {
         global $DIC;
 
+        /** @var ilDBInterface $ilDB */
         $ilDB = $DIC['ilDB'];
 
         if (!$a_user_id || !$a_session_id || !self::isActive()) {
@@ -53,31 +49,28 @@ public static function createRawEntry(string $a_session_id, int $a_session_type,
 
         // #9669: if a session was destroyed and somehow the session id is still
         // in use there will be a id-collision for the raw-entry
-
         $ilDB->replace(
             'usr_session_stats_raw',
             [
-                'session_id' => ['text', $a_session_id]
+                'session_id' => [ilDBConstants::T_TEXT, $a_session_id]
             ],
             [
-                'type' => ['integer', $a_session_type],
-                'start_time' => ['integer', $a_timestamp],
-                'user_id' => ['integer', $a_user_id]
+                'type' => [ilDBConstants::T_INTEGER, $a_session_type],
+                'start_time' => [ilDBConstants::T_INTEGER, $a_timestamp],
+                'user_id' => [ilDBConstants::T_INTEGER, $a_user_id]
             ]
         );
     }
 
     /**
-     * Close raw data entry
-     *
-     * @param int|array $a_session_id
-     * @param int $a_context
+     * @param string|list<string> $a_session_id
      * @param int|bool $a_expired_at
      */
     public static function closeRawEntry($a_session_id, ?int $a_context = null, $a_expired_at = null): void
     {
         global $DIC;
 
+        /** @var ilDBInterface $ilDB */
         $ilDB = $DIC['ilDB'];
 
         if (!self::isActive()) {
@@ -92,22 +85,22 @@ public static function closeRawEntry($a_session_id, ?int $a_context = null, $a_e
                 $end_time = time();
             }
             $sql = 'UPDATE usr_session_stats_raw' .
-                ' SET end_time = ' . $ilDB->quote($end_time, 'integer');
+                ' SET end_time = ' . $ilDB->quote($end_time, ilDBConstants::T_INTEGER);
             if ($a_context) {
-                $sql .= ',end_context = ' . $ilDB->quote($a_context, 'integer');
+                $sql .= ', end_context = ' . $ilDB->quote($a_context, ilDBConstants::T_INTEGER);
             }
-            $sql .= ' WHERE session_id = ' . $ilDB->quote($a_session_id, 'text') .
+            $sql .= ' WHERE session_id = ' . $ilDB->quote($a_session_id, ilDBConstants::T_TEXT) .
                 ' AND end_time IS NULL';
             $ilDB->manipulate($sql);
         }
         // batch closing
         elseif (!$a_expired_at) {
             $sql = 'UPDATE usr_session_stats_raw' .
-                ' SET end_time = ' . $ilDB->quote(time(), 'integer');
+                ' SET end_time = ' . $ilDB->quote(time(), ilDBConstants::T_INTEGER);
             if ($a_context) {
-                $sql .= ',end_context = ' . $ilDB->quote($a_context, 'integer');
+                $sql .= ', end_context = ' . $ilDB->quote($a_context, ilDBConstants::T_INTEGER);
             }
-            $sql .= ' WHERE ' . $ilDB->in('session_id', $a_session_id, false, 'text') .
+            $sql .= ' WHERE ' . $ilDB->in('session_id', $a_session_id, false, ilDBConstants::T_TEXT) .
                 ' AND end_time IS NULL';
             $ilDB->manipulate($sql);
         }
@@ -115,11 +108,11 @@ public static function closeRawEntry($a_session_id, ?int $a_context = null, $a_e
         else {
             foreach ($a_session_id as $id => $ts) {
                 $sql = 'UPDATE usr_session_stats_raw' .
-                    ' SET end_time = ' . $ilDB->quote($ts, 'integer');
+                    ' SET end_time = ' . $ilDB->quote($ts, ilDBConstants::T_INTEGER);
                 if ($a_context) {
-                    $sql .= ',end_context = ' . $ilDB->quote($a_context, 'integer');
+                    $sql .= ', end_context = ' . $ilDB->quote($a_context, ilDBConstants::T_INTEGER);
                 }
-                $sql .= ' WHERE session_id = ' . $ilDB->quote($id, 'text') .
+                $sql .= ' WHERE session_id = ' . $ilDB->quote($id, ilDBConstants::T_TEXT) .
                     ' AND end_time IS NULL';
                 $ilDB->manipulate($sql);
             }
@@ -128,18 +121,17 @@ public static function closeRawEntry($a_session_id, ?int $a_context = null, $a_e
 
     /**
      * Get next slot to aggregate
-     *
-     * @return array begin, end
+     * @return array{0: int, 1: int}|null
      */
-    protected static function getCurrentSlot(int $a_now): ?array
+    private static function getCurrentSlot(int $a_now): ?array
     {
         global $DIC;
 
+        /** @var ilDBInterface $ilDB */
         $ilDB = $DIC['ilDB'];
 
         // get latest slot in db
-        $sql = 'SELECT MAX(slot_end) previous_slot_end' .
-            ' FROM usr_session_stats';
+        $sql = 'SELECT MAX(slot_end) previous_slot_end FROM usr_session_stats';
         $res = $ilDB->query($sql);
         $row = $ilDB->fetchAssoc($res);
         $previous_slot_end = $row['previous_slot_end'];
@@ -166,46 +158,53 @@ protected static function getCurrentSlot(int $a_now): ?array
         if ($current_slot_end < $a_now) {
             return [$current_slot_begin, $current_slot_end];
         }
+
         return null;
     }
 
-    protected static function getNumberOfActiveRawSessions(int $a_time): int
+    private static function getNumberOfActiveRawSessions(int $a_time): int
     {
         global $DIC;
 
+        /** @var ilDBInterface $ilDB */
         $ilDB = $DIC['ilDB'];
 
-        $statement = self::getNumberOfActiveRawSessionsPreparedStatement();
-        $row = $DIC->database()->fetchAssoc($DIC->database()->execute($statement, [$a_time, $a_time]));
-        return (int) $row['counter'];
+        return (int) $ilDB->fetchAssoc(
+            $ilDB->execute(
+                self::getNumberOfActiveRawSessionsPreparedStatement(),
+                [$a_time, $a_time]
+            )
+        )['counter'];
     }
 
     /**
-     * Read raw data for timespan
-     * @return Generator<list<array{start_time: int, end_time: ?int, end_context: ?int}>>
+     * @return Generator<array{start_time: int, end_time: ?int, end_context: ?int}>
      */
-    protected static function getRawData(int $a_begin, int $a_end): Generator
+    private static function getRawData(int $a_begin, int $a_end): Generator
     {
         global $DIC;
 
-        $res = $DIC->database()->execute(
+        /** @var ilDBInterface $ilDB */
+        $ilDB = $DIC['ilDB'];
+
+        $res = $ilDB->execute(
             self::getRawDataPreparedStatement(),
             [$a_end, $a_begin]
         );
-        while ($row = $DIC->database()->fetchAssoc($res)) {
+        while ($row = $ilDB->fetchAssoc($res)) {
             yield $row;
         }
     }
 
     /**
      * Create new slot (using table lock)
-     *
-     * @return array begin, end
+     * @return array{0: int, 1: int}|null
      */
-    protected static function createNewAggregationSlot(int $a_now): ?array
+    private static function createNewAggregationSlot(int $a_now): ?array
     {
         global $DIC;
 
+        /** @var ilDBInterface $ilDB */
         $ilDB = $DIC['ilDB'];
 
         $ilAtomQuery = $ilDB->buildAtomQuery();
@@ -221,8 +220,8 @@ protected static function createNewAggregationSlot(int $a_now): ?array
 
             // save slot to mark as taken
             $fields = [
-                'slot_begin' => ['integer', $slot[0]],
-                'slot_end' => ['integer', $slot[1]],
+                'slot_begin' => [ilDBConstants::T_INTEGER, $slot[0]],
+                'slot_end' => [ilDBConstants::T_INTEGER, $slot[1]],
             ];
             $ilDB->insert('usr_session_stats', $fields);
         });
@@ -232,10 +231,7 @@ protected static function createNewAggregationSlot(int $a_now): ?array
         return $slot;
     }
 
-    /**
-     * Aggregate raw session data (older than given time)
-     */
-    public static function aggretateRaw(int $a_now): void
+    public static function aggregateRaw(int $a_now): void
     {
         if (!self::isActive()) {
             return;
@@ -251,15 +247,19 @@ public static function aggretateRaw(int $a_now): void
         self::deleteAggregatedRaw($a_now);
     }
 
-    protected static function getNumberOfActiveRawSessionsPreparedStatement(): ilDbStatement
+    private static function getNumberOfActiveRawSessionsPreparedStatement(): ilDBStatement
     {
         if (self::$number_of_active_raw_sessions_statement === null) {
             global $DIC;
-            self::$number_of_active_raw_sessions_statement = $DIC->database()->prepare(
+
+            /** @var ilDBInterface $ilDB */
+            $ilDB = $DIC['ilDB'];
+
+            self::$number_of_active_raw_sessions_statement = $ilDB->prepare(
                 'SELECT COUNT(*) counter FROM usr_session_stats_raw '
                 . 'WHERE (end_time IS NULL OR end_time >= ?) '
                 . 'AND start_time <= ? '
-                . 'AND ' . $DIC->database()->in('type', ilSessionControl::$session_types_controlled, false, 'integer'),
+                . 'AND ' . $ilDB->in('type', ilSessionControl::$session_types_controlled, false, ilDBConstants::T_INTEGER),
                 [ilDBConstants::T_INTEGER, ilDBConstants::T_INTEGER]
             );
         }
@@ -267,11 +267,15 @@ protected static function getNumberOfActiveRawSessionsPreparedStatement(): ilDbS
         return self::$number_of_active_raw_sessions_statement;
     }
 
-    protected static function getAggregatedRawDataPreparedStatement(): ilDBStatement
+    private static function getAggregatedRawDataPreparedStatement(): ilDBStatement
     {
         if (!self::$aggregated_raw_data_statement) {
             global $DIC;
-            self::$aggregated_raw_data_statement = $DIC->database()->prepareManip(
+
+            /** @var ilDBInterface $ilDB */
+            $ilDB = $DIC['ilDB'];
+
+            self::$aggregated_raw_data_statement = $ilDB->prepareManip(
                 'UPDATE usr_session_stats '
                 . 'SET active_min = ?, '
                 . 'active_max = ?, '
@@ -302,15 +306,19 @@ protected static function getAggregatedRawDataPreparedStatement(): ilDBStatement
         return self::$aggregated_raw_data_statement;
     }
 
-    protected static function getRawDataPreparedStatement(): ilDBStatement
+    private static function getRawDataPreparedStatement(): ilDBStatement
     {
         if (!self::$raw_data_statement) {
             global $DIC;
-            self::$raw_data_statement = $DIC->database()->prepare(
-                'SELECT start_time,end_time,end_context FROM usr_session_stats_raw' .
-                ' WHERE start_time <= %s' .
-                ' AND (end_time IS NULL OR end_time >= %s)' .
-                ' AND ' . $DIC->database()->in('type', ilSessionControl::$session_types_controlled, false, ilDBConstants::T_INTEGER) .
+
+            /** @var ilDBInterface $ilDB */
+            $ilDB = $DIC['ilDB'];
+
+            self::$raw_data_statement = $ilDB->prepare(
+                'SELECT start_time, end_time, end_context FROM usr_session_stats_raw' .
+                ' WHERE start_time <= ?' .
+                ' AND (end_time IS NULL OR end_time >= ?)' .
+                ' AND ' . $ilDB->in('type', ilSessionControl::$session_types_controlled, false, ilDBConstants::T_INTEGER) .
                 ' ORDER BY start_time',
                 [ilDBConstants::T_INTEGER, ilDBConstants::T_INTEGER]
             );
@@ -318,10 +326,13 @@ protected static function getRawDataPreparedStatement(): ilDBStatement
         return self::$raw_data_statement;
     }
 
-    public static function aggregateRawHelper(int $a_begin, int $a_end)
+    private static function aggregateRawHelper(int $a_begin, int $a_end): void
     {
         global $DIC;
 
+        /** @var ilDBInterface $ilDB */
+        $ilDB = $DIC['ilDB'];
+
         // "relevant" closing types
         $separate_closed = [
             ilSession::SESSION_CLOSE_USER,
@@ -330,7 +341,8 @@ public static function aggregateRawHelper(int $a_begin, int $a_end)
         ];
 
         // gather/process data (build event timeline)
-        $closed_counter = $events = [];
+        $events = [];
+        $closed_counter = $events;
         $opened_counter = 0;
         foreach (self::getRawData($a_begin, $a_end) as $item) {
             // open/close counters are _not_ time related
@@ -360,11 +372,14 @@ public static function aggregateRawHelper(int $a_begin, int $a_end)
             }
         }
 
-        // initialising active statistical values
+        // initializing active statistical values
         $active_begin = self::getNumberOfActiveRawSessions($a_begin - 1);
-        $active_end = $active_min = $active_max = $active_avg = $active_begin;
+        $active_avg = $active_begin;
+        $active_max = $active_begin;
+        $active_min = $active_begin;
+        $active_end = $active_begin;
 
-        // parsing events / building avergages
+        // parsing events / building averages
         if (count($events)) {
             $last_update_avg = $a_begin - 1;
             $slot_seconds = self::SLOT_SIZE * 60;
@@ -411,8 +426,7 @@ public static function aggregateRawHelper(int $a_begin, int $a_end)
         }
         unset($events);
 
-
-        $DIC->database()->execute(
+        $ilDB->execute(
             self::getAggregatedRawDataPreparedStatement(),
             [
                 'active_min' => $active_min,
@@ -425,18 +439,16 @@ public static function aggregateRawHelper(int $a_begin, int $a_end)
                 'closed_login' => (int) ($closed_counter[ilSession::SESSION_CLOSE_LOGIN] ?? 0),
                 'closed_misc' => (int) ($closed_counter[0] ?? 0),
                 'slot_begin' => $a_begin,
-                'slot_end' => $a_end,
+                'slot_end' => $a_end
             ]
         );
     }
 
-    /**
-     * Remove already aggregated raw data
-     */
-    protected static function deleteAggregatedRaw(int $a_now): void
+    private static function deleteAggregatedRaw(int $a_now): void
     {
         global $DIC;
 
+        /** @var ilDBInterface $ilDB */
         $ilDB = $DIC['ilDB'];
 
         // we are rather defensive here - 7 days BEFORE current aggregation
@@ -444,31 +456,33 @@ protected static function deleteAggregatedRaw(int $a_now): void
 
         $ilDB->manipulate(
             'DELETE FROM usr_session_stats_raw' .
-            ' WHERE start_time <= ' . $ilDB->quote($cut, 'integer')
+            ' WHERE start_time <= ' . $ilDB->quote($cut, ilDBConstants::T_INTEGER)
         );
     }
 
     /**
-     * Get session counters by type (opened, closed)
+     * @return array{opened: int, closed_manual: int, closed_expire: int, closed_login: int, closed_misc: int}
      */
     public static function getNumberOfSessionsByType(int $a_from, int $a_to): array
     {
         global $DIC;
 
+        /** @var ilDBInterface $ilDB */
         $ilDB = $DIC['ilDB'];
 
         $sql = 'SELECT SUM(opened) opened, SUM(closed_manual) closed_manual,' .
             ' SUM(closed_expire) closed_expire,' .
             ' SUM(closed_login) closed_login, SUM(closed_misc) closed_misc' .
             ' FROM usr_session_stats' .
-            ' WHERE slot_end > ' . $ilDB->quote($a_from, 'integer') .
-            ' AND slot_begin < ' . $ilDB->quote($a_to, 'integer');
+            ' WHERE slot_end > ' . $ilDB->quote($a_from, ilDBConstants::T_INTEGER) .
+            ' AND slot_begin < ' . $ilDB->quote($a_to, ilDBConstants::T_INTEGER);
         $res = $ilDB->query($sql);
+
         return $ilDB->fetchAssoc($res);
     }
 
     /**
-     * Get active sessions aggregated data
+     * @return list<array{slot_begin: int, slot_end: int, active_min: int, active_max: int, active_avg: int}>
      */
     public static function getActiveSessions(int $a_from, int $a_to): array
     {
@@ -479,18 +493,16 @@ public static function getActiveSessions(int $a_from, int $a_to): array
 
         $sql = 'SELECT slot_begin, slot_end, active_min, active_max, active_avg' .
             ' FROM usr_session_stats' .
-            ' WHERE slot_end > ' . $ilDB->quote($a_from, 'integer') .
-            ' AND slot_begin < ' . $ilDB->quote($a_to, 'integer') .
+            ' WHERE slot_end > ' . $ilDB->quote($a_from, ilDBConstants::T_INTEGER) .
+            ' AND slot_begin < ' . $ilDB->quote($a_to, ilDBConstants::T_INTEGER) .
             ' ORDER BY slot_begin';
         $res = $ilDB->query($sql);
+
         $all = [];
         while ($row = $ilDB->fetchAssoc($res)) {
-            $entry = [];
-            foreach ($row as $key => $value) {
-                $entry[$key] = (int) $value;
-            }
-            $all[] = $entry;
+            $all[] = array_map(intval(...), $row);
         }
+
         return $all;
     }
 
@@ -503,12 +515,13 @@ public static function getLastAggregation(): ?int
 
         $ilDB = $DIC['ilDB'];
 
-        $sql = 'SELECT max(slot_end) latest FROM usr_session_stats';
+        $sql = 'SELECT MAX(slot_end) latest FROM usr_session_stats';
         $res = $ilDB->query($sql);
         $row = $ilDB->fetchAssoc($res);
-        if ($row['latest']) {
+        if ($row['latest'] !== null) {
             return (int) $row['latest'];
         }
+
         //TODO check if return null as timestamp causes issues
         return null;
     }
diff --git a/components/ILIAS/Authentication/classes/class.ilSessionStatisticsGUI.php b/components/ILIAS/Authentication/classes/class.ilSessionStatisticsGUI.php
index f376c171789f..890937ba001e 100755
--- a/components/ILIAS/Authentication/classes/class.ilSessionStatisticsGUI.php
+++ b/components/ILIAS/Authentication/classes/class.ilSessionStatisticsGUI.php
@@ -736,7 +736,7 @@ protected function adminSync(): void
         // see ilSession::_writeData()
         $now = time();
         ilSession::_destroyExpiredSessions();
-        ilSessionStatistics::aggretateRaw($now);
+        ilSessionStatistics::aggregateRaw($now);
 
         $this->tpl->setOnScreenMessage('success', $this->lng->txt('trac_sync_session_stats_success'), true);
         $this->ilCtrl->redirect($this);

From 7e3d53ba3777f5e68f8b9ce8b2d9fbb58f708409 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 12:45:24 +0100
Subject: [PATCH 023/141] 45037: Description texts under the fields Upload File
 and External URL in Media Pools are interchanged

---
 .../PC/MediaObject/class.ilPCMediaObjectEditorGUI.php     | 7 ++++++-
 .../MediaObjects/Creation/class.ilMediaCreationGUI.php    | 4 ++--
 .../MediaObjects/MediaType/class.MediaTypeManager.php     | 8 ++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/components/ILIAS/COPage/PC/MediaObject/class.ilPCMediaObjectEditorGUI.php b/components/ILIAS/COPage/PC/MediaObject/class.ilPCMediaObjectEditorGUI.php
index f3835e7b3115..92b181b8325e 100755
--- a/components/ILIAS/COPage/PC/MediaObject/class.ilPCMediaObjectEditorGUI.php
+++ b/components/ILIAS/COPage/PC/MediaObject/class.ilPCMediaObjectEditorGUI.php
@@ -221,6 +221,8 @@ public function getRenderedUrlForm(
     public function getUrlForm(
         ilLanguage $lng
     ): ilPropertyFormGUI {
+        global $DIC;
+        $media_types = $DIC->mediaObjects()->internal()->domain()->mediaType();
         $form = new ilPropertyFormGUI();
         $form->setShowTopButtons(false);
 
@@ -240,8 +242,11 @@ public function getUrlForm(
         $form->addItem($hi3);
 
         // standard reference
+        $lng->loadLanguageModule("mob");
         $ti = new ilTextInputGUI($lng->txt("url"), "standard_reference");
-        $ti->setInfo($lng->txt("cont_url_info"));
+        $info = $lng->txt("mob_url_info1") . " " . implode(", ", iterator_to_array($media_types->getAllowedSuffixes())) . ".";
+        $info .= " " . $lng->txt("mob_url_info_video");
+        $ti->setInfo($info);
         $ti->setRequired(true);
         $form->addItem($ti);
 
diff --git a/components/ILIAS/MediaObjects/Creation/class.ilMediaCreationGUI.php b/components/ILIAS/MediaObjects/Creation/class.ilMediaCreationGUI.php
index 7141d5766799..2e18477fb7e3 100755
--- a/components/ILIAS/MediaObjects/Creation/class.ilMediaCreationGUI.php
+++ b/components/ILIAS/MediaObjects/Creation/class.ilMediaCreationGUI.php
@@ -170,7 +170,7 @@ protected function getMimeTypes($local_only = false): array
     {
         $mimes = [];
         if (in_array(self::TYPE_ALL, $this->accept_types)) {
-            $mimes = iterator_to_array($this->type_manager->getAllowedMimeTypes());
+            $mimes = iterator_to_array($this->type_manager->getAllowedMimeTypes($local_only));
         }
         if (in_array(self::TYPE_VIDEO, $this->accept_types)) {
             $mimes = array_merge($mimes, iterator_to_array($this->type_manager->getAllowedVideoMimeTypes($local_only)));
@@ -287,7 +287,7 @@ public function initUrlForm(): ilPropertyFormGUI
         //
         $ti = new \ilTextInputGUI($lng->txt("mob_url"), "url");
         $info = $lng->txt("mob_url_info1") . " " . implode(", ", $this->getSuffixes()) . ".";
-        if (in_array(self::TYPE_VIDEO, $this->accept_types)) {
+        if (in_array(self::TYPE_VIDEO, $this->accept_types) || in_array(self::TYPE_ALL, $this->accept_types)) {
             $info .= " " . $lng->txt("mob_url_info_video");
         }
         $ti->setInfo($info);
diff --git a/components/ILIAS/MediaObjects/MediaType/class.MediaTypeManager.php b/components/ILIAS/MediaObjects/MediaType/class.MediaTypeManager.php
index 0c5914549ab8..3bf78e2c7c99 100755
--- a/components/ILIAS/MediaObjects/MediaType/class.MediaTypeManager.php
+++ b/components/ILIAS/MediaObjects/MediaType/class.MediaTypeManager.php
@@ -220,9 +220,13 @@ public function getMimeTypes(): \Iterator
         }
     }
 
-    public function getAllowedMimeTypes(): \Iterator
+    public function getAllowedMimeTypes(bool $local_only = false): \Iterator
     {
-        return $this->getAllowedSubset($this->getMimeTypes());
+        foreach ($this->getAllowedSubset($this->getMimeTypes()) as $mime) {
+            if (!$local_only || !in_array($mime, ["video/vimeo", "video/youtube"])) {
+                yield $mime;
+            }
+        }
     }
 
     public function getVideoMimeTypes(bool $local_only = false): \Iterator

From 31926389aaa0b125a8685fb79eb45c119609fc01 Mon Sep 17 00:00:00 2001
From: Stefan Meyer <meyer@leifos.de>
Date: Thu, 12 Feb 2026 12:52:07 +0100
Subject: [PATCH 024/141] RPC: switched to log4j-bom

---
 components/ILIAS/WebServices/RPC/lib/pom.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/ILIAS/WebServices/RPC/lib/pom.xml b/components/ILIAS/WebServices/RPC/lib/pom.xml
index 5921a80a0890..36ec37ed0f4b 100755
--- a/components/ILIAS/WebServices/RPC/lib/pom.xml
+++ b/components/ILIAS/WebServices/RPC/lib/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.ilias.ilserver</groupId>
     <artifactId>ilServer</artifactId>
-    <version>12.0.1</version>
+    <version>12.0.2</version>
    <build>
         <finalName>ilServer</finalName>
         <plugins>
@@ -88,6 +88,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-bom</artifactId>
+                <version>2.25.3</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -101,31 +108,26 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.23.1</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.23.1</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-jcl -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-jcl</artifactId>
-            <version>2.23.1</version>
         </dependency>
         <!-- required for commons-configuration2 logging  -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.23.1</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-1.2-api</artifactId>
-            <version>2.23.1</version>
         </dependency>
         <!-- used for ilServer.ini parsing -->
         <dependency>

From 0d5b417ed37c0f6c802a97d71ef2d67a652f26ba Mon Sep 17 00:00:00 2001
From: Stefan Meyer <meyer@leifos.de>
Date: Thu, 12 Feb 2026 13:14:07 +0100
Subject: [PATCH 025/141] Membership: Attendance list user defined fields are
 selected according to settings of parent group/course

---
 .../Membership/classes/class.ilAttendanceList.php   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/components/ILIAS/Membership/classes/class.ilAttendanceList.php b/components/ILIAS/Membership/classes/class.ilAttendanceList.php
index 5a59245fa8a8..08b02216a4fb 100755
--- a/components/ILIAS/Membership/classes/class.ilAttendanceList.php
+++ b/components/ILIAS/Membership/classes/class.ilAttendanceList.php
@@ -37,6 +37,7 @@ class ilAttendanceList
     protected ilObject $parent_obj;
     protected ?ilParticipants $participants;
     protected ?ilWaitingList $waiting_list;
+    protected ilTree $tree;
     /**
      * @var ?callable
      */
@@ -67,7 +68,7 @@ public function __construct(
         $this->ctrl = $DIC->ctrl();
         $this->tpl = $DIC->ui()->mainTemplate();
         $this->profile = $DIC['user']->getProfile();
-
+        $this->tree = $DIC->repositoryTree();
         $this->parent_gui = $a_parent_gui;
         $this->parent_obj = $a_parent_obj;
         $this->participants = $a_participants_object;
@@ -137,10 +138,14 @@ protected function readOrderedExportableFields(): bool
             );
         }
 
+        $parent_obj_type = $this->tree->checkForParentType($this->parent_obj->getRefId(), 'crs') ? 'crs' : '';
+        $parent_obj_type = $this->tree->checkForParentType($this->parent_obj->getRefId(), 'grp') ? 'grp' : $parent_obj_type;
+        $user_defined_fields = $parent_obj_type === ''
+            ? $this->profile->getAllUserDefinedFields()
+            : $this->profile->getVisibleUserDefinedFields(Context::buildFromObjectType($parent_obj_type));
+
         // add udf fields
-        foreach ($this->profile->getVisibleUserDefinedFields(
-            Context::buildFromObjectType($this->parent_obj->getType())
-        ) as $field) {
+        foreach ($user_defined_fields as $field) {
             $this->presets['udf_' . $field->getIdentifier()] = array(
                 $field->getLabel($this->lng),
                 false

From 3d523a625fc00fed0767f121163baa067f19fc6c Mon Sep 17 00:00:00 2001
From: Tim Schmitz <schmitz@leifos.de>
Date: Thu, 12 Feb 2026 13:16:34 +0100
Subject: [PATCH 026/141] Tracking: fix details action in lp progress block
 (46962)

---
 .../classes/class.ilLPProgressBlockGUI.php    | 31 +++++++++++++++++++
 lang/ilias_de.lang                            |  1 +
 lang/ilias_en.lang                            |  1 +
 3 files changed, 33 insertions(+)

diff --git a/components/ILIAS/Tracking/classes/class.ilLPProgressBlockGUI.php b/components/ILIAS/Tracking/classes/class.ilLPProgressBlockGUI.php
index 4cdbcafa6542..f9027f5ec894 100644
--- a/components/ILIAS/Tracking/classes/class.ilLPProgressBlockGUI.php
+++ b/components/ILIAS/Tracking/classes/class.ilLPProgressBlockGUI.php
@@ -43,6 +43,7 @@ public function __construct()
         $this->setBlockId('lpprogress_' . $this->ctrl->getContextObjId());
         $this->setTitle($this->lng->txt('trac_progress_block_title'));
         $this->setPresentation(self::PRES_SEC_LEG);
+        $this->setActions();
     }
 
     public function getBlockType(): string
@@ -55,6 +56,11 @@ protected function isRepositoryObject(): bool
         return false;
     }
 
+    protected function getListItemForData(array $data): ?\ILIAS\UI\Component\Item\Item
+    {
+        return parent::getListItemForData($data); // TODO: Change the autogenerated stub
+    }
+
     protected function getLegacyContent(): string
     {
         $filter = $this->data_retrieval
@@ -81,4 +87,29 @@ protected function getLegacyContent(): string
             $mode_and_status
         ]);
     }
+
+    protected function setActions(): void
+    {
+        $read_only_allowed = true;
+        if ($this->supportsMembers($this->requested_ref_id)) {
+            $read_only_allowed = ilParticipants::_isParticipant($this->requested_ref_id, $this->user->getId());
+        }
+        if (!ilLearningProgressAccess::checkAccess($this->requested_ref_id, $read_only_allowed)) {
+            return;
+        }
+        $this->ctrl->setParameterByClass(ilLearningProgressGUI::class, 'ref_id', $this->requested_ref_id);
+        $link = $this->ctrl->getLinkTargetByClass(ilLearningProgressGUI::class);
+        $this->ctrl->clearParameterByClass(ilLearningProgressGUI::class, 'ref_id');
+        $this->addBlockCommand($link, $this->lng->txt('trac_progress_block_details'));
+    }
+
+    protected function supportsMembers(int $ref_id): bool
+    {
+        try {
+            ilParticipants::getInstance($ref_id);
+            return true;
+        } catch (Exception) {
+            return false;
+        }
+    }
 }
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 27e2b514f71f..a1b3b04e1901 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -17405,6 +17405,7 @@ trac#:#trac_paths#:#Pfade
 trac#:#trac_percentage#:#Prozent
 trac#:#trac_periodic_system_load#:#Periodische Lastdarstellung
 trac#:#trac_progress#:#Persönlicher Lernfortschritt
+trac#:#trac_progress_block_details#:#Details anzeigen
 trac#:#trac_progress_block_title#:#Ihr Lernfortschritt
 trac#:#trac_read_count#:#Zugriffe
 trac#:#trac_read_count_spent_seconds#:#Bearbeitungszeit / Zugriffe
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index 1617f7f9bbce..0a515f577e4b 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -17375,6 +17375,7 @@ trac#:#trac_paths#:#Paths
 trac#:#trac_percentage#:#Percentage
 trac#:#trac_periodic_system_load#:#Periodic
 trac#:#trac_progress#:#Personal Learning Progress
+trac#:#trac_progress_block_details#:#View Details
 trac#:#trac_progress_block_title#:#Your Learning Progress
 trac#:#trac_read_count#:#Access Number
 trac#:#trac_read_count_spent_seconds#:#Time Spent / Access

From 7799980aa4a3c2fc6358b4d71824ec362f6bb799 Mon Sep 17 00:00:00 2001
From: Tim Schmitz <schmitz@leifos.de>
Date: Thu, 12 Feb 2026 13:18:04 +0100
Subject: [PATCH 027/141] Tracking: fix last commit

---
 .../ILIAS/Tracking/classes/class.ilLPProgressBlockGUI.php    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/components/ILIAS/Tracking/classes/class.ilLPProgressBlockGUI.php b/components/ILIAS/Tracking/classes/class.ilLPProgressBlockGUI.php
index f9027f5ec894..80894e93a3c9 100644
--- a/components/ILIAS/Tracking/classes/class.ilLPProgressBlockGUI.php
+++ b/components/ILIAS/Tracking/classes/class.ilLPProgressBlockGUI.php
@@ -56,11 +56,6 @@ protected function isRepositoryObject(): bool
         return false;
     }
 
-    protected function getListItemForData(array $data): ?\ILIAS\UI\Component\Item\Item
-    {
-        return parent::getListItemForData($data); // TODO: Change the autogenerated stub
-    }
-
     protected function getLegacyContent(): string
     {
         $filter = $this->data_retrieval

From 7a6f6aef50bc4f59f95a863dd676c6a86a129d6d Mon Sep 17 00:00:00 2001
From: "Alex Hartwig (Qualitus)" <hartwig@qualitus.de>
Date: Thu, 12 Feb 2026 13:44:06 +0100
Subject: [PATCH 028/141] Fix Mantis #45285: imsmanifest.xml not found (#11051)

---
 .../ScormAicc/classes/class.ilObjSAHSLearningModuleGUI.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/ScormAicc/classes/class.ilObjSAHSLearningModuleGUI.php b/components/ILIAS/ScormAicc/classes/class.ilObjSAHSLearningModuleGUI.php
index 073295e1523c..f83c4081fe9b 100755
--- a/components/ILIAS/ScormAicc/classes/class.ilObjSAHSLearningModuleGUI.php
+++ b/components/ILIAS/ScormAicc/classes/class.ilObjSAHSLearningModuleGUI.php
@@ -429,7 +429,7 @@ public function uploadObject(): void
                 $newObj->getDataDirectory(),
                 false,
                 false,
-                true
+                false
             );
         }
         ilFileUtils::renameExecutables($newObj->getDataDirectory());

From 0d978768629710b425e4befd5c1fdcfdd6a146c1 Mon Sep 17 00:00:00 2001
From: Fabian Helfer <82493694+fhelfer@users.noreply.github.com>
Date: Thu, 12 Feb 2026 14:13:39 +0100
Subject: [PATCH 029/141] [FIX] #46465 UI: remove duplicate
 `Input\Container\Form\Standard` buttons. (#10812)

* Fixes https://mantis.ilias.de/view.php?id=46465
* Remove duplicate submit- and additional action-buttons from standard form headers
* Update rendering unit tests
---
 .../Component/Input/Container/Form/Renderer.php      |  6 ------
 .../UI/src/templates/default/Input/tpl.standard.html |  6 ------
 .../Input/Container/Form/StandardFormTest.php        | 12 +-----------
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/components/ILIAS/UI/src/Implementation/Component/Input/Container/Form/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/Input/Container/Form/Renderer.php
index 5871981dfe04..0f3a5194229e 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Input/Container/Form/Renderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Input/Container/Form/Renderer.php
@@ -52,11 +52,6 @@ protected function renderStandard(Form\Standard $component, RendererInterface $d
 
         $additional_form_actions = $component->getAdditionalFormActions();
         foreach ($additional_form_actions as $action => $label) {
-            $tpl->setCurrentBlock('with_additional_form_action_top');
-            $tpl->setVariable('ACTION_TOP', $action);
-            $tpl->setVariable('ACTION_LABEL_TOP', $label);
-            $tpl->parseCurrentBlock();
-
             $tpl->setCurrentBlock('with_additional_form_action_bottom');
             $tpl->setVariable('ACTION_BOTTOM', $action);
             $tpl->setVariable('ACTION_LABEL_BOTTOM', $label);
@@ -74,7 +69,6 @@ protected function renderStandard(Form\Standard $component, RendererInterface $d
             ""
         );
 
-        $tpl->setVariable("BUTTONS_TOP", $default_renderer->render($main_submit_button));
         $tpl->setVariable("BUTTONS_BOTTOM", $default_renderer->render($main_submit_button));
         $tpl->setVariable("INPUTS", $default_renderer->render($component->getInputGroup()));
 
diff --git a/components/ILIAS/UI/src/templates/default/Input/tpl.standard.html b/components/ILIAS/UI/src/templates/default/Input/tpl.standard.html
index 5c5a797b0c24..09b76eb03d0c 100755
--- a/components/ILIAS/UI/src/templates/default/Input/tpl.standard.html
+++ b/components/ILIAS/UI/src/templates/default/Input/tpl.standard.html
@@ -1,11 +1,5 @@
 <form class="c-form c-form--horizontal" enctype="multipart/form-data" {NAME}<!-- BEGIN action --> action="{URL}"<!-- END action --> method="post">
 	<div class="c-form__header">
-		<div class="c-form__actions">
-            <!-- BEGIN with_additional_form_action_top -->
-            <button class="btn btn-default btn-standard" formaction="{ACTION_TOP}">{ACTION_LABEL_TOP}</button>
-            <!-- END with_additional_form_action_top -->
-            {BUTTONS_TOP}
-        </div>
 		<!-- BEGIN required_text_top -->
 		<div class="c-form__required">
 			<span class="asterisk">*</span><span class="small"> {TXT_REQUIRED_TOP}</span>
diff --git a/components/ILIAS/UI/tests/Component/Input/Container/Form/StandardFormTest.php b/components/ILIAS/UI/tests/Component/Input/Container/Form/StandardFormTest.php
index fc8bc1fa0b6e..f9db51cac6af 100755
--- a/components/ILIAS/UI/tests/Component/Input/Container/Form/StandardFormTest.php
+++ b/components/ILIAS/UI/tests/Component/Input/Container/Form/StandardFormTest.php
@@ -126,12 +126,11 @@ public function testRender(): void
             ]);
 
         $r = $this->getDefaultRenderer();
-        $html = $this->getDefaultRenderer()->render($form);
+        $html = $this->brutallyTrimHTML($this->getDefaultRenderer()->render($form));
 
         $expected = $this->brutallyTrimHTML('
         <form class="c-form c-form--horizontal" enctype="multipart/form-data" action="MY_URL" method="post">
            <div class="c-form__header">
-              <div class="c-form__actions"><button class="btn btn-default" data-action="">save</button></div>
            </div>'
            . $this->getTextFieldHtml() .
           '<div class="c-form__footer">
@@ -176,7 +175,6 @@ public function testSubmitCaptionRender(): void
         $expected = $this->brutallyTrimHTML('
         <form class="c-form c-form--horizontal" enctype="multipart/form-data" action="MY_URL" method="post">
            <div class="c-form__header">
-              <div class="c-form__actions"><button class="btn btn-default" data-action="">create</button></div>
            </div>'
             . $this->getTextFieldHtml() .
            '<div class="c-form__footer">
@@ -203,9 +201,6 @@ public function testRenderNoUrl(): void
         $expected = $this->brutallyTrimHTML('
         <form class="c-form c-form--horizontal" enctype="multipart/form-data" method="post">
             <div class="c-form__header">
-                <div class="c-form__actions">
-                    <button class="btn btn-default" data-action="">save</button>
-                </div>
             </div>'
            . $this->getTextFieldHtml() .
            '<div class="c-form__footer">
@@ -264,9 +259,6 @@ public function testRenderWithErrorOnField(): void
         $expected = $this->brutallyTrimHTML('
 <form class="c-form c-form--horizontal" enctype="multipart/form-data" method="post">
     <div class="c-form__header">
-        <div class="c-form__actions">
-            <button class="btn btn-default" data-action="">save</button>
-        </div>
     </div>
     <div class="c-form__error-msg alert alert-danger"><span class="sr-only">ui_error:</span>testing error
         message
@@ -341,7 +333,6 @@ public function testRenderWithErrorOnForm(): void
         $expected = $this->brutallyTrimHTML('
             <form class="c-form c-form--horizontal" enctype="multipart/form-data" method="post">
                 <div class="c-form__header">
-                    <div class="c-form__actions"><button class="btn btn-default" data-action="">save</button></div>
                 </div>
                 <div class="c-form__error-msg alert alert-danger"><span class="sr-only">ui_error:</span>This is a fail on form.</div>
                 ' . $field_html . '
@@ -377,7 +368,6 @@ public function testStandardFormRenderWithRequired(): void
         $expected = $this->brutallyTrimHTML('
 <form class="c-form c-form--horizontal" enctype="multipart/form-data" action="MY_URL" method="post">
     <div class="c-form__header">
-        <div class="c-form__actions"><button class="btn btn-default" data-action="">save</button></div>
         <div class="c-form__required">
             <span class="asterisk">*</span><span class="small"> required_field</span>
         </div>

From b6f952ac0b6308b67776e9f9c82f78674a62aa67 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 15:06:53 +0100
Subject: [PATCH 030/141] 42980: Edit text bold: Editor creates new paragraph
 for each letter you type

---
 .../js/src/components/paragraph/ui/tiny-wrapper.js     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/ILIAS/COPage/Editor/js/src/components/paragraph/ui/tiny-wrapper.js b/components/ILIAS/COPage/Editor/js/src/components/paragraph/ui/tiny-wrapper.js
index aa390ff7e560..9690d37bf72c 100755
--- a/components/ILIAS/COPage/Editor/js/src/components/paragraph/ui/tiny-wrapper.js
+++ b/components/ILIAS/COPage/Editor/js/src/components/paragraph/ui/tiny-wrapper.js
@@ -212,8 +212,6 @@ export default class TinyWrapper {
         plugins: 'save,lists',
         license_key: 'gpl',
         smart_paste: false,
-        save_onsavecallback: 'saveParagraph',
-        mode: 'exact',
         selector: `#${this.id}`,
         content_css: this.content_css,
         fix_list_elements: true,
@@ -226,8 +224,6 @@ export default class TinyWrapper {
         removeformat_selector: 'span,code',
         remove_linebreaks: true,
         convert_newlines_to_brs: false,
-        force_p_newlines: true,
-        force_br_newlines: false,
         /* not found in 3 docu (anymore?) */
         cleanup_on_startup: true,
         cleanup: true,
@@ -1133,7 +1129,11 @@ export default class TinyWrapper {
         children = dummy.childNodes;
         for (let k = 0; k < children.length; k++) {
           if (children[k].nodeName === 'P') { // paragraphs
-            contents.push(html.p2br(children[k].innerHTML));
+            if (children[k].textContent === '') { // see #42980
+              contents.push('');
+            } else {
+              contents.push(html.p2br(children[k].innerHTML));
+            }
           } else if (children[k].nodeType === 3) { // text nodes (seems to be only \n)
             //            contents.push(html.p2br(children[k].textContent));
           } else {

From 723306dbd8d94c66a0d643d5a668f8d30c09c71c Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 16:12:36 +0100
Subject: [PATCH 031/141] 46217: Remaining steps in migrations keep increasing;
 solution rid

---
 .../ILIAS/Exercise/Assignment/class.ilExAssignment.php     | 3 ++-
 .../TutorFeedbackFile/TutorFeedbackFileRepository.php      | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/components/ILIAS/Exercise/Assignment/class.ilExAssignment.php b/components/ILIAS/Exercise/Assignment/class.ilExAssignment.php
index 6ca1fd334003..45d6eb0be093 100755
--- a/components/ILIAS/Exercise/Assignment/class.ilExAssignment.php
+++ b/components/ILIAS/Exercise/Assignment/class.ilExAssignment.php
@@ -760,7 +760,8 @@ public function save(): void
             "max_char_limit" => array("integer", $this->getMaxCharLimit()),
             "relative_deadline" => array("integer", $this->getRelativeDeadline()),
             "rel_deadline_last_subm" => array("integer", $this->getRelDeadlineLastSubmission()),
-            "deadline_mode" => array("integer", $this->getDeadlineMode())
+            "deadline_mode" => array("integer", $this->getDeadlineMode()),
+            "solution_rid" => array("text", ''),
             ));
         $this->setId($next_id);
         $exc = new ilObjExercise($this->getExerciseId(), false);
diff --git a/components/ILIAS/Exercise/TutorFeedbackFile/TutorFeedbackFileRepository.php b/components/ILIAS/Exercise/TutorFeedbackFile/TutorFeedbackFileRepository.php
index b294d1e4a60b..53db9beb92bc 100755
--- a/components/ILIAS/Exercise/TutorFeedbackFile/TutorFeedbackFileRepository.php
+++ b/components/ILIAS/Exercise/TutorFeedbackFile/TutorFeedbackFileRepository.php
@@ -59,6 +59,13 @@ public function createCollection(int $ass_id, int $user_id): void
         );
     }
 
+    public function createCollectionIfMissing(int $ass_id, int $user_id): void
+    {
+        if (!$this->hasCollection($ass_id, $user_id)) {
+            $this->createCollection($ass_id, $user_id);
+        }
+    }
+
     public function getIdStringForAssIdAndUserId(int $ass_id, int $user_id): string
     {
         $set = $this->db->queryF(

From f0fc333cf2917dae94b06d59533a345d3c74bff7 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 16:27:54 +0100
Subject: [PATCH 032/141] 46217: Remaining steps in migrations keep increasing;
 ilExerciseSubmissionMigration

---
 .../ILIAS/Exercise/Submission/class.ilExSubmission.php     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/ILIAS/Exercise/Submission/class.ilExSubmission.php b/components/ILIAS/Exercise/Submission/class.ilExSubmission.php
index af3982376574..82329a2826a5 100755
--- a/components/ILIAS/Exercise/Submission/class.ilExSubmission.php
+++ b/components/ILIAS/Exercise/Submission/class.ilExSubmission.php
@@ -719,8 +719,8 @@ public function addResourceObject(
         $next_id = $ilDB->nextId("exc_returned");
         $query = sprintf(
             "INSERT INTO exc_returned " .
-                         "(returned_id, obj_id, user_id, filetitle, ass_id, ts, atext, late, team_id) " .
-                         "VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)",
+                         "(returned_id, obj_id, user_id, filetitle, ass_id, ts, atext, late, team_id, rid) " .
+                         "VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)",
             $ilDB->quote($next_id, "integer"),
             $ilDB->quote($this->assignment->getExerciseId(), "integer"),
             $ilDB->quote($user_id, "integer"),
@@ -729,7 +729,8 @@ public function addResourceObject(
             $ilDB->quote(ilUtil::now(), "timestamp"),
             $ilDB->quote($a_text, "text"),
             $ilDB->quote($this->isLate(), "integer"),
-            $ilDB->quote($team_id, "integer")
+            $ilDB->quote($team_id, "integer"),
+            $ilDB->quote('', "text")
         );
         $ilDB->manipulate($query);
 

From e4b18a2c8198e3991a116ffac3790455b1f4a61b Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 16:45:24 +0100
Subject: [PATCH 033/141] 46217: Remaining steps in migrations keep increasing;
 ilExercisePeerFeedbackMigration

---
 .../ILIAS/Exercise/PeerReview/class.ilExPeerReview.php       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/Exercise/PeerReview/class.ilExPeerReview.php b/components/ILIAS/Exercise/PeerReview/class.ilExPeerReview.php
index a45b7d22b538..f40da7891dff 100755
--- a/components/ILIAS/Exercise/PeerReview/class.ilExPeerReview.php
+++ b/components/ILIAS/Exercise/PeerReview/class.ilExPeerReview.php
@@ -96,11 +96,12 @@ public function initPeerReviews(): bool
                 foreach ($distribution->getPeersOfRater($rater_id) as $peer_id) {
                     $next_id = $ilDB->nextId("exc_assignment_peer");
                     $ilDB->manipulate("INSERT INTO exc_assignment_peer" .
-                        " (id, ass_id, giver_id, peer_id)" .
+                        " (id, ass_id, giver_id, peer_id, migrated)" .
                         " VALUES (" . $ilDB->quote($next_id, "integer") .
                         ", " . $ilDB->quote($this->assignment_id, "integer") .
                         ", " . $ilDB->quote($rater_id, "integer") .
-                        ", " . $ilDB->quote($peer_id, "integer") . ")");
+                        ", " . $ilDB->quote($peer_id, "integer") .
+                        ", " . $ilDB->quote(1, "integer") . ")");
                 }
             }
         }

From 05d1f1c9daeaf35e823ba6be618693cfb503008a Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 17:29:11 +0100
Subject: [PATCH 034/141] 45814: Typo im Page Editor bei Datentabelle

---
 lang/ilias_de.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index a1b3b04e1901..2afee9db21d2 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -6525,7 +6525,7 @@ content#:#cont_footer#:#Fußzeile
 content#:#cont_footnote#:#Fußnote
 content#:#cont_force_all_open#:#Alle immer geöffnet
 content#:#cont_format#:#Format
-content#:#cont_format_cells#:#Zellen formattieren
+content#:#cont_format_cells#:#Zellen formatieren
 content#:#cont_fourth_edition#:#Neueste Version 'SCORM 2004 4th edition'
 content#:#cont_fourth_edition_info#:#Die neueste Version von SCORM 2004 bietet gegenüber der „3rd Edition“ einige Erweiterungen. Diese werden allerdings nur selten genutzt und können sich negativ auf die Performanz auswirken. So kann das Lernmodul Daten bereitstellen, die über SCO-Grenzen hinweg genutzt werden können. Dabei fallen nicht zu löschende Daten an, weshalb wir aus Datenschutzgründen die „3rd Edition“ empfehlen.
 content#:#cont_free_pages#:#Freie Seiten

From a1101f6cd2e6fe7309cc3e9cf68f720d702bf6c1 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 19:24:17 +0100
Subject: [PATCH 035/141] 45140: Individual Style is replaced on import

---
 .../classes/class.ilLearningModuleDataSet.php            | 2 +-
 .../classes/class.ilLearningModuleImporter.php           | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/components/ILIAS/LearningModule/classes/class.ilLearningModuleDataSet.php b/components/ILIAS/LearningModule/classes/class.ilLearningModuleDataSet.php
index dd584ae7dfb2..5ddfe9523207 100755
--- a/components/ILIAS/LearningModule/classes/class.ilLearningModuleDataSet.php
+++ b/components/ILIAS/LearningModule/classes/class.ilLearningModuleDataSet.php
@@ -586,7 +586,7 @@ public function importRecord(
                 }
 
                 $a_mapping->addMapping("components/ILIAS/LearningModule", "lm", $a_rec["Id"], $newObj->getId());
-                $a_mapping->addMapping("components/ILIAS/LearningModule", "lm_style", $newObj->getId(), $a_rec["StyleId"]);
+                $a_mapping->addMapping("components/ILIAS/LearningModule", "lm_style", $newObj->getId(), $a_rec["StyleId"] ?? "");
                 $a_mapping->addMapping("components/ILIAS/ILIASObject", "obj", $a_rec["Id"], $newObj->getId());
                 $a_mapping->addMapping(
                     "components/ILIAS/MetaData",
diff --git a/components/ILIAS/LearningModule/classes/class.ilLearningModuleImporter.php b/components/ILIAS/LearningModule/classes/class.ilLearningModuleImporter.php
index a3c520b71d54..1c63bad94649 100755
--- a/components/ILIAS/LearningModule/classes/class.ilLearningModuleImporter.php
+++ b/components/ILIAS/LearningModule/classes/class.ilLearningModuleImporter.php
@@ -178,16 +178,15 @@ public function finalProcessing(ilImportMapping $a_mapping): void
             }
         }
 
-        // assign style
-        /*
+        // assign style (old values ilias 7)
         $alls_map = $a_mapping->getMappingsOfEntity("components/ILIAS/LearningModule", "lm_style");
         foreach ($alls_map as $new_lm_id => $old_style_id) {
             $new_style_id = (int) $a_mapping->getMapping("components/ILIAS/Style", "sty", $old_style_id);
             if ($new_lm_id > 0 && $new_style_id > 0) {
-                $lm = new ilObjLearningModule($new_lm_id, false);
-                $lm->writeStyleSheetId($new_style_id);
+                ilObjStyleSheet::writeStyleUsage($new_lm_id, $new_style_id);
+                ilObjStyleSheet::writeOwner($new_lm_id, $new_style_id);
             }
-        }*/
+        }
 
         // menu item ref ids
         $ref_mapping = $a_mapping->getMappingsOfEntity('components/ILIAS/Container', 'refs');

From 827c126201821542981a4d30e685474f8750f91f Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 19:59:20 +0100
Subject: [PATCH 036/141] 43857: Internal links are created as goto links

---
 .../COPage/classes/class.ilPageLinker.php     | 26 +++++++++++---
 .../class.ilLMPresentationLinker.php          | 34 +++++++++++--------
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/components/ILIAS/COPage/classes/class.ilPageLinker.php b/components/ILIAS/COPage/classes/class.ilPageLinker.php
index 51d164e4a204..f1330627497a 100755
--- a/components/ILIAS/COPage/classes/class.ilPageLinker.php
+++ b/components/ILIAS/COPage/classes/class.ilPageLinker.php
@@ -28,6 +28,7 @@ class ilPageLinker implements \ILIAS\COPage\PageLinker
     protected string $profile_back_url = "";
     protected ilCtrl $ctrl;
     protected string $cmd_gui;
+    protected \ILIAS\StaticURL\Services $static_url;
 
     public function __construct(
         string $cmd_gui_class,
@@ -44,6 +45,7 @@ public function __construct(
         $this->ctrl = (is_null($ctrl))
             ? $DIC->ctrl()
             : $ctrl;
+        $this->static_url = $DIC["static_url"];
     }
 
     public function setOffline(bool $offline = true): void
@@ -112,10 +114,18 @@ public function getLinkXML(array $int_links): string
                     case "PageObject":
                     case "StructureObject":
                         $lm_id = ilLMObject::_lookupContObjID($target_id);
-                        if ($type == "PageObject") {
-                            $href = "./goto.php?target=pg_" . $target_id . $anc_add;
+                        if ($type === "PageObject") {
+                            $href = (string) $this->static_url->builder()->build(
+                                "pg",
+                                null,
+                                [$target_id]
+                            ) . $anc_add;
                         } else {
-                            $href = "./goto.php?target=st_" . $target_id;
+                            $href = (string) $this->static_url->builder()->build(
+                                "st",
+                                null,
+                                [$target_id]
+                            ) . $anc_add;
                         }
                         if ($lm_id == "") {
                             $href = "";
@@ -159,8 +169,14 @@ public function getLinkXML(array $int_links): string
 
                     case "RepositoryItem":
                         $obj_type = ilObject::_lookupType((int) $target_id, true);
-                        $obj_id = ilObject::_lookupObjId((int) $target_id);
-                        $href = "./goto.php?target=" . $obj_type . "_" . $target_id;
+                        if ((int) $target_id > 0) {
+                            $href = (string) $this->static_url->builder()->build(
+                                $obj_type,
+                                new \ILIAS\Data\ReferenceId($target_id)
+                            );
+                        } else {
+                            $href = "#";
+                        }
                         break;
 
                     case "File":
diff --git a/components/ILIAS/LearningModule/Presentation/class.ilLMPresentationLinker.php b/components/ILIAS/LearningModule/Presentation/class.ilLMPresentationLinker.php
index 54370b34d588..0d7ad28141fd 100755
--- a/components/ILIAS/LearningModule/Presentation/class.ilLMPresentationLinker.php
+++ b/components/ILIAS/LearningModule/Presentation/class.ilLMPresentationLinker.php
@@ -41,6 +41,7 @@ class ilLMPresentationLinker implements \ILIAS\COPage\PageLinker
     protected bool $export_all_languages;
     protected string $lang;
     protected string $export_format;
+    protected \ILIAS\StaticURL\Services $static_url;
 
     public function __construct(
         ilObjLearningModule $lm,
@@ -77,6 +78,7 @@ public function __construct(
         $this->embed_mode = $embed_mode;
         $this->frame = $frame;
         $this->obj_id = $obj_id;
+        $this->static_url = $DIC["static_url"];
     }
 
     public function setOffline(
@@ -384,18 +386,18 @@ public function getLinkXML(
                                 $ltarget = "_blank";
                             }
                         } else {
-                            if (!$this->offline) {
-                                if ($type == "PageObject") {
-                                    $href = "./goto.php?target=pg_" . $target_id . $anc_add;
-                                } else {
-                                    $href = "./goto.php?target=st_" . $target_id;
-                                }
+                            if ($type == "PageObject") {
+                                $href = (string) $this->static_url->builder()->build(
+                                    "pg",
+                                    null,
+                                    [$target_id]
+                                ) . $anc_add;
                             } else {
-                                if ($type == "PageObject") {
-                                    $href = ILIAS_HTTP_PATH . "/goto.php?target=pg_" . $target_id . $anc_add . "&amp;client_id=" . CLIENT_ID;
-                                } else {
-                                    $href = ILIAS_HTTP_PATH . "/goto.php?target=st_" . $target_id . "&amp;client_id=" . CLIENT_ID;
-                                }
+                                $href = (string) $this->static_url->builder()->build(
+                                    "st",
+                                    null,
+                                    [$target_id]
+                                ) . $anc_add;
                             }
                             $ltarget = "";
                             if ($targetframe == "New" || $this->embed_mode) {
@@ -446,11 +448,13 @@ public function getLinkXML(
 
                     case "RepositoryItem":
                         $obj_type = ilObject::_lookupType((int) $target_id, true);
-                        $obj_id = ilObject::_lookupObjId((int) $target_id);
-                        if (!$this->offline) {
-                            $href = "./goto.php?target=" . $obj_type . "_" . $target_id;
+                        if ((int) $target_id > 0) {
+                            $href = (string) $this->static_url->builder()->build(
+                                $obj_type,
+                                new \ILIAS\Data\ReferenceId($target_id)
+                            );
                         } else {
-                            $href = ILIAS_HTTP_PATH . "/goto.php?target=" . $obj_type . "_" . $target_id . "&amp;client_id=" . CLIENT_ID;
+                            $href = "#";
                         }
                         if ($this->embed_mode) {
                             $ltarget = "_blank";

From 6545f744855cf47d94bce0f16dde99d8b262c8aa Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 20:13:05 +0100
Subject: [PATCH 037/141] 42782: >-symbol in assigned learning module page
 doesn't get displayed properly

---
 .../Container/Content/ObjectiveView/class.ObjectiveRenderer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/Container/Content/ObjectiveView/class.ObjectiveRenderer.php b/components/ILIAS/Container/Content/ObjectiveView/class.ObjectiveRenderer.php
index 0618566c71b4..06c1597db6a2 100755
--- a/components/ILIAS/Container/Content/ObjectiveView/class.ObjectiveRenderer.php
+++ b/components/ILIAS/Container/Content/ObjectiveView/class.ObjectiveRenderer.php
@@ -467,7 +467,7 @@ protected function renderObjective(
                     $has_sections = true;
 
                     $title = $item['title'] .
-                        " &rsaquo; " . \ilLMObject::_lookupTitle($chapter['obj_id']) .
+                        " › " . \ilLMObject::_lookupTitle($chapter['obj_id']) .
                         " (" . $lng->txt('obj_' . $chapter['type']) . ")";
 
                     $item_list_gui2->setDefaultCommandParameters(array(

From eb2383624605e64d9193542ef162a4754a099f6a Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 21:15:21 +0100
Subject: [PATCH 038/141] 42765: Page Layouts: Modules vs. Object Types

---
 .../Administration/class.ilPageLayoutAdministrationGUI.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/ILIAS/COPage/Layout/Administration/class.ilPageLayoutAdministrationGUI.php b/components/ILIAS/COPage/Layout/Administration/class.ilPageLayoutAdministrationGUI.php
index aea01ff22e0e..5a8c536657c5 100755
--- a/components/ILIAS/COPage/Layout/Administration/class.ilPageLayoutAdministrationGUI.php
+++ b/components/ILIAS/COPage/Layout/Administration/class.ilPageLayoutAdministrationGUI.php
@@ -238,6 +238,7 @@ public function addPageLayout(?ilPropertyFormGUI $a_form = null): void
     public function initAddPageLayoutForm(): ilPropertyFormGUI
     {
         $this->lng->loadLanguageModule("content");
+        $this->lng->loadLanguageModule("copg");
 
         $form_gui = new ilPropertyFormGUI();
         $form_gui->setFormAction($this->ctrl->getFormAction($this));
@@ -257,7 +258,7 @@ public function initAddPageLayoutForm(): ilPropertyFormGUI
 
 
         // modules
-        $mods = new ilCheckboxGroupInputGUI($this->lng->txt("modules"), "module");
+        $mods = new ilCheckboxGroupInputGUI($this->lng->txt("copg_obj_types"), "module");
         // $mods->setRequired(true);
         foreach (ilPageLayout::getAvailableModules() as $mod_id => $mod_caption) {
             $mod = new ilCheckboxOption($mod_caption, $mod_id);

From 6323d969de2f8d533ff20d8e10b36670a969cee2 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 21:29:30 +0100
Subject: [PATCH 039/141] 42782: >-symbol in assigned learning module page
 doesn't get displayed properly

---
 .../Content/ObjectiveView/class.ilContainerObjectiveGUI.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/Container/Content/ObjectiveView/class.ilContainerObjectiveGUI.php b/components/ILIAS/Container/Content/ObjectiveView/class.ilContainerObjectiveGUI.php
index c2cd20fb9a5d..311e6fad7a19 100755
--- a/components/ILIAS/Container/Content/ObjectiveView/class.ilContainerObjectiveGUI.php
+++ b/components/ILIAS/Container/Content/ObjectiveView/class.ilContainerObjectiveGUI.php
@@ -688,7 +688,7 @@ protected function renderObjective(
                     $has_sections = true;
 
                     $title = $item['title'] .
-                        " &rsaquo; " . ilLMObject::_lookupTitle($chapter['obj_id']) .
+                        " › " . ilLMObject::_lookupTitle($chapter['obj_id']) .
                         " (" . $lng->txt('obj_' . $chapter['type']) . ")";
 
                     $item_list_gui2->setDefaultCommandParameters([

From 20f83981ae45606eb8e3f564a887053fa7a891d6 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 21:49:56 +0100
Subject: [PATCH 040/141] 43677: Internal Server Error - Drag and (Drop)

---
 components/ILIAS/COPage/Page/class.PageContentManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/COPage/Page/class.PageContentManager.php b/components/ILIAS/COPage/Page/class.PageContentManager.php
index 6fffc87827ed..94b8f5333757 100755
--- a/components/ILIAS/COPage/Page/class.PageContentManager.php
+++ b/components/ILIAS/COPage/Page/class.PageContentManager.php
@@ -668,7 +668,7 @@ public function moveContentAfter(
         string $a_tpcid = ""
     ): void {
         // nothing to do...
-        if ($a_source === $a_target) {
+        if ($a_source === $a_target || $a_spcid === $a_tpcid) {
             return;
         }
 

From 807151fddb6aa7205081183d0a91beeb81ae8445 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 23:40:50 +0100
Subject: [PATCH 041/141] =?UTF-8?q?42710:=20Failed=20test:=20Datei-Ressour?=
 =?UTF-8?q?ce=20=C3=B6ffnen,=20herunterladen,=20Revisionen=20(doppelte=20O?=
 =?UTF-8?q?ption=20in=20Filter=20Origin)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../class.ilExcTutorFeedbackFileStakeholder.php             | 6 ++++++
 .../class.ilExcTutorFeedbackZipStakeholder.php              | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/components/ILIAS/Exercise/TutorFeedbackFile/class.ilExcTutorFeedbackFileStakeholder.php b/components/ILIAS/Exercise/TutorFeedbackFile/class.ilExcTutorFeedbackFileStakeholder.php
index 6989c05bbb44..5fa12530b066 100755
--- a/components/ILIAS/Exercise/TutorFeedbackFile/class.ilExcTutorFeedbackFileStakeholder.php
+++ b/components/ILIAS/Exercise/TutorFeedbackFile/class.ilExcTutorFeedbackFileStakeholder.php
@@ -114,4 +114,10 @@ private function initDB(): void
             $this->database = $DIC->database();
         }
     }
+
+    public function getConsumerNameForPresentation(): string
+    {
+        return "ILIAS/Exercise/TutorFeedbackFile";
+    }
+
 }
diff --git a/components/ILIAS/Exercise/TutorFeedbackFile/class.ilExcTutorFeedbackZipStakeholder.php b/components/ILIAS/Exercise/TutorFeedbackFile/class.ilExcTutorFeedbackZipStakeholder.php
index 7ec35c633672..c22163667cb6 100755
--- a/components/ILIAS/Exercise/TutorFeedbackFile/class.ilExcTutorFeedbackZipStakeholder.php
+++ b/components/ILIAS/Exercise/TutorFeedbackFile/class.ilExcTutorFeedbackZipStakeholder.php
@@ -95,4 +95,10 @@ private function initDB(): void
             $this->database = $DIC->database();
         }
     }
+
+    public function getConsumerNameForPresentation(): string
+    {
+        return "ILIAS/Exercise/TutorFeedbackZip";
+    }
+
 }

From d23fe6b33b34052f5c10588d5755134dc4fa9684 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Thu, 12 Feb 2026 23:55:35 +0100
Subject: [PATCH 042/141] 42563: Download ZIP-Structure

---
 .../classes/class.ilExerciseManagementGUI.php    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/components/ILIAS/Exercise/classes/class.ilExerciseManagementGUI.php b/components/ILIAS/Exercise/classes/class.ilExerciseManagementGUI.php
index 9da79de23dfc..6efee370e777 100755
--- a/components/ILIAS/Exercise/classes/class.ilExerciseManagementGUI.php
+++ b/components/ILIAS/Exercise/classes/class.ilExerciseManagementGUI.php
@@ -446,13 +446,17 @@ public function membersObject(): void
                 }
             } elseif ($this->exercise->hasTutorFeedbackFile()) {
                 if (!$this->assignment->getAssignmentType()->usesTeams()) {
-                    // multi-feedback
-                    $ilToolbar->addButton(
-                        $this->lng->txt("exc_multi_feedback"),
-                        $this->ctrl->getLinkTarget($this, "showMultiFeedback")
-                    );
 
-                    $ilToolbar->addSeparator();
+                    $mem_data = $this->assignment->getMemberListData();
+                    if (count($mem_data) > 0) {
+                        // multi-feedback
+                        $ilToolbar->addButton(
+                            $this->lng->txt("exc_multi_feedback"),
+                            $this->ctrl->getLinkTarget($this, "showMultiFeedback")
+                        );
+
+                        $ilToolbar->addSeparator();
+                    }
                 }
             }
 

From afa7b2286e5f75b596681dfeed5bc1fd07b7bc58 Mon Sep 17 00:00:00 2001
From: kevenClausenKPG <keven.clausen@kroepelin-projekte.de>
Date: Fri, 13 Feb 2026 10:18:59 +0100
Subject: [PATCH 043/141] fix import position (#11086)

Co-authored-by: Keven Clausen <keven.clausen@kroeplin-projekte.de>
---
 .../ILIAS/Export/xml/SchemaValidation/ilias_lso_9_0.xsd       | 2 +-
 .../classes/Export/class.ilLearningSequenceXMLParser.php      | 4 +++-
 .../classes/class.ilLearningSequenceImporter.php              | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/components/ILIAS/Export/xml/SchemaValidation/ilias_lso_9_0.xsd b/components/ILIAS/Export/xml/SchemaValidation/ilias_lso_9_0.xsd
index 8dc84c42f433..b56a197e941a 100644
--- a/components/ILIAS/Export/xml/SchemaValidation/ilias_lso_9_0.xsd
+++ b/components/ILIAS/Export/xml/SchemaValidation/ilias_lso_9_0.xsd
@@ -39,7 +39,7 @@
     </xs:sequence>
     <xs:attribute name="obj_id" type="xs:string" use="required"/>
     <xs:attribute name="ref_id" type="xs:string" use="required"/>
-    <xs:attribute name="position" type="xs:string" use="required"/>
+    <xs:attribute name="position" type="xs:string" use="optional"/>
   </xs:complexType>
 
   <xs:complexType name="Condition">
diff --git a/components/ILIAS/LearningSequence/classes/Export/class.ilLearningSequenceXMLParser.php b/components/ILIAS/LearningSequence/classes/Export/class.ilLearningSequenceXMLParser.php
index 70f492df4257..61ce8b9ed344 100644
--- a/components/ILIAS/LearningSequence/classes/Export/class.ilLearningSequenceXMLParser.php
+++ b/components/ILIAS/LearningSequence/classes/Export/class.ilLearningSequenceXMLParser.php
@@ -104,7 +104,9 @@ public function handleBeginTag(
             case Writer::TAG_LSITEM:
                 $this->counter = (int) $attributes["ref_id"];
                 $this->ls_item_data[$this->counter]["ref_id"] = $attributes["ref_id"];
-                $this->ls_item_data[$this->counter]["position"] = $attributes["position"];
+                if (isset($attributes["position"])) {
+                    $this->ls_item_data[$this->counter]["position"] = $attributes["position"];
+                }
                 break;
 
             case Writer::TAG_CONDITION:
diff --git a/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceImporter.php b/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceImporter.php
index 11b61a2cc49e..fdadca6e450c 100755
--- a/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceImporter.php
+++ b/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceImporter.php
@@ -121,7 +121,9 @@ protected function buildLSItems(array $ls_data, ilImportMapping $mapping): void
                     $item_data["condition_value"]
                 );
                 $item = $item->withPostCondition($post_condition);
-                $item = $item->withOrderNumber((int) $item_data["position"]);
+                if (isset($item_data["position"])) {
+                    $item = $item->withOrderNumber((int) $item_data["position"]);
+                }
                 $updated[] = $item;
             }
         }

From c236f9564567f4145ec9bab088896ae4443d8a54 Mon Sep 17 00:00:00 2001
From: kevenClausenKPG <keven.clausen@kroepelin-projekte.de>
Date: Fri, 13 Feb 2026 10:30:03 +0100
Subject: [PATCH 044/141] [LSO]Fix Edit Permission in Admin Settings #47123
 (#11087)

* Fix Edit Permission in Settings

* CS Fixer

---------

Co-authored-by: Keven Clausen <keven.clausen@kroeplin-projekte.de>
---
 .../class.ilObjLearningSequenceAdminGUI.php      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/LearningSequence/classes/class.ilObjLearningSequenceAdminGUI.php b/components/ILIAS/LearningSequence/classes/class.ilObjLearningSequenceAdminGUI.php
index 582cbcd217bf..bf3cc48e2bdb 100755
--- a/components/ILIAS/LearningSequence/classes/class.ilObjLearningSequenceAdminGUI.php
+++ b/components/ILIAS/LearningSequence/classes/class.ilObjLearningSequenceAdminGUI.php
@@ -104,9 +104,12 @@ protected function getForm(array $values = []): Input\Container\Form\Form
         )
         ->withAdditionalTransformation(
             $this->refinery->custom()->transformation(
-                fn ($v) => (float) $v
+                fn($v) => (float) $v
             )
         );
+        if (!$this->_checkPermission('edit_permission')) {
+            $poll_interval = $poll_interval->withDisabled(true);
+        }
 
         if (isset($values[self::F_POLL_INTERVAL])) {
             $poll_interval = $poll_interval->withValue($values[self::F_POLL_INTERVAL]);
@@ -122,7 +125,7 @@ protected function getForm(array $values = []): Input\Container\Form\Form
             ->standard($target, [$section])
             ->withAdditionalTransformation(
                 $this->refinery->custom()->transformation(
-                    fn ($data) => array_shift($data)
+                    fn($data) => array_shift($data)
                 )
             );
     }
@@ -145,6 +148,11 @@ protected function edit(): void
 
     protected function save(): void
     {
+        if (!$this->_checkPermission('edit_permission')) {
+            $this->tpl->setOnScreenMessage('failure', $this->lng->txt('no_permission'));
+            $this->edit();
+            return;
+        }
         $form = $this->getForm()->withRequest($this->request);
         $data = $form->getData();
         if ($data) {
@@ -155,4 +163,8 @@ protected function save(): void
         }
         $this->show($form);
     }
+    public function _checkPermission(string $permission): bool
+    {
+        return $this->rbac_system->checkAccess($permission, $this->object->getRefId());
+    }
 }

From f0bae3a906648c17b3e1632741f0511b145050be Mon Sep 17 00:00:00 2001
From: dkippKPG <daniel.kipp@kroepelin-projekte.de>
Date: Fri, 13 Feb 2026 10:33:09 +0100
Subject: [PATCH 045/141] Fix #40998: correct map instance used when multiple
 OpenLayers maps are on one page (#11092)

---
 .../templates/default/tpl.openlayers_map.js   | 46 +++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/components/ILIAS/Maps/templates/default/tpl.openlayers_map.js b/components/ILIAS/Maps/templates/default/tpl.openlayers_map.js
index 2fad41c68bcf..bb9efbf4fa49 100755
--- a/components/ILIAS/Maps/templates/default/tpl.openlayers_map.js
+++ b/components/ILIAS/Maps/templates/default/tpl.openlayers_map.js
@@ -13,7 +13,6 @@ let ilOLMapData = {
     ]
 };
 
-
 <!-- BEGIN user_marker -->
 ilOLUserMarkers["{UMAP_ID}"][{CNT}] = new Array({ULONG}, {ULAT},
     "<img style='float:right; margin-right:10px; margin-left:10px;' className='ilUserXXSmall' src='{IMG_USER}'\/><span className='small'>{USER_INFO}<\/span>");
@@ -23,12 +22,43 @@ let openLayer = initIlOpenLayerMaps(jQuery, ilOLInvalidAddress, ilOLMapData, ilO
 openLayer.forceResize(jQuery);
 openLayer.init(ilOLMapData);
 
-ilLookupAddress = function(id, address) {
-    return openLayer.jumpToAddress(id, address);
+/*
+ * Multi-map support:
+ * This template runs once per map. On pages with multiple maps, global functions
+ * would otherwise be overwritten by the last rendered map.
+ *
+ * Store each map instance by its MAP_ID and dispatch calls by id.
+ */
+window.ilOLMapInstances = window.ilOLMapInstances || {};
+window.ilOLMapInstances["{MAP_ID}"] = {
+    openLayer: openLayer,
+    mapData: ilOLMapData
+};
+
+/* Define the global API only once; later template runs must not overwrite it. */
+window.ilLookupAddress = window.ilLookupAddress || function(id, address) {
+    const inst = window.ilOLMapInstances && window.ilOLMapInstances[id];
+    if (!inst) {
+        console.warn("ilLookupAddress: unknown map id", id);
+        return;
+    }
+    return inst.openLayer.jumpToAddress(id, address);
 };
-ilUpdateMap = function (id) {
-    return openLayer.updateMap(id);
+
+window.ilUpdateMap = window.ilUpdateMap || function(id) {
+    const inst = window.ilOLMapInstances && window.ilOLMapInstances[id];
+    if (!inst) {
+        console.warn("ilUpdateMap: unknown map id", id);
+        return;
+    }
+    return inst.openLayer.updateMap(id);
+};
+
+window.ilShowUserMarker = window.ilShowUserMarker || function(id, counter) {
+    const inst = window.ilOLMapInstances && window.ilOLMapInstances[id];
+    if (!inst) {
+        console.warn("ilShowUserMarker: unknown map id", id);
+        return;
+    }
+    return inst.openLayer.moveToUserMarkerAndOpen(id, counter);
 };
-ilShowUserMarker = function(id, counter) {
-    return openLayer.moveToUserMarkerAndOpen(id, counter);
-};
\ No newline at end of file

From 9a3bdd882bd4e1e861e5f21e92393ac6c52140d8 Mon Sep 17 00:00:00 2001
From: Marvin Beym <79150442+mBeym@users.noreply.github.com>
Date: Fri, 13 Feb 2026 10:38:23 +0100
Subject: [PATCH 046/141] [FIX] #47093 Certificate: Fix empty filter fields
 applied to sql query (#11115)

---
 .../classes/User/class.ilUserCertificateRepository.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/Certificate/classes/User/class.ilUserCertificateRepository.php b/components/ILIAS/Certificate/classes/User/class.ilUserCertificateRepository.php
index e0e23ac954ae..b922c87a6cfd 100755
--- a/components/ILIAS/Certificate/classes/User/class.ilUserCertificateRepository.php
+++ b/components/ILIAS/Certificate/classes/User/class.ilUserCertificateRepository.php
@@ -656,7 +656,7 @@ public function fetchCertificatesForOverview(
 
         $sql_filters = [];
         foreach ($filter as $key => $value) {
-            if ($value === null) {
+            if ($value === null || $value === '') {
                 continue;
             }
 
@@ -745,7 +745,7 @@ public function fetchCertificatesForOverviewCount(array $filter, ?Range $range =
     {
         $sql_filters = [];
         foreach ($filter as $key => $value) {
-            if ($value === null) {
+            if ($value === null || $value === '') {
                 continue;
             }
 

From cf578d7ec3a996a5e4e6f1722952b8352c301db0 Mon Sep 17 00:00:00 2001
From: Fabian Schmid <fabian@sr.solutions>
Date: Mon, 9 Feb 2026 13:12:42 +0100
Subject: [PATCH 047/141] [FIX] General Shibboleth Code Update

---
 .../classes/Config/class.ilShibbolethSettings.php   |  2 +-
 .../classes/Config/class.shibConfig.php             |  3 ---
 .../classes/class.ilAuthProviderShibboleth.php      |  2 +-
 .../ILIAS/AuthShibboleth/resources/shib_logout.php  | 13 +++++++------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/components/ILIAS/AuthShibboleth/classes/Config/class.ilShibbolethSettings.php b/components/ILIAS/AuthShibboleth/classes/Config/class.ilShibbolethSettings.php
index 99f437040b0b..e91b6d221460 100755
--- a/components/ILIAS/AuthShibboleth/classes/Config/class.ilShibbolethSettings.php
+++ b/components/ILIAS/AuthShibboleth/classes/Config/class.ilShibbolethSettings.php
@@ -34,7 +34,7 @@ class ilShibbolethSettings
     /**
      * @var string
      */
-    private const DEFAULT_LOGIN_BUTTON = "assets/images/auth/shib_login_button.svg";
+    private const DEFAULT_LOGIN_BUTTON = "./assets/images/auth/shib_login_button.svg";
     /**
      * @var string
      */
diff --git a/components/ILIAS/AuthShibboleth/classes/Config/class.shibConfig.php b/components/ILIAS/AuthShibboleth/classes/Config/class.shibConfig.php
index 85b998149ab2..dd49b4f85b2c 100755
--- a/components/ILIAS/AuthShibboleth/classes/Config/class.shibConfig.php
+++ b/components/ILIAS/AuthShibboleth/classes/Config/class.shibConfig.php
@@ -457,9 +457,6 @@ public function setUpdateTitle(bool $update_title): void
         $this->update_title = $update_title;
     }
 
-    /**
-     * @return mixed
-     */
     public function getUpdateTitle(): bool
     {
         return $this->update_title;
diff --git a/components/ILIAS/AuthShibboleth/classes/class.ilAuthProviderShibboleth.php b/components/ILIAS/AuthShibboleth/classes/class.ilAuthProviderShibboleth.php
index 706b56ada627..0216138fd379 100755
--- a/components/ILIAS/AuthShibboleth/classes/class.ilAuthProviderShibboleth.php
+++ b/components/ILIAS/AuthShibboleth/classes/class.ilAuthProviderShibboleth.php
@@ -110,7 +110,7 @@ public function doAuthentication(ilAuthStatus $status): bool
             return false;
         }
 
-        ilSession::set('shibboleth_session_id', $_SERVER['Shib-Session-ID']);
+        ilSession::set('shibboleth_session_id', $_SERVER['Shib-Session-ID'] ?? '');
         return true;
     }
 }
diff --git a/components/ILIAS/AuthShibboleth/resources/shib_logout.php b/components/ILIAS/AuthShibboleth/resources/shib_logout.php
index 850aae9f2d73..2207637d7541 100644
--- a/components/ILIAS/AuthShibboleth/resources/shib_logout.php
+++ b/components/ILIAS/AuthShibboleth/resources/shib_logout.php
@@ -144,14 +144,15 @@ function LogoutNotification($SessionID): ?\SoapFault
 
     while ($session = $r->fetchRow(ilDBConstants::FETCHMODE_ASSOC)) {
         $session_data = unserializesession($session['data']);
-        if (is_array($session_data)
+        // Delete this session entry
+        if (
+            is_array($session_data)
             && array_key_exists('shibboleth_session_id', $session_data)
-            && $session_data['shibboleth_session_id'] == $SessionID
+            && $session_data['shibboleth_session_id'] === $SessionID
+            && !ilSession::_destroy($session['session_id']
+            )
         ) {
-            // Delete this session entry
-            if (ilSession::_destroy($session['session_id']) !== true) {
-                return new SoapFault('LogoutError', 'Could not delete session entry in database.');
-            }
+            return new SoapFault('LogoutError', 'Could not delete session entry in database.');
         }
     }
     // If no SoapFault is returned, all is fine

From c2a3000e42bee2ae96bf927197388c13d144cb27 Mon Sep 17 00:00:00 2001
From: Fabian Schmid <fabian@sr.solutions>
Date: Tue, 10 Feb 2026 05:47:26 +0100
Subject: [PATCH 048/141] [FIX] ShibbolethLogin

---
 components/ILIAS/AuthShibboleth/src/LoginPerformer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/AuthShibboleth/src/LoginPerformer.php b/components/ILIAS/AuthShibboleth/src/LoginPerformer.php
index 417f2473f451..fc61d0a17194 100755
--- a/components/ILIAS/AuthShibboleth/src/LoginPerformer.php
+++ b/components/ILIAS/AuthShibboleth/src/LoginPerformer.php
@@ -75,12 +75,12 @@ public function doShibbolethAuthentication(): void
 
                 // no break
             case ilAuthStatus::STATUS_ACCOUNT_MIGRATION_REQUIRED:
-                $this->ctrl->redirect($this, 'showAccountMigration');
+                $this->ctrl->redirectByClass([ilStartUpGUI::class], 'showAccountMigration');
 
                 // no break
             case ilAuthStatus::STATUS_AUTHENTICATION_FAILED:
                 $this->template->setOnScreenMessage('failure', $status->getTranslatedReason(), true);
-                $this->ctrl->redirect($this, 'showLoginPage');
+                $this->ctrl->redirectByClass([ilStartUpGUI::class], 'showLoginPage');
         }
 
         $this->template->setOnScreenMessage('failure', $this->lng->txt('err_wrong_login'), true);

From 575271488d6eb62aa68be033b69fd0e2e2c85d65 Mon Sep 17 00:00:00 2001
From: Fabian Schmid <fabian@sr.solutions>
Date: Fri, 13 Feb 2026 12:49:35 +0100
Subject: [PATCH 049/141] [FIX] 0046040: Wrong lang var used for Table of
 administrative notifications

# Conflicts:
#	components/ILIAS/AdministrativeNotification/classes/Table.php
---
 components/ILIAS/AdministrativeNotification/classes/Table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/AdministrativeNotification/classes/Table.php b/components/ILIAS/AdministrativeNotification/classes/Table.php
index 7e3abc76c9a1..8eceeba2e233 100755
--- a/components/ILIAS/AdministrativeNotification/classes/Table.php
+++ b/components/ILIAS/AdministrativeNotification/classes/Table.php
@@ -68,7 +68,7 @@ public function __construct(
 
         $this->components[] = $this->ui_factory->table()->data(
             $data_retrieval,
-            $this->lng->txt('notifications'),
+            $this->lng->txt('msg_table_title'),
             $columns,
         )->withActions($actions)->withRequest(
             $DIC->http()->request()

From de0526d72496a9fe0d62f09d39ce63e72d232ea4 Mon Sep 17 00:00:00 2001
From: Fabian Schmid <fabian@sr.solutions>
Date: Fri, 13 Feb 2026 13:17:27 +0100
Subject: [PATCH 050/141] [FIX] 0046375: Blog Goto-Links do not forward after
 login

---
 components/ILIAS/StaticURL/src/Response/Factory.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/ILIAS/StaticURL/src/Response/Factory.php b/components/ILIAS/StaticURL/src/Response/Factory.php
index 67efbae162d5..4b4e9ccd1ca5 100755
--- a/components/ILIAS/StaticURL/src/Response/Factory.php
+++ b/components/ILIAS/StaticURL/src/Response/Factory.php
@@ -40,9 +40,6 @@ public function loginFirst(): MaybeCanHandlerAfterLogin|CannotReach
         if ($this->context->isUserLoggedIn()) {
             return new CannotReach();
         }
-        if (!$this->context->isUserLoggedIn() && !$this->context->isPublicSectionActive()) {
-            return new CannotReach();
-        }
 
         return new MaybeCanHandlerAfterLogin();
     }

From 55d5abe51e72168093f2736fe5f8d7da11b72055 Mon Sep 17 00:00:00 2001
From: Fabian Schmid <fabian@sr.solutions>
Date: Fri, 13 Feb 2026 14:08:14 +0100
Subject: [PATCH 051/141] [FIX] 0045055: Cannot overwrite a feedback file by
 uploading a new version, instead 2 files are created

---
 .../Service/IRSS/CollectionWrapperGUI.php       |  3 ++-
 .../classes/Collections/View/Configuration.php  |  6 ++++++
 .../classes/Collections/View/Request.php        |  5 +++++
 .../class.ilResourceCollectionGUI.php           | 17 ++++++++++++++++-
 .../src/Collection/Collections.php              | 13 ++++++++++++-
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/components/ILIAS/Repository/Service/IRSS/CollectionWrapperGUI.php b/components/ILIAS/Repository/Service/IRSS/CollectionWrapperGUI.php
index 4ebe3b780a08..f1e68d09e6b8 100755
--- a/components/ILIAS/Repository/Service/IRSS/CollectionWrapperGUI.php
+++ b/components/ILIAS/Repository/Service/IRSS/CollectionWrapperGUI.php
@@ -52,7 +52,8 @@ public function getResourceCollectionGUI(
                 Mode::DATA_TABLE,
                 100,
                 $write,
-                $write
+                $write,
+                true
             )
         );
     }
diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/Configuration.php b/components/ILIAS/ResourceStorage/classes/Collections/View/Configuration.php
index f3eb86f091db..fe8d979cad08 100755
--- a/components/ILIAS/ResourceStorage/classes/Collections/View/Configuration.php
+++ b/components/ILIAS/ResourceStorage/classes/Collections/View/Configuration.php
@@ -36,6 +36,7 @@ public function __construct(
         private int $items_per_page = 100,
         private bool $user_can_upload = false,
         private bool $user_can_administrate = false,
+        private bool $append_duplicate_filenames_as_revision = false
     ) {
     }
 
@@ -78,4 +79,9 @@ public function canUserAdministrate(): bool
     {
         return $this->user_can_administrate;
     }
+
+    public function preventDuplicates(): bool
+    {
+        return $this->append_duplicate_filenames_as_revision;
+    }
 }
diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/Request.php b/components/ILIAS/ResourceStorage/classes/Collections/View/Request.php
index 28c7ea73a4f0..ddc3cdb2144a 100755
--- a/components/ILIAS/ResourceStorage/classes/Collections/View/Request.php
+++ b/components/ILIAS/ResourceStorage/classes/Collections/View/Request.php
@@ -197,4 +197,9 @@ public function canUserAdministrate(): bool
     {
         return $this->view_configuration->canUserAdministrate();
     }
+
+    public function preventDuplicates(): bool
+    {
+        return $this->view_configuration->preventDuplicates();
+    }
 }
diff --git a/components/ILIAS/ResourceStorage/classes/Collections/class.ilResourceCollectionGUI.php b/components/ILIAS/ResourceStorage/classes/Collections/class.ilResourceCollectionGUI.php
index f6411c3bdd38..3d5afb0d39a1 100755
--- a/components/ILIAS/ResourceStorage/classes/Collections/class.ilResourceCollectionGUI.php
+++ b/components/ILIAS/ResourceStorage/classes/Collections/class.ilResourceCollectionGUI.php
@@ -229,7 +229,22 @@ public function upload(): void
             if (!$result->isOK()) {
                 continue;
             }
-            $rid = $this->irss->manage()->upload(
+            // if activated, prevent duplicate files by checking filenames. in thjis case a new revision gets appended
+            if ($this->view_request->preventDuplicates()) {
+                $existing_rid = $this->irss->collection()->findIdentificationByNameIn(
+                    $this->view_request->getCollection(),
+                    $result->getName()
+                );
+                if ($existing_rid !== null) {
+                    $this->irss->manage()->appendNewRevision(
+                        $existing_rid,
+                        $upload_result,
+                        $this->view_configuration->getStakeholder()
+                    );
+                }
+            }
+
+            $rid = $existing_rid ?? $this->irss->manage()->upload(
                 $result,
                 $this->view_configuration->getStakeholder()
             );
diff --git a/components/ILIAS/ResourceStorage/src/Collection/Collections.php b/components/ILIAS/ResourceStorage/src/Collection/Collections.php
index 7a4ea78091ca..391cd0ed8ee0 100755
--- a/components/ILIAS/ResourceStorage/src/Collection/Collections.php
+++ b/components/ILIAS/ResourceStorage/src/Collection/Collections.php
@@ -48,7 +48,7 @@ public function __construct(private ResourceBuilder $resource_builder, private C
 
     /**
      * @param string|null $collection_identification an existing collection identification or null for a new
-     * @param int|null $owner if this colletion is owned by a users, you must prvide it's owner ID
+     * @param int|null    $owner                     if this colletion is owned by a users, you must prvide it's owner ID
      */
     public function id(
         ?string $collection_identification = null,
@@ -116,6 +116,17 @@ public function get(
         return $this->cache[$rcid] = $collection;
     }
 
+    public function findIdentificationByNameIn(ResourceCollection $collection, string $name): ?ResourceIdentification
+    {
+        foreach ($collection->getResourceIdentifications() as $identification) {
+            $resource = $this->resource_builder->get($identification);
+            if ($resource->getCurrentRevisionIncludingDraft()->getTitle() === $name) {
+                return $identification;
+            }
+        }
+        return null;
+    }
+
     public function store(ResourceCollection $collection): bool
     {
         $this->cache[$collection->getIdentification()->serialize()] = $collection;

From 38b794434cba03d130e4d597b8daaf9914ae9a5a Mon Sep 17 00:00:00 2001
From: Fabian Schmid <fabian@sr.solutions>
Date: Fri, 13 Feb 2026 14:17:45 +0100
Subject: [PATCH 052/141] [FIX] 0046533: Failed test: Uhrzeit bei Downloads im
 Info-Tab

# Conflicts:
#	components/ILIAS/File/classes/trait.ilObjFileInfoProvider.php
---
 .../ILIAS/File/classes/trait.ilObjFileInfoProvider.php       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/File/classes/trait.ilObjFileInfoProvider.php b/components/ILIAS/File/classes/trait.ilObjFileInfoProvider.php
index e1bbde044fc3..c059eb57f2c4 100755
--- a/components/ILIAS/File/classes/trait.ilObjFileInfoProvider.php
+++ b/components/ILIAS/File/classes/trait.ilObjFileInfoProvider.php
@@ -106,7 +106,9 @@ public function getFileInfoForAuthorsAndAdmins(): array
             $create_date = ilDatePresentation::formatDate(
                 new ilDateTime(
                     $this->getFileObj()->getCreateDate(),
-                    IL_CAL_DATETIME)
+                    IL_CAL_DATETIME,
+                    'utc' // most likely the server timezone
+                )
             );
 
             $amount_of_downloads = $this->safeSprintf(
@@ -114,7 +116,6 @@ public function getFileInfoForAuthorsAndAdmins(): array
                 $this->getFileObj()->getAmountOfDownloads(),
                 $create_date,
             );
-
         }
 
         return [

From adbc7aba5377a1fdd9030be29d3ce2352f7da259 Mon Sep 17 00:00:00 2001
From: Fabian Schmid <fabian@sr.solutions>
Date: Fri, 13 Feb 2026 14:34:17 +0100
Subject: [PATCH 053/141] =?UTF-8?q?[FIX]=200047249:=20File=20Admin:=20"Im?=
 =?UTF-8?q?=20Browser=20anzeigen"=20=E2=86=92=20InvalidArgumentException:?=
 =?UTF-8?q?=20ILIAS\Refinery\Container\MapValues::transform=20argument=20i?=
 =?UTF-8?q?s=20not=20an=20a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ILIAS/File/classes/Settings/Form.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/components/ILIAS/File/classes/Settings/Form.php b/components/ILIAS/File/classes/Settings/Form.php
index 596be63b313e..a531c0bc703e 100755
--- a/components/ILIAS/File/classes/Settings/Form.php
+++ b/components/ILIAS/File/classes/Settings/Form.php
@@ -58,8 +58,9 @@ public function asFormGroup(): Group
             ->withValue($this->settings->getDownloadLimitinMB())
             ->withRequired(true)
             ->withAdditionalTransformation(
-                $this->refinery->custom()->transformation(function ($value): void {
+                $this->refinery->custom()->transformation(function ($value) {
                     $this->settings->setDownloadLimitInMB($value);
+                    return $value;
                 })
             );
 
@@ -71,8 +72,9 @@ public function asFormGroup(): Group
             )
             ->withValue($this->settings->getInlineFileExtensions())
             ->withAdditionalTransformation(
-                $this->refinery->custom()->transformation(function ($value): void {
+                $this->refinery->custom()->transformation(function ($value) {
                     $this->settings->setInlineFileExtensions($value);
+                    return $value;
                 })
             );
 
@@ -84,8 +86,9 @@ public function asFormGroup(): Group
             ->withValue($this->settings->isShowAmountOfDownloads())
             ->withAdditionalTransformation(
                 $this->refinery->custom()->transformation(
-                    function ($value): void {
+                    function ($value) {
                         $this->settings->setShowAmountOfDownloads($value);
+                        return $value;
                     }
                 )
             );
@@ -97,8 +100,9 @@ function ($value): void {
             )
             ->withValue($this->settings->isDownloadWithAsciiFileName())
             ->withAdditionalTransformation(
-                $this->refinery->custom()->transformation(function ($value): void {
+                $this->refinery->custom()->transformation(function ($value) {
                     $this->settings->setDownloadWithAsciiFileName($value);
+                    return $value;
                 })
             );
 

From e82cd7fb7124f26a78fb8cebd6158fbdf9103f93 Mon Sep 17 00:00:00 2001
From: Fabian Schmid <fabian@sr.solutions>
Date: Fri, 13 Feb 2026 15:45:26 +0100
Subject: [PATCH 054/141] [FIX] 0044926: Wrong lang var used for permission
 Show Content by file object

---
 .../File/classes/Capabilities/Permissions.php |  2 +-
 .../class.ilFileObjectRBACDatabase.php        |  8 +----
 .../class.ilFileObjectRBACDatabaseSteps.php   | 33 +++++++++++++++++++
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/components/ILIAS/File/classes/Capabilities/Permissions.php b/components/ILIAS/File/classes/Capabilities/Permissions.php
index e5f3f6147fbf..b4b76d39f550 100644
--- a/components/ILIAS/File/classes/Capabilities/Permissions.php
+++ b/components/ILIAS/File/classes/Capabilities/Permissions.php
@@ -27,7 +27,7 @@ enum Permissions: string
     case NONE = 'none';
     case VISIBLE = 'visible';
     case READ = 'read';
-    case VIEW_CONTENT = 'view_content';
+    case VIEW_CONTENT = 'file_view_content';
     case READ_LP = 'read_learning_progress';
     case EDIT_LP = 'edit_learning_progress';
     case EDIT_PERMISSIONS = 'edit_permission';
diff --git a/components/ILIAS/File/classes/Setup/Database/class.ilFileObjectRBACDatabase.php b/components/ILIAS/File/classes/Setup/Database/class.ilFileObjectRBACDatabase.php
index 8322abf31f91..ed5ea80ca82a 100755
--- a/components/ILIAS/File/classes/Setup/Database/class.ilFileObjectRBACDatabase.php
+++ b/components/ILIAS/File/classes/Setup/Database/class.ilFileObjectRBACDatabase.php
@@ -45,13 +45,7 @@ public function getPreconditions(Environment $environment): array
                     "object",
                     2001,
                     ["file"]
-                ),
-                new AccessRBACOperationClonedObjective(
-                    "file",
-                    Permissions::READ->value,
-                    Permissions::VIEW_CONTENT->value
-                ),
-
+                )
             ]
         );
     }
diff --git a/components/ILIAS/File/classes/Setup/Database/class.ilFileObjectRBACDatabaseSteps.php b/components/ILIAS/File/classes/Setup/Database/class.ilFileObjectRBACDatabaseSteps.php
index 6e24cbda965c..714682e9bd07 100755
--- a/components/ILIAS/File/classes/Setup/Database/class.ilFileObjectRBACDatabaseSteps.php
+++ b/components/ILIAS/File/classes/Setup/Database/class.ilFileObjectRBACDatabaseSteps.php
@@ -132,4 +132,37 @@ public function step_3(): void
             ]
         );
     }
+
+    public function step_4(): void
+    {
+        // remove superfluous view_content operation
+        $view_content_operation = 'view_content';
+        $ops_id = $this->database->queryF(
+            "SELECT ops_id FROM rbac_operations WHERE operation = %s",
+            ['text'],
+            [$view_content_operation]
+        )->fetchAssoc()['ops_id'] ?? null;
+
+        if ($ops_id === null) {
+            return;
+        }
+
+        $this->database->manipulateF(
+            'DELETE FROM rbac_ta WHERE ops_id = %s',
+            ['integer'],
+            [$ops_id]
+        );
+
+        $this->database->manipulateF(
+            'DELETE FROM rbac_templates WHERE ops_id = %s',
+            ['integer'],
+            [$ops_id]
+        );
+
+        $this->database->manipulateF(
+            'DELETE FROM rbac_operations WHERE operation = %s',
+            ['text'],
+            [$view_content_operation]
+        );
+    }
 }

From 11212f256e5913085ff73223f75a5ab60b2bcf86 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Fri, 13 Feb 2026 22:19:26 +0100
Subject: [PATCH 055/141] fixed 47257: First page inserted at wrong position

---
 .../Editing/class.EditSubObjectsGUI.php            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php b/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php
index dce582e697e8..d4b99856c209 100644
--- a/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php
+++ b/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php
@@ -325,17 +325,17 @@ public function insertPageBefore(): void
 
     protected function insertPage(
         int $parent_id = 0,
-        int $target = \ilTree::POS_LAST_NODE
+        int $target = 0
     ): void {
         $lng = $this->domain->lng();
         $ctrl = $this->gui->ctrl();
 
-        $chap = new \ilLMPageObject($this->lm);
-        $chap->setType("pg");
-        $chap->setTitle($lng->txt("cont_new_page"));
-        $chap->setLMId($this->lm_id);
-        $chap->create();
-        \ilLMObject::putInTree($chap, $parent_id, $target);
+        $page = new \ilLMPageObject($this->lm);
+        $page->setType("pg");
+        $page->setTitle($lng->txt("cont_new_page"));
+        $page->setLMId($this->lm_id);
+        $page->create();
+        \ilLMObject::putInTree($page, $parent_id, $target);
 
         /*
         if ($parent_id === $this->lm_tree->readRootId()) {

From a46a39fad3321283e80f5ecf34f789651804951e Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Sun, 15 Feb 2026 11:30:34 +0100
Subject: [PATCH 056/141] 43375: Useability: Hard to find a way to edit a title
 of chapter or page; 43374: Useability: Chapter / Page title should be
 clkickable

---
 .../Layout/classes/class.ilPageLayoutGUI.php  |  28 ++
 .../Editing/SubObjectRetrieval.php            |   1 +
 .../Editing/SubObjectTableBuilder.php         | 159 ++++++------
 .../Editing/class.EditSubObjectsGUI.php       | 244 ++++++++++++++----
 .../Service/class.InternalDomainService.php   |   7 +
 .../classes/class.ilLMObject.php              |  13 +-
 .../Service/Form/class.FormAdapterGUI.php     |   4 +
 .../Service/Table/TableAdapterGUI.php         |   5 +-
 .../classes/class.ilTreeExplorerGUI.php       |   4 +
 lang/ilias_de.lang                            |   3 +
 lang/ilias_en.lang                            |   3 +
 11 files changed, 331 insertions(+), 140 deletions(-)

diff --git a/components/ILIAS/COPage/Layout/classes/class.ilPageLayoutGUI.php b/components/ILIAS/COPage/Layout/classes/class.ilPageLayoutGUI.php
index 07ef4ae4782d..efcc3f544fdd 100755
--- a/components/ILIAS/COPage/Layout/classes/class.ilPageLayoutGUI.php
+++ b/components/ILIAS/COPage/Layout/classes/class.ilPageLayoutGUI.php
@@ -17,6 +17,7 @@
  *********************************************************************/
 
 use ILIAS\UI\Component\Input\Field\Radio;
+use ILIAS\Repository\Form\FormAdapterGUI;
 
 /**
  * Class ilPageLayoutGUI GUI class
@@ -216,6 +217,33 @@ public static function getTemplateSelection(string $module, bool $include_none =
         return $radio;
     }
 
+    public static function addTemplateSelection(string $module, FormAdapterGUI $form, bool $include_none = false): FormAdapterGUI
+    {
+        global $DIC;
+        $ui = $DIC->ui();
+        $f = $ui->factory();
+        $lng = $DIC->language();
+        $arr_templates = ilPageLayout::activeLayouts($module);
+        if (count($arr_templates) == 0) {
+            return $form;
+        }
+        $form = $form->radio("template_id", $lng->txt("cont_page_template"));
+        $radio = $f->input()->field()->radio($lng->txt("cont_page_template"), "");
+        $first = "0";
+        if ($include_none) {
+            $form = $form->radioOption("0", $lng->txt("none"));
+        }
+        /** @var ilPageLayout $templ */
+        foreach ($arr_templates as $templ) {
+            if ($first == "0" && !$include_none) {
+                $first = $templ->getId();
+            }
+            $templ->readObject();
+            $form = $form->radioOption($templ->getId(), $templ->getPreview(), $templ->getTitle());
+        }
+        return $form;
+    }
+
     public function finishEditing(): void
     {
         $this->ctrl->redirectByClass("ilpagelayoutadministrationgui", "listLayouts");
diff --git a/components/ILIAS/LearningModule/Editing/SubObjectRetrieval.php b/components/ILIAS/LearningModule/Editing/SubObjectRetrieval.php
index 66c9327a4b02..0689727c6f11 100644
--- a/components/ILIAS/LearningModule/Editing/SubObjectRetrieval.php
+++ b/components/ILIAS/LearningModule/Editing/SubObjectRetrieval.php
@@ -95,6 +95,7 @@ public function getData(
             if (!in_array($this->transl, ["-", ""])) {
                 $trans_title = $this->getChildTitle($child);
             }
+
             yield [
                 "id" => $child["child"],
                 "deactivated_elements" => $deactivated_elements,
diff --git a/components/ILIAS/LearningModule/Editing/SubObjectTableBuilder.php b/components/ILIAS/LearningModule/Editing/SubObjectTableBuilder.php
index 4944684c8640..4a20231dc1cb 100644
--- a/components/ILIAS/LearningModule/Editing/SubObjectTableBuilder.php
+++ b/components/ILIAS/LearningModule/Editing/SubObjectTableBuilder.php
@@ -75,6 +75,7 @@ protected function transformRow(array $data_row): array
     {
         $lng = $this->domain->lng();
         $f = $this->gui->ui()->factory();
+        $ctrl = $this->gui->ctrl();
         if ($data_row["type"] === "pg") {
             $img_sc = $data_row["scheduled"]
                 ? "_sc"
@@ -96,10 +97,28 @@ protected function transformRow(array $data_row): array
             $img = "standard/icon_st.svg";
             $alt = $lng->txt("st");
         }
+        $target = "#";
+        if ($data_row["type"] === "pg") {
+            $ctrl->setParameterByClass(\ilLMPageGUI::class, "obj_id", $data_row["id"]);
+            $target = $ctrl->getLinkTargetByClass([
+                \ilObjLearningModuleGUI::class,
+                \ilLMPageObjectGUI::class,
+                \ilLMPageGUI::class
+            ], "edit");
+        } elseif ($data_row["type"] === "st") {
+            $ctrl->setParameterByClass(\ilStructureObjectGUI::class, "obj_id", $data_row["id"]);
+            $target = $ctrl->getLinkTargetByClass([
+                \ilObjLearningModuleGUI::class,
+                \ilStructureObjectGUI::class,
+                EditSubObjectsGUI::class
+            ], "editPages");
+        }
+
+        $title = $f->link()->standard($data_row["title"], $target);
         return [
             "id" => $data_row["id"],
             "type" => $f->symbol()->icon()->custom(\ilUtil::getImagePath($img), $alt),
-            "title" => $data_row["title"],
+            "title" => $title,
             "trans_title" => $data_row["trans_title"],
         ];
     }
@@ -111,127 +130,95 @@ protected function build(TableAdapterGUI $table): TableAdapterGUI
         $transl = $this->gui->editing()->request()->getTranslation();
         $table = $table
             ->iconColumn("type", $lng->txt("type"))
-            ->textColumn("title", $lng->txt("title"));
+            ->linkColumn("title", $lng->txt("title"));
         if (!in_array($transl, ["-", ""])) {
             $table = $table->textColumn("trans_title", $lng->txt("title") .
                 " (" . $lng->txt("meta_l_" . $transl) . ")");
         }
         if ($this->type === "st") {
-            $acts = [
-                [
-                    "editPages",
-                    $lng->txt("edit"),
-                    [\ilObjLearningModuleGUI::class, \ilStructureObjectGUI::class, EditSubObjectsGUI::class],
-                    "editPages",
-                    "obj_id"
-                ],
-                [
-                    "insertChapterAfter",
-                    $lng->txt("lm_insert_chapter_after"),
-                    [EditSubObjectsGUI::class],
-                    "insertChapterAfter",
-                    "target_id"
-                ],
-                [
-                    "insertChapterBefore",
-                    $lng->txt("lm_insert_chapter_before"),
-                    [EditSubObjectsGUI::class],
-                    "insertChapterBefore",
-                    "target_id"
-                ]
-            ];
+            $table = $table->singleRedirectAction(
+                "editPages",
+                $lng->txt("lm_list_pages"),
+                [\ilObjLearningModuleGUI::class, \ilStructureObjectGUI::class, EditSubObjectsGUI::class],
+                "editPages",
+                "obj_id"
+            );
+            $table = $table->singleAction(
+                "editTitle",
+                $lng->txt("cont_edit_title"),
+                true
+            );
+            $table = $table->singleAction(
+                "insertChapterAfter",
+                $lng->txt("lm_insert_chapter_after"),
+                true
+            );
+            $table = $table->singleAction(
+                "insertChapterBefore",
+                $lng->txt("lm_insert_chapter_before"),
+                true
+            );
             if ($user->clipboardHasObjectsOfType("st")) {
-                $acts[] = [
+                $table = $table->singleRedirectAction(
                     "insertChapterClipAfter",
                     $lng->txt("lm_insert_chapter_clip_after"),
                     [EditSubObjectsGUI::class],
                     "insertChapterClipAfter",
                     "target_id"
-                ];
-                $acts[] = [
+                );
+                $table = $table->singleRedirectAction(
                     "insertChapterClipBefore",
                     $lng->txt("lm_insert_chapter_clip_before"),
                     [EditSubObjectsGUI::class],
                     "insertChapterClipBefore",
                     "target_id"
-                ];
+                );
             }
         } else {
-            $acts = [
-                [
-                    "editPage",
-                    $lng->txt("edit"),
-                    [\ilObjLearningModuleGUI::class, \ilLMPageObjectGUI::class],
-                    "edit",
-                    "obj_id"
-                ],
-                [
-                    "insertPageAfter",
-                    $lng->txt("lm_insert_page_after"),
-                    [EditSubObjectsGUI::class],
-                    "insertPageAfter",
-                    "target_id"
-                ],
-                [
-                    "insertPageBefore",
-                    $lng->txt("lm_insert_page_before"),
-                    [EditSubObjectsGUI::class],
-                    "insertPageBefore",
-                    "target_id"
-                ]
-            ];
+            $table = $table->singleRedirectAction(
+                "editPage",
+                $lng->txt("lm_edit_content"),
+                [\ilObjLearningModuleGUI::class, \ilLMPageObjectGUI::class],
+                "edit",
+                "obj_id"
+            );
+            $table = $table->singleAction(
+                "editTitle",
+                $lng->txt("cont_edit_title"),
+                true
+            );
+            $table = $table->singleAction(
+                "insertPageAfter",
+                $lng->txt("lm_insert_page_after"),
+                true
+            );
+            $table = $table->singleAction(
+                "insertPageBefore",
+                $lng->txt("lm_insert_page_before"),
+                true
+            );
             if ($user->clipboardHasObjectsOfType("pg")) {
-                $acts[] = [
+                $table = $table->singleRedirectAction(
                     "insertPageClipAfter",
                     $lng->txt("lm_insert_page_clip_after"),
                     [EditSubObjectsGUI::class],
                     "insertPageClipAfter",
                     "target_id"
-                ];
-                $acts[] = [
+                );
+                $table = $table->singleRedirectAction(
                     "insertPageClipBefore",
                     $lng->txt("lm_insert_page_clip_before"),
                     [EditSubObjectsGUI::class],
                     "insertPageClipBefore",
                     "target_id"
-                ];
+                );
             }
-            if (count($this->page_layouts) > 0) {
-                $acts[] = [
-                    "insertLayoutAfter",
-                    $lng->txt("lm_insert_layout_after"),
-                    [EditSubObjectsGUI::class],
-                    "insertLayoutAfter",
-                    "target_id"
-                ];
-                $acts[] = [
-                    "insertLayoutBefore",
-                    $lng->txt("lm_insert_layout_before"),
-                    [EditSubObjectsGUI::class],
-                    "insertLayoutBefore",
-                    "target_id"
-                ];
-            }
-        }
-        foreach ($acts as $a) {
-            $table = $table->singleRedirectAction(
-                $a[0],
-                $a[1],
-                $a[2],
-                $a[3],
-                $a[4]
-            );
         }
         $table = $table
             ->standardAction(
                 "delete",
                 $lng->txt("delete")
             )
-            ->singleAction(
-                "editTitle",
-                $lng->txt("cont_edit_title"),
-                true
-            )
             ->standardAction(
                 "cutItems",
                 $lng->txt("cut")
diff --git a/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php b/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php
index d4b99856c209..a8ee8fbea5c6 100644
--- a/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php
+++ b/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php
@@ -74,7 +74,9 @@ public function executeCommand(): void
                     "insertChapterClip", "insertChapterClipBefore", "insertChapterClipAfter",
                     "activatePages",
                     "insertLayoutBefore", "insertLayoutAfter", "insertPageFromLayout",
-                    "switchToLanguage", "editMasterLanguage"
+                    "switchToLanguage", "editMasterLanguage",
+                    "savePageAfter", "savePageBefore",
+                    "saveChapterAfter", "saveChapterBefore",
                 ])) {
                     $this->$cmd();
                 }
@@ -133,29 +135,46 @@ protected function list(): void
 
         $ml_head = \ilObjLearningModuleGUI::getMultiLangHeader($this->lm_id, $this);
 
-        if ($retrieval->count() === 0) {
-            if ($this->sub_type === "st") {
+        if ($this->sub_type === "st") {
+            $modal = $this->gui->modal(
+                $lng->txt("lm_insert_chapter")
+            )->form($this->getAddPageForm("saveChapterAfter"))->getAsyncTriggerButtonComponents(
+                $lng->txt("lm_insert_chapter"),
+                $this->gui->ctrl()->getLinkTargetByClass(self::class, "insertChapterAfter"),
+                false
+            );
+            $this->gui->toolbar()->addComponent($modal["button"]);
+            $this->gui->toolbar()->addComponent($modal["modal"]);
+            /*
+            $this->gui->button(
+                $lng->txt("lm_insert_chapter"),
+                $ctrl->getLinkTargetByClass(self::class, "insertFirstChapter")
+            )->toToolbar();*/
+            if ($user->clipboardHasObjectsOfType("st")) {
                 $this->gui->button(
-                    $lng->txt("lm_insert_chapter"),
-                    $ctrl->getLinkTargetByClass(self::class, "insertFirstChapter")
+                    $lng->txt("lm_insert_chapter_clip"),
+                    $ctrl->getLinkTargetByClass(self::class, "insertChapterClip")
                 )->toToolbar();
-                if ($user->clipboardHasObjectsOfType("st")) {
-                    $this->gui->button(
-                        $lng->txt("lm_insert_chapter_clip"),
-                        $ctrl->getLinkTargetByClass(self::class, "insertChapterClip")
-                    )->toToolbar();
-                }
-            } else {
+            }
+        } else {
+            $modal = $this->gui->modal(
+                $lng->txt("lm_insert_page")
+            )->form($this->getAddPageForm("savePageAfter"))->getAsyncTriggerButtonComponents(
+                $lng->txt("lm_insert_page"),
+                $this->gui->ctrl()->getLinkTargetByClass(self::class, "insertPageAfter"),
+                false
+            );
+            $this->gui->toolbar()->addComponent($modal["button"]);
+            $this->gui->toolbar()->addComponent($modal["modal"]);
+            /*$this->gui->button(
+                $lng->txt("lm_insert_page"),
+                $ctrl->getLinkTargetByClass(self::class, "insertFirstPage")
+            )->toToolbar();*/
+            if ($user->clipboardHasObjectsOfType("pg")) {
                 $this->gui->button(
-                    $lng->txt("lm_insert_page"),
-                    $ctrl->getLinkTargetByClass(self::class, "insertFirstPage")
+                    $lng->txt("lm_insert_page_clip"),
+                    $ctrl->getLinkTargetByClass(self::class, "insertPageClip")
                 )->toToolbar();
-                if ($user->clipboardHasObjectsOfType("pg")) {
-                    $this->gui->button(
-                        $lng->txt("lm_insert_page_clip"),
-                        $ctrl->getLinkTargetByClass(self::class, "insertPageClip")
-                    )->toToolbar();
-                }
             }
         }
         $table = $this->getTable();
@@ -296,17 +315,49 @@ public function insertFirstPage(): void
             $this->sub_obj_id
         );
     }
-    public function insertPageAfter(): void
+    public function insertPageAfter(int $id = 0): void
     {
+        $this->gui->ctrl()->setParameterByClass(
+            self::class,
+            "target_id",
+            $id
+        );
+        $this->gui->clearAsnyOnloadCode();
+        $modal = $this->gui->modal()->form($this->getAddPageForm("savePageAfter"));
+        $modal->send();
+    }
+
+    public function savePageAfter(): void
+    {
+        $mt = $this->gui->ui()->mainTemplate();
+        $lng = $this->domain->lng();
         $target_id = $this->request->getTargetId();
         $this->insertPage(
             $this->sub_obj_id,
-            $target_id
+            $target_id,
+            $this->getTitlesFromForm(),
+            $this->getLayoutIdFromForm()
         );
+        $mt->setOnScreenMessage("success", $lng->txt("msg_obj_modified"), true);
+        $this->gui->ctrl()->redirect($this, "list");
     }
 
-    public function insertPageBefore(): void
+    public function insertPageBefore(int $id): void
     {
+        $this->gui->ctrl()->setParameterByClass(
+            self::class,
+            "target_id",
+            $id
+        );
+        $this->gui->clearAsnyOnloadCode();
+        $modal = $this->gui->modal()->form($this->getAddPageForm("savePageBefore"));
+        $modal->send();
+    }
+
+    public function savePageBefore(): void
+    {
+        $mt = $this->gui->ui()->mainTemplate();
+        $lng = $this->domain->lng();
         $parent = $this->sub_obj_id;
         $target_id = $this->request->getTargetId();
         $before_target = \ilTree::POS_FIRST_NODE;
@@ -319,13 +370,19 @@ public function insertPageBefore(): void
         }
         $this->insertPage(
             $parent,
-            $before_target
+            $before_target,
+            $this->getTitlesFromForm(),
+            $this->getLayoutIdFromForm()
         );
+        $mt->setOnScreenMessage("success", $lng->txt("msg_obj_modified"), true);
+        $this->gui->ctrl()->redirect($this, "list");
     }
 
     protected function insertPage(
         int $parent_id = 0,
-        int $target = 0
+        int $target = 0,
+        array $titles = [],
+        int $layout_id = 0
     ): void {
         $lng = $this->domain->lng();
         $ctrl = $this->gui->ctrl();
@@ -334,15 +391,23 @@ protected function insertPage(
         $page->setType("pg");
         $page->setTitle($lng->txt("cont_new_page"));
         $page->setLMId($this->lm_id);
-        $page->create();
+        $page->create(false, false, $layout_id);
         \ilLMObject::putInTree($page, $parent_id, $target);
 
-        /*
-        if ($parent_id === $this->lm_tree->readRootId()) {
-            $ctrl->setParameterByClass(static::class, "obj_id", 0);
-        } else {
-            $ctrl->setParameterByClass(static::class, "obj_id", $parent_id);
-        }*/
+        if (count($titles) > 0) {
+            \ilLMObject::saveTitle($page->getId(), $titles["-"]);
+
+            $ot = $this->domain->translation($this->lm->getId());
+            if ($ot->getContentTranslationActivated()) {
+                foreach ($ot->getLanguages() as $lang) {
+                    $code = $lang->getLanguageCode();
+                    if ($code === $ot->getBaseLanguage()) {
+                        continue;
+                    }
+                    \ilLMObject::saveTitle($page->getId(), $titles[$code], $code);
+                }
+            }
+        }
 
         $ctrl->redirect($this, "list");
     }
@@ -353,16 +418,42 @@ public function insertFirstChapter(): void
             $this->sub_obj_id
         );
     }
-    public function insertChapterAfter(): void
+
+    public function insertChapterAfter(int $id = 0): void
+    {
+        $this->gui->ctrl()->setParameterByClass(
+            self::class,
+            "target_id",
+            $id
+        );
+        $this->gui->clearAsnyOnloadCode();
+        $modal = $this->gui->modal()->form($this->getEditTitleForm(0, "saveChapterAfter"));
+        $modal->send();
+    }
+
+    public function saveChapterAfter(): void
     {
         $target_id = $this->request->getTargetId();
         $this->insertChapter(
             $this->sub_obj_id,
-            $target_id
+            $target_id,
+            $this->getTitlesFromForm()
+        );
+    }
+
+    public function insertChapterBefore(int $id): void
+    {
+        $this->gui->ctrl()->setParameterByClass(
+            self::class,
+            "target_id",
+            $id
         );
+        $this->gui->clearAsnyOnloadCode();
+        $modal = $this->gui->modal()->form($this->getEditTitleForm(0, "saveChapterBefore"));
+        $modal->send();
     }
 
-    public function insertChapterBefore(): void
+    public function saveChapterBefore(): void
     {
         $parent = $this->getCurrentParentId();
         $target_id = $this->request->getTargetId();
@@ -376,13 +467,15 @@ public function insertChapterBefore(): void
         }
         $this->insertChapter(
             $parent,
-            $before_target
+            $before_target,
+            $this->getTitlesFromForm()
         );
     }
 
     protected function insertChapter(
         int $parent_id = 0,
-        int $target = \ilTree::POS_LAST_NODE
+        int $target = \ilTree::POS_LAST_NODE,
+        array $titles = []
     ): void {
         $lng = $this->domain->lng();
         $ctrl = $this->gui->ctrl();
@@ -393,21 +486,42 @@ protected function insertChapter(
         $chap->create();
         \ilLMObject::putInTree($chap, $parent_id, $target);
 
-        /*
-        if ($parent_id === $this->lm_tree->readRootId()) {
-            $ctrl->setParameterByClass(static::class, "obj_id", 0);
-        } else {
-            $ctrl->setParameterByClass(static::class, "obj_id", $parent_id);
-        }*/
+        if (count($titles) > 0) {
+            \ilLMObject::saveTitle($chap->getId(), $titles["-"]);
+
+            $ot = $this->domain->translation($this->lm->getId());
+            if ($ot->getContentTranslationActivated()) {
+                foreach ($ot->getLanguages() as $lang) {
+                    $code = $lang->getLanguageCode();
+                    if ($code === $ot->getBaseLanguage()) {
+                        continue;
+                    }
+                    \ilLMObject::saveTitle($chap->getId(), $titles[$code], $code);
+                }
+            }
+        }
 
         $ctrl->redirect($this, "list");
     }
 
-    protected function getEditTitleForm(int $id): FormAdapterGUI
+    protected function getAddPageForm($cmd): FormAdapterGUI
+    {
+        $this->domain->lng()->loadLanguageModule("copg");
+        $form = $this->getEditTitleForm(0, $cmd);
+        $arr_templates = \ilPageLayout::activeLayouts(\ilPageLayout::MODULE_LM);
+        if (count($arr_templates) > 0) {
+            $form = $form->optional("use_template", $this->domain->lng()->txt("copg_use_template"));
+            $form = \ilPageLayoutGUI::addTemplateSelection((string) \ilPageLayout::MODULE_LM, $form);
+            $form = $form->end();
+        }
+        return $form;
+    }
+
+    protected function getEditTitleForm(int $id, $cmd = "saveTitle"): FormAdapterGUI
     {
         $lng = $this->domain->lng();
         $this->gui->ctrl()->setParameterByClass(self::class, "edit_id", $id);
-        $ot = (new TranslationsRepository($this->domain->database()))->getFor($this->lm->getId());
+        $ot = $this->domain->translation($this->lm->getId());
         $ml = "";
         if ($ot->getContentTranslationActivated()) {
             $ml = " (" . $lng->txt("meta_l_" . $ot->getBaseLanguage()) . ")";
@@ -415,7 +529,7 @@ protected function getEditTitleForm(int $id): FormAdapterGUI
 
         $form = $this
             ->gui
-            ->form([self::class], "saveTitle")
+            ->form([self::class], $cmd)
             ->text("title", $lng->txt('title') . $ml, "", ilLMObject::_lookupTitle($id), 200);
         if ($ot->getContentTranslationActivated()) {
             foreach ($ot->getLanguages() as $lang) {
@@ -444,6 +558,38 @@ public function editTitle(int $id): void
         $modal->send();
     }
 
+    public function getTitlesFromForm(): array
+    {
+        $titles = [];
+        $form = $this->getEditTitleForm($this->request->getEditId());
+        if ($form->isValid()) {
+            $titles["-"] = $form->getData("title");
+
+            $ot = $this->domain->translation($this->lm->getId());
+            if ($ot->getContentTranslationActivated()) {
+                foreach ($ot->getLanguages() as $lang) {
+                    $code = $lang->getLanguageCode();
+                    if ($code === $ot->getBaseLanguage()) {
+                        continue;
+                    }
+                    $titles[$code] = $form->getData("title_" . $code);
+                }
+            }
+        }
+        return $titles;
+    }
+
+    public function getLayoutIdFromForm(): int
+    {
+        $form = $this->getAddPageForm("");
+        if ($form->isValid()) {
+            if ($form->getData("use_template")) {
+                return (int) $form->getData("template_id");
+            }
+        }
+        return 0;
+    }
+
     public function saveTitle(): void
     {
         $mt = $this->gui->mainTemplate();
@@ -463,7 +609,7 @@ public function saveTitle(): void
                 }
             }
         }
-        $mt->setContent("success", $lng->txt("msg_obj_modified"), true);
+        $mt->setOnScreenMessage("success", $lng->txt("msg_obj_modified"), true);
         $this->gui->ctrl()->redirect($this, "list");
     }
 
@@ -717,6 +863,8 @@ public function activatePages(array $ids): void
         $ctrl->redirect($this, "list");
     }
 
+    /*
+
     public function insertLayoutBefore(): void
     {
         $this->insertLayout(true);
@@ -804,4 +952,6 @@ public function insertPageFromLayout(): void
 
         $ctrl->redirect($this, "list");
     }
+
+    */
 }
diff --git a/components/ILIAS/LearningModule/Service/class.InternalDomainService.php b/components/ILIAS/LearningModule/Service/class.InternalDomainService.php
index 4c697ab07622..34463b00b4d7 100755
--- a/components/ILIAS/LearningModule/Service/class.InternalDomainService.php
+++ b/components/ILIAS/LearningModule/Service/class.InternalDomainService.php
@@ -22,6 +22,8 @@
 
 use ILIAS\DI\Container;
 use ILIAS\Repository\GlobalDICDomainServices;
+use ILIAS\ILIASObject\Properties\Translations\CachedRepository;
+use ILIAS\ILIASObject\Properties\Translations\Translations;
 
 class InternalDomainService
 {
@@ -57,4 +59,9 @@ public function subObjectRetrieval(
             );
     }
 
+    public function translation(int $lm_id): Translations
+    {
+        return (new CachedRepository($this->database()))->getFor($lm_id);
+    }
+
 }
diff --git a/components/ILIAS/LearningModule/classes/class.ilLMObject.php b/components/ILIAS/LearningModule/classes/class.ilLMObject.php
index 6aa2d9d07f8c..0ee5f0abad44 100755
--- a/components/ILIAS/LearningModule/classes/class.ilLMObject.php
+++ b/components/ILIAS/LearningModule/classes/class.ilLMObject.php
@@ -854,11 +854,14 @@ public static function saveTitle(int $id, string $title, string $lang = "-"): vo
             $lm_id = self::_lookupContObjID($id);
             $type = self::_lookupType($id);
             if ($type !== "" && $lm_id > 0) {
-                $lom_services->manipulate($lm_id, $id, $type)
-                             ->prepareCreateOrUpdate(
-                                 $lom_services->paths()->title(),
-                                 $title
-                             )->execute();
+                try {
+                    $lom_services->manipulate($lm_id, $id, $type)
+                                 ->prepareCreateOrUpdate(
+                                     $lom_services->paths()->title(),
+                                     $title
+                                 )->execute();
+                } catch (Exception $e) {
+                }
                 self::_writeTitle($id, $title);
             }
         } else {
diff --git a/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php b/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php
index 3715802c998f..872b23019d71 100755
--- a/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php
+++ b/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php
@@ -662,6 +662,10 @@ protected function replaceLastField(FormInput $field): void
         if ($this->last_key !== "") {
             $this->fields[$this->last_key] = $field;
         }
+        // also replace the field in current optional, if it's in it
+        if (!is_null($this->current_optional) && isset($this->current_optional["fields"][$this->last_key])) {
+            $this->current_optional["fields"][$this->last_key] = $field;
+        }
     }
 
     public function getForm(): Form\Standard
diff --git a/components/ILIAS/Repository/Service/Table/TableAdapterGUI.php b/components/ILIAS/Repository/Service/Table/TableAdapterGUI.php
index 6d4495a57ef5..c42e5d20d4cf 100755
--- a/components/ILIAS/Repository/Service/Table/TableAdapterGUI.php
+++ b/components/ILIAS/Repository/Service/Table/TableAdapterGUI.php
@@ -156,9 +156,10 @@ public function singleRedirectAction(
         string $title,
         array $class_path,
         string $cmd = "",
-        string $id_param = ""
+        string $id_param = "",
+        bool $async = false
     ): self {
-        $this->addAction(self::SINGLE, $action, $title);
+        $this->addAction(self::SINGLE, $action, $title, $async);
         $act = $this->actions[$this->last_action_key] ?? false;
         if ($act && $act["type"] === self::SINGLE) {
             $act["redirect_class_path"] = $class_path;
diff --git a/components/ILIAS/UIComponent/Explorer2/classes/class.ilTreeExplorerGUI.php b/components/ILIAS/UIComponent/Explorer2/classes/class.ilTreeExplorerGUI.php
index a38fb0b75a34..5f2d7404ef03 100755
--- a/components/ILIAS/UIComponent/Explorer2/classes/class.ilTreeExplorerGUI.php
+++ b/components/ILIAS/UIComponent/Explorer2/classes/class.ilTreeExplorerGUI.php
@@ -408,6 +408,10 @@ public function build(
             });
         }
 
+        $node = $node->withHighlighted(
+            $this->isNodeHighlighted($record)
+        );
+
         return $node;
     }
 
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 2afee9db21d2..906169e39005 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -7391,6 +7391,7 @@ copg#:#copg_sec_link_info#:#Wählen Sie ein Ziel für die Verlinkung des Blocks.
 copg#:#copg_snippet_cannot_be_edited#:#Dies ist ein vordefinierter Inhaltsbaustein, der an dieser Stelle nicht editiert werden kann.
 copg#:#copg_templates#:#Vorlagen
 copg#:#copg_unsupported_media_type#:#Dieses Medienobjekt hat einen nicht unterstützen Medientyp.
+copg#:#copg_use_template#:#Vorlage nutzen
 copg#:#copg_x_minutes#:#%s Minute(n)
 cpad#:#cpad_reading_time_status#:#Lesezeit
 cpad#:#cpad_reading_time_status_desc#:#Falls aktiviert, wird die geschätzte Lesezeit für Inhaltsseiten ermittelt und angezeigt.
@@ -11032,6 +11033,7 @@ lm#:#lm_btn_lp_toggle_state_completed#:#Auf "Nicht bearbeitet" setzen
 lm#:#lm_btn_lp_toggle_state_not_completed#:#Auf "Bearbeitet" setzen
 lm#:#lm_copy#:#ILIAS-Lernmodul kopieren
 lm#:#lm_edit_chapters#:#Kapitel bearbeiten
+lm#:#lm_edit_content#:#Inhalt bearbeiten
 lm#:#lm_edit_lm_settings#:#Lernmoduleinstellungen bearbeiten
 lm#:#lm_est_reading_time#:#Geschätzte Lesedauer
 lm#:#lm_est_reading_time_info#:#In Lernmodulen kann eine geschätzte Lesezeit ermittelt und angezeigt werden.
@@ -11049,6 +11051,7 @@ lm#:#lm_insert_page_before#:#Seite davor einfügen
 lm#:#lm_insert_page_clip#:#Seiten aus Zwischenablage einfügen
 lm#:#lm_insert_page_clip_after#:#Seiten aus Zwischenablage danach einfügen
 lm#:#lm_insert_page_clip_before#:#Seiten aus Zwischenablage davor einfügen
+lm#:#lm_list_pages#:#Seiten bearbeiten
 lm#:#lm_page_added#:#Eine Seite wurde hinzugefügt.
 lm#:#lm_page_type_lm#:#Lernmodulseite
 lm#:#lm_pages_added#:#Die Seiten wurden hinzugefügt.
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index 0a515f577e4b..3b92cb31fbf8 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -7393,6 +7393,7 @@ copg#:#copg_sec_link_info#:#Select a target for linking the block. Attention: In
 copg#:#copg_snippet_cannot_be_edited#:#This is a predefined content snippet and cannot be edited here.
 copg#:#copg_templates#:#Templates
 copg#:#copg_unsupported_media_type#:#This media object has an unsupported media type.
+copg#:#copg_use_template#:#Use Template
 copg#:#copg_x_minutes#:#%s minute(s)
 cpad#:#cpad_reading_time_status#:#Reading Time
 cpad#:#cpad_reading_time_status_desc#:#If enabled, the estimated reading time for content page objects will be determined and displayed.
@@ -11005,6 +11006,7 @@ lm#:#lm_btn_lp_toggle_state_completed#:#Set Not Completed
 lm#:#lm_btn_lp_toggle_state_not_completed#:#Set Completed
 lm#:#lm_copy#:#Copy Learning Module
 lm#:#lm_edit_chapters#:#Edit Chapters
+lm#:#lm_edit_content#:#Edit Content
 lm#:#lm_edit_lm_settings#:#Edit Learning Module Settings
 lm#:#lm_est_reading_time#:#Estimated Reading Time
 lm#:#lm_est_reading_time_info#:#In Learning Modules in the repository the estimated reading time can be determined and displayed.
@@ -11022,6 +11024,7 @@ lm#:#lm_insert_page_before#:#Insert page before
 lm#:#lm_insert_page_clip#:#Insert page from clipboard
 lm#:#lm_insert_page_clip_after#:#Insert page from clipboard after
 lm#:#lm_insert_page_clip_before#:#Insert page from clipboard before
+lm#:#lm_list_pages#:#Edit Pages
 lm#:#lm_page_added#:#Page has been added.
 lm#:#lm_page_type_lm#:#LM Page
 lm#:#lm_pages_added#:#Pages have been added.

From 9d34079fb2b0a7c8e95718f718c6896a1dfa4ef0 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Sun, 15 Feb 2026 12:28:55 +0100
Subject: [PATCH 057/141] lm: added missing modal titles

---
 .../Editing/class.EditSubObjectsGUI.php           | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php b/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php
index a8ee8fbea5c6..0f3e0b3c07b1 100644
--- a/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php
+++ b/components/ILIAS/LearningModule/Editing/class.EditSubObjectsGUI.php
@@ -317,13 +317,14 @@ public function insertFirstPage(): void
     }
     public function insertPageAfter(int $id = 0): void
     {
+        $lng = $this->domain->lng();
         $this->gui->ctrl()->setParameterByClass(
             self::class,
             "target_id",
             $id
         );
         $this->gui->clearAsnyOnloadCode();
-        $modal = $this->gui->modal()->form($this->getAddPageForm("savePageAfter"));
+        $modal = $this->gui->modal($lng->txt("lm_insert_page"))->form($this->getAddPageForm("savePageAfter"));
         $modal->send();
     }
 
@@ -344,13 +345,14 @@ public function savePageAfter(): void
 
     public function insertPageBefore(int $id): void
     {
+        $lng = $this->domain->lng();
         $this->gui->ctrl()->setParameterByClass(
             self::class,
             "target_id",
             $id
         );
         $this->gui->clearAsnyOnloadCode();
-        $modal = $this->gui->modal()->form($this->getAddPageForm("savePageBefore"));
+        $modal = $this->gui->modal($lng->txt("lm_insert_page"))->form($this->getAddPageForm("savePageBefore"));
         $modal->send();
     }
 
@@ -421,13 +423,14 @@ public function insertFirstChapter(): void
 
     public function insertChapterAfter(int $id = 0): void
     {
+        $lng = $this->domain->lng();
         $this->gui->ctrl()->setParameterByClass(
             self::class,
             "target_id",
             $id
         );
         $this->gui->clearAsnyOnloadCode();
-        $modal = $this->gui->modal()->form($this->getEditTitleForm(0, "saveChapterAfter"));
+        $modal = $this->gui->modal($lng->txt("lm_insert_chapter"))->form($this->getEditTitleForm(0, "saveChapterAfter"));
         $modal->send();
     }
 
@@ -443,13 +446,14 @@ public function saveChapterAfter(): void
 
     public function insertChapterBefore(int $id): void
     {
+        $lng = $this->domain->lng();
         $this->gui->ctrl()->setParameterByClass(
             self::class,
             "target_id",
             $id
         );
         $this->gui->clearAsnyOnloadCode();
-        $modal = $this->gui->modal()->form($this->getEditTitleForm(0, "saveChapterBefore"));
+        $modal = $this->gui->modal($lng->txt("lm_insert_chapter"))->form($this->getEditTitleForm(0, "saveChapterBefore"));
         $modal->send();
     }
 
@@ -553,8 +557,9 @@ protected function getEditTitleForm(int $id, $cmd = "saveTitle"): FormAdapterGUI
 
     public function editTitle(int $id): void
     {
+        $lng = $this->domain->lng();
         $this->gui->clearAsnyOnloadCode();
-        $modal = $this->gui->modal()->form($this->getEditTitleForm($id));
+        $modal = $this->gui->modal($lng->txt("cont_edit_title"))->form($this->getEditTitleForm($id));
         $modal->send();
     }
 

From abe7bfd95870b86e8b90d8c55d4cd3bd848e6a30 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Sun, 15 Feb 2026 21:13:11 +0100
Subject: [PATCH 058/141] 45859: Link to Blog Post in blog post notification is
 wrong

---
 components/ILIAS/Blog/Notification/NotificationManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/Blog/Notification/NotificationManager.php b/components/ILIAS/Blog/Notification/NotificationManager.php
index 351a0edbfec9..76628f3c5436 100644
--- a/components/ILIAS/Blog/Notification/NotificationManager.php
+++ b/components/ILIAS/Blog/Notification/NotificationManager.php
@@ -140,7 +140,7 @@ protected function sendSystemNotification(
 
         $notified = $ntf->sendMailAndReturnRecipients(
             $users,
-            "_" . $posting->getId(),
+            (string) $posting->getId(),
             ($admin_only ? "write" : "read")
         );
 

From 68bc52e3419e3056a8765a81813c91bf3d1d15d4 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Sun, 15 Feb 2026 21:30:48 +0100
Subject: [PATCH 059/141] 45117: .svg images not visible in Abstract

---
 components/ILIAS/Blog/Posting/class.ilBlogPostingGUI.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/ILIAS/Blog/Posting/class.ilBlogPostingGUI.php b/components/ILIAS/Blog/Posting/class.ilBlogPostingGUI.php
index 0b46a7eb0160..57075b41b008 100755
--- a/components/ILIAS/Blog/Posting/class.ilBlogPostingGUI.php
+++ b/components/ILIAS/Blog/Posting/class.ilBlogPostingGUI.php
@@ -788,6 +788,14 @@ protected function getFirstMediaObjectAsTag(
                 $mob_obj = new ilObjMediaObject((int) $mob_id);
                 $mob_item = $mob_obj->getMediaItem("Standard");
                 if (stripos($mob_item->getFormat(), "image") !== false) {
+                    if ($mob_item->getFormat() === "image/svg+xml") {
+                        $location = $mob_obj->getStandardSrc();
+                        return '<img' .
+                            ' src="' . $location . '"' .
+                            ' style="max-width: ' . $a_width . 'px; height: auto;"' .
+                            ' class="ilBlogListItemSnippetPreviewImage ilFloatLeft noMirror"' .
+                            ' />';
+                    }
                     $mob_size = $mob_item->getOriginalSize();
                     if (is_null($mob_size)) {
                         continue;

From 517990f2e7bf483e46b93efed011dfbd729a6357 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Mon, 16 Feb 2026 08:56:26 +0100
Subject: [PATCH 060/141] fixed content.css

---
 components/ILIAS/COPage/css/content.css | 3460 ++++++++++-------------
 1 file changed, 1550 insertions(+), 1910 deletions(-)

diff --git a/components/ILIAS/COPage/css/content.css b/components/ILIAS/COPage/css/content.css
index c78b7bd65b5c..badb230ae15f 100755
--- a/components/ILIAS/COPage/css/content.css
+++ b/components/ILIAS/COPage/css/content.css
@@ -1,1912 +1,1552 @@
 /* this should be derived from zip in libs/ilias/Style */
-
-@image_path: '../basic_style/images/';
-
-a.ilc_qetitem_ErrorTextItem
-{
-	padding: 2px;
-	text-decoration: none;
-}
-
-a.ilc_qetitem_ErrorTextItem:hover
-{
-	color: #000000;
-	text-decoration: none;
-	background-color: #D0D0D0;
-}
-
-a.ilc_qetitem_ErrorTextSelected
-{
-	border-style: none;
-	background-color: #E2E8EF;
-	color: #161616;
-}
-
-a.ilc_link_ExtLink
-{
-	text-decoration: underline;
-}
-
-a.ilc_link_FileLink
-{
-	text-decoration: underline;
-}
-
-a.ilc_link_GlossaryLink
-{
-	text-decoration: underline;
-}
-
-a.ilc_glo_ovclink_GlossaryOvCloseLink
-{
-	text-decoration: underline;
-	font-weight: normal;
-}
-
-a.ilc_glo_ovuglistlink_GlossaryOvUGListLink
-{
-	font-weight: normal;
-}
-
-a.ilc_glo_ovuglink_GlossaryOvUnitGloLink
-{
-	font-weight: normal;
-}
-
-a.ilc_qimgd_ImageDetailsLink
-{
-	font-size: 90%;
-}
-
-a.ilc_link_IntLink
-{
-	text-decoration: underline;
-}
-
-a.ilc_marker_Marker
-{
-	background-image: url("@{image_path}icon_pin.svg");
-	background-repeat: no-repeat;
-	cursor: pointer;
-	display: block;
-	height: 32px;
-	width: 24px;
-	position: absolute;
-}
-
-a.ilc_marker_Marker:hover
-{
-	background-repeat: no-repeat;
-	background-image: url("@{image_path}icon_pin_on.svg");
-}
-
-
-
-a.ilc_rte_mlink_RTELink
-{
-	font-size: 100%;
-	margin: 1px;
-	margin-top: 10px;
-	margin-right: 5px;
-	margin-bottom: 10px;
-	margin-left: 5px;
-	padding-right: 3mm;
-	padding-top: 1mm;
-	border-style: none;
-	padding-bottom: 1mm;
-	text-decoration: none;
-	padding-left: 3mm;
-	border-width: 1px;
-	background-color: #4C6586;
-	text-align: center;
-	height: 50px;
-	color: #ffffff !important;
-	text-decoration: none !important;
-}
-
-a.ilc_rte_mlink_RTELink:hover
-{
-	background-color: #577399;
-	color: #FFFFFF;
-	text-decoration: none !important;
-}
-
-a.ilc_rte_mlink_RTELinkDisabled
-{
-}
-
-a.ilc_rte_mlink_RTELinkDisabled:hover
-{
-}
-
-a.ilc_rte_texp_RTETreeCollapsed
-{
-	background-image: url("@{image_path}arrow_right.svg");
-	background-repeat: no-repeat;
-	background-position: 0px 0px;
-	background-size: 15px 15px !important;
-}
-
-a.ilc_rte_tclink_RTETreeControlLink
-{
-	color: #4C6586;
-	color: #4C6586 !important;
-}
-
-a.ilc_rte_tlink_RTETreeCurrent
-{
-	background-color: #FFFF9D;
-	color: #161616 !important;
-	background-color: #E2E8EF !important;
-}
-
-a.ilc_rte_texp_RTETreeExpanded
-{
-	background-image: url("@{image_path}arrow_down.svg");
-	background-size: 15px 15px;
-}
-
-a.ilc_rte_tlink_RTETreeLink
-{
-	color: #4C6586;
-	color: #4C6586 !important;
-}
-
-div.ilc_va_cntr_AccordCntr
-{
-	margin-top: 5px;
-}
-
-div.ilc_va_icntr_AccordICntr
-{
-	margin-bottom: 5px;
-}
-
-div.ilc_va_icont_AccordICont
-{
-	margin-top: -1px;
-	margin-bottom: 12px;
-	padding-top: 3px;
-	padding-right: 3px;
-	padding-bottom: 3px;
-	padding-left: 15px;
-	border-width: 1px;
-	border-color: #DDDDDD;
-	border-style: solid;
-	background-color: #FFFFFF;
-	border-bottom-right-radius: 3px;
-	border-bottom-left-radius: 3px;
-}
-
-div.ilc_va_ihead_AccordIHead
-{
-	text-align: left;
-	margin-bottom: 12px;
-	padding-top: 8px;
-	padding-right: 8px;
-	padding-bottom: 8px;
-	padding-left: 38px;
-	border-width: 1px;
-	border-color: #DDDDDD;
-	border-style: solid;
-	background-color: #F9F9F9;
-	background-image: url("@{image_path}arrow_right.svg");
-	background-repeat: no-repeat;
-	background-position: 15px center;
-	cursor: pointer;
-	background-size: 20px 20px;
-	border-radius: 3px;
-	font-weight: 600;
-}
-
-div.ilc_va_ihead_AccordIHead:hover
-{
-	background-color: #E2E8EF;
-}
-
-div.ilc_va_ihcap_AccordIHeadCap
-{
-	font-size: 1em;
-	font-weight: 600;
-}
-
-div.ilc_section_Additional
-,a.ilc_section_Additional
-{
-	padding-left: 20px;
-	margin-top: 40px;
-	margin-bottom: 10px;
-	position: relative;
-	border-width: 2px;
-	border-color: #4C6586;
-	border-style: solid;
-	padding-top: 35px;
-	padding-right: 30px;
-	padding-bottom: 15px;
-	border-radius: 3px;
-	position: relative !important;
-	background-position: left top;
-}
-
-div.ilc_section_Additional::before
-,a.ilc_section_Additional::before
-{
-	border-width: 2px;
-	border-color: #FFFFFF;
-	border-style: solid;
-	background-color: #eceff4;
-	background-position: center center;
-	left: 15px;
-	background-image: url("@{image_path}additional.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	width: 60px;
-	height: 60px;
-	top: -32px;
-	right: 0px;
-	content: "";
-	display: block;
-	border-radius: 50px;
-}
-
-div.ilc_section_AdvancedKnowledge
-,a.ilc_section_AdvancedKnowledge
-{
-	position: relative;
-	border-width: 2px;
-	border-color: #4C6586;
-	border-style: solid;
-	padding-left: 20px;
-	padding-right: 30px;
-	padding-top: 35px;
-	padding-bottom: 15px;
-	margin-top: 40px;
-	margin-bottom: 10px;
-	background-position: left top;
-	border-radius: 3px;
-	position: relative !important;
-}
-
-div.ilc_section_AdvancedKnowledge::before
-,a.ilc_section_AdvancedKnowledge::before
-{
-	border-width: 2px;
-	border-color: #FFFFFF;
-	border-style: solid;
-	background-color: #eceff4;
-	background-position: center center;
-	left: 15px;
-	background-image: url("@{image_path}advknowledge.svg");
-	position: absolute;
-	top: -32px;
-	right: 0px;
-	content: "";
-	width: 60px;
-	display: block;
-	height: 60px;
-	border-radius: 50px;
-	background-repeat: no-repeat;
-}
-
-div.ilc_qanswer_Answer
-{
-	padding-right: 10px;
-	border-radius: 5px;
-}
-
-div.ilc_section_Attention
-,a.ilc_section_Attention
-{
-	position: relative;
-	border-width: 2px;
-	border-color: #FA8228;
-	border-style: solid;
-	border-radius: 3px;
-	position: relative !important;
-	padding-left: 20px;
-	padding-bottom: 15px;
-	padding-right: 30px;
-	padding-top: 35px;
-	margin-bottom: 10px;
-	margin-top: 40px;
-}
-
-div.ilc_section_Attention::before
-,a.ilc_section_Attention::before
-{
-	border-width: 2px;
-	border-color: #FFFFFF;
-	border-style: solid;
-	background-color: #fee6d4;
-	background-position: center 12px;
-	left: 15px;
-	content: "";
-	display: block;
-	border-radius: 50px;
-	background-image: url("@{image_path}attention.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	top: -32px;
-	width: 60px;
-	height: 60px;
-}
-
-div.ilc_section_Background
-,a.ilc_section_Background
-{
-	background-color: #F9F9F9;
-	padding-top: 10px;
-	margin-bottom: 20px;
-	padding-right: 20px;
-	padding-bottom: 10px;
-	padding-left: 20px;
-}
-
-div.ilc_section_Block
-,a.ilc_section_Block
-{
-	padding-bottom: 10px;
-	padding-right: 20px;
-	margin-bottom: 10px;
-	padding-top: 10px;
-	margin-top: 20px;
-	padding-left: 20px;
-}
-
-
-div.ilc_section_Button:hover
-,a.ilc_section_Button:hover
-{
-}
-
-div.ilc_section_Card
-,a.ilc_section_Card
-{
-	min-height: 250px;
-	position: relative;
-	margin: 15px;
-	padding-top: 15px;
-	padding-right: 15px;
-	padding-bottom: 15px;
-	padding-left: 15px;
-	box-shadow: 5px 5px 40px rgba(0,0,0,.2);
-	border-radius: 15px;
-	max-width: 400px;
-}
-
-div.ilc_section_Citation
-,a.ilc_section_Citation
-{
-	padding-right: 30px;
-	padding-top: 35px;
-	margin-bottom: 10px;
-	margin-top: 40px;
-	position: relative;
-	border-width: 2px;
-	border-color: #4C6586;
-	border-style: solid;
-	background-color: #FFFFFF;
-	border-radius: 3px;
-	position: relative !important;
-	padding-left: 20px;
-	padding-bottom: 15px;
-}
-
-div.ilc_section_Citation::before
-,a.ilc_section_Citation::before
-{
-	background-color: #eceff4;
-	left: 15px;
-	background-position: center center;
-	border-width: 2px;
-	border-color: #FFFFFF;
-	border-style: solid;
-	content: "";
-	display: block;
-	border-radius: 50px;
-	background-image: url("@{image_path}citation.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	top: -32px;
-	width: 60px;
-	height: 60px;
-}
-
-div.ilc_va_ihead_ColoredAccordIHead:hover
-{
-	background-color: #3d506b;
-	cursor: pointer;
-	transition: all 0.5s ease-out;
-}
-
-div.ilc_section_Confirmation
-,a.ilc_section_Confirmation
-{
-	position: relative;
-	border-width: 2px;
-	border-color: #6EA03C;
-	border-style: solid;
-	border-radius: 3px;
-	position: relative !important;
-	margin-top: 40px;
-	margin-bottom: 10px;
-	padding-top: 35px;
-	padding-bottom: 15px;
-	padding-right: 30px;
-	padding-left: 20px;
-}
-
-div.ilc_section_Confirmation::before
-,a.ilc_section_Confirmation::before
-{
-	border-width: 2px;
-	border-color: #FFFFFF;
-	border-style: solid;
-	background-position: center center;
-	left: 15px;
-	background-color: #e9f3df;
-	content: "";
-	display: block;
-	border-radius: 50px;
-	background-image: url("@{image_path}confirmation.svg");
-	position: absolute;
-	top: -32px;
-	width: 60px;
-	height: 60px;
-	background-repeat: no-repeat;
-}
-
-div.ilc_iim_ContentPopup
-{
-	padding-left: 10px;
-	padding-bottom: 5px;
-	padding-right: 10px;
-	padding-top: 5px;
-	border-style: solid;
-	border-width: 1px;
-	background-color: #FFFFFF;
-	border-color: #d8d8d8;
-}
-
-div.ilc_qover_Correct
-{
-	padding-top: 20px;
-	padding-right: 20px;
-	background-image: url("@{image_path}correct.svg");
-	padding-bottom: 20px;
-	padding-left: 60px;
-	background-position: 10px;
-	background-repeat: no-repeat;
-	border-style: none;
-	background-color: #f0f7ea;
-	margin-bottom: 10px;
-	border-radius: 3px;
-	margin-top: 10px;
-}
-
-div.ilc_va_cntr_EmphasisedAccordCntr
-{
-	padding-top: 5px;
-	padding-right: 15px;
-	padding-left: 15px;
-}
-
-div.ilc_va_icont_EmphasisedAccordICont
-{
-	padding: 15px;
-	background-color: #eceff4;
-	transform: scale(1.01);
-	-webkit-transform: scale(1.01);
-	-moz-transform: scale(1.01);
-	-ms-transform: scale(1.01);
-	transition: all 0.5s ease-out;
-}
-
-div.ilc_va_ihead_EmphasisedAccordIHead
-{
-	font-size: 1.5em;
-	color: #FFFFFF;
-	padding: 15px;
-	background-color: #4C6586;
-	background-image: url("@{image_path}expand_white.svg");
-	background-repeat: no-repeat;
-	background-position: right center;
-	transition: all 0.5s ease-out;
-}
-
-div.ilc_va_ihead_EmphasisedAccordIHead:hover
-{
-	background-color: #3d506b;
-	transition: all 0.5s ease-out;
-}
-
-div.ilc_section_Example
-,a.ilc_section_Example
-{
-	padding-right: 30px;
-	padding-bottom: 15px;
-	padding-left: 20px;
-	background-position: left center;
-	margin-bottom: 10px;
-	margin-top: 40px;
-	position: relative;
-	border-width: 2px;
-	border-color: #4C6586;
-	border-style: solid;
-	border-radius: 3px;
-	position: relative !important;
-	padding-top: 35px;
-}
-
-div.ilc_section_Example::before
-,a.ilc_section_Example::before
-{
-	background-color: #eceff4;
-	background-position: center center;
-	left: 15px;
-	background-image: url("@{image_path}example.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	top: -32px;
-	width: 60px;
-	height: 60px;
-	border-width: 2px;
-	border-color: #FFFFFF;
-	border-style: solid;
-	right: 0px;
-	content: "";
-	display: block;
-	border-radius: 50px;
-}
-
-div.ilc_section_Excursus
-,a.ilc_section_Excursus
-{
-	padding-right: 30px;
-	margin-bottom: 10px;
-	margin-top: 40px;
-	border-style: solid;
-	border-width: 2px;
-	position: relative;
-	padding-top: 35px;
-	border-color: #4C6586;
-	padding-left: 20px;
-	border-radius: 3px;
-	position: relative !important;
-	padding-bottom: 15px;
-}
-
-div.ilc_section_Excursus::before
-,a.ilc_section_Excursus::before
-{
-	border-width: 2px;
-	border-color: #FFFFFF;
-	border-style: solid;
-	background-color: #eceff4;
-	background-position: center center;
-	left: 15px;
-	content: "";
-	display: block;
-	border-radius: 50px;
-	background-image: url("@{image_path}excursus.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	top: -32px;
-	width: 60px;
-	height: 60px;
-}
-
-div.ilc_qfeedr_FeedbackRight
-{
-	margin-top: 10px;
-	padding-top: 20px;
-	margin-bottom: 10px;
-	border-style: none;
-	background-color: #f0f7ea;
-	padding-left: 60px;
-	padding-bottom: 20px;
-	padding-right: 160px;
-	background-image: url("@{image_path}correct.svg");
-	background-position: 10px;
-	background-repeat: no-repeat;
-	border-radius: 3px;
-}
-
-div.ilc_qfeedw_FeedbackWrong
-{
-	padding-left: 60px;
-	padding-bottom: 20px;
-	background-position: 24px;
-	padding-right: 160px;
-	background-image: url("@{image_path}exclamation.svg");
-	margin-top: 10px;
-	background-repeat: no-repeat;
-	padding-top: 20px;
-	margin-bottom: 10px;
-	border-style: none;
-	background-color: #fef2ea;
-	border-radius: 3px;
-}
-
-div.ilc_flist_cont_FileListContainer
-{
-	border-radius: 3px;
-	color: #FFFFFF;
-	margin-top: 10px;
-	margin-right: 0px;
-	margin-bottom: 10px;
-	margin-left: 0px;
-	border-color: #4C6586;
-	border-style: solid;
-	border-width: 1px;
-	text-indent: 7px;
-	padding-bottom: 10px;
-}
-
-div.ilc_flist_head_FileListHeading
-{
-	margin-bottom: 10px;
-	text-align: left;
-	color: #FFFFFF;
-	font-weight: bold;
-	background-image: url("@{image_path}download.svg");
-	background-color: #4C6586;
-	margin-top: 0px;
-	background-position: 10px;
-	background-repeat: no-repeat;
-	padding-left: 50px;
-	padding-bottom: 10px;
-	padding-right: 20px;
-	padding-top: 10px;
-}
-
-div.ilc_sco_fmess_FinalMessage
-{
-	margin: 100px;
-	text-align: center;
-	border-style: none;
-	border-width: 1px;
-	padding: 50px;
-	font-size: 125%;
-}
-
-div.ilc_page_fn_Footnote
-{
-	margin-bottom: 5px;
-	margin-top: 5px;
-}
-
-div.ilc_glo_overlay_GlossaryOverlay
-{
-	border-style: none;
-	padding-top: 5px;
-	border-width: 2px;
-	padding-left: 10px;
-	padding-bottom: 5px;
-	padding-right: 10px;
-}
-
-div.ilc_ha_ihead_HAccordIHead:hover
-{
-	background-color: #E2E8EF;
-}
-
-div.ilc_qover_Incorrect
-{
-	padding-left: 60px;
-	background-image: url("@{image_path}exclamation.svg");
-	background-repeat: no-repeat;
-	background-position: 24px;
-	padding-bottom: 20px;
-	padding-right: 20px;
-	margin-bottom: 10px;
-	margin-top: 10px;
-	background-color: #fef2ea;
-	border-style: none;
-	padding-top: 20px;
-	border-radius: 3px;
-}
-
-div.ilc_section_Information
-,a.ilc_section_Information
-{
-	margin-bottom: 10px;
-	margin-top: 40px;
-	position: relative;
-	border-width: 2px;
-	border-color: #4C6586;
-	border-style: solid;
-	border-radius: 3px;
-	position: relative !important;
-	padding-left: 20px;
-	padding-bottom: 15px;
-	padding-right: 30px;
-	padding-top: 35px;
-}
-
-div.ilc_section_Information::before
-,a.ilc_section_Information::before
-{
-	background-color: #eceff4;
-	background-position: center center;
-	left: 15px;
-	border-width: 2px;
-	border-color: #FFFFFF;
-	border-style: solid;
-	background-image: url("@{image_path}information.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	top: -32px;
-	width: 60px;
-	height: 60px;
-	content: "";
-	display: block;
-	border-radius: 50px;
-}
-
-div.ilc_section_Interaction
-,a.ilc_section_Interaction
-{
-	margin-top: 10px;
-	padding-top: 20px;
-	margin-bottom: 10px;
-	padding-right: 20px;
-	padding-bottom: 20px;
-	background-image: url("@{image_path}interaction.svg");
-	padding-left: 60px;
-	background-position: 12px;
-	background-repeat: no-repeat;
-	border-width: 1px;
-	border-color: #4C6586;
-	border-style: solid;
-	border-radius: 3px;
-}
-
-div.ilc_section_Interaction:hover
-,a.ilc_section_Interaction:hover
-{
-	cursor: pointer;
-	background-color: #E2E8EF;
-}
-
-
-div.ilc_va_icont_LightAccordICont
-{
-	padding: 10px;
-	border-width: 4px;
-	border-color: #4C6586;
-	border-bottom-style: solid;
-}
-
-div.ilc_va_ihead_LightAccordIHead
-{
-	color: #4C6586;
-	padding: 10px;
-	border-width: 2px;
-	border-color: #4C6586;
-	border-bottom-style: solid;
-	background-image: url("@{image_path}expand.svg");
-	background-position: right center;
-	background-repeat: no-repeat;
-	font-size: 1.5em;
-	background-color: #FFFFFF;
-	transition: background-image 2s ease-in-out;
-}
-
-div.ilc_va_ihead_LightAccordIHead:hover
-{
-	cursor: pointer;
-	border-width: 4px;
-	border-color: #4C6586;
-	border-bottom-style: solid;
-	transition: all 0.5s ease-out;
-}
-
-div.ilc_section_Link
-,a.ilc_section_Link
-{
-	text-decoration: underline;
-	margin-top: 10px;
-	margin-bottom: 10px;
-	padding-top: 20px;
-	padding-right: 20px;
-	padding-bottom: 20px;
-	padding-left: 60px;
-	border-width: 1px;
-	border-color: #4C6586;
-	border-style: dashed;
-	background-image: url("@{image_path}link.svg");
-	background-repeat: no-repeat;
-	background-position: 10px;
-	border-radius: 3px;
-}
-
-div.ilc_section_Literature
-,a.ilc_section_Literature
-{
-	margin-top: 40px;
-	margin-bottom: 10px;
-	padding-top: 35px;
-	padding-right: 30px;
-	padding-bottom: 15px;
-	padding-left: 20px;
-	position: relative;
-	border-width: 2px;
-	border-color: #4C6586;
-	border-style: solid;
-	border-radius: 3px;
-	position: relative !important;
-}
-
-div.ilc_section_Literature::before
-,a.ilc_section_Literature::before
-{
-	border-width: 2px;
-	border-color: #FFFFFF;
-	border-style: solid;
-	background-color: #eceff4;
-	background-position: center center;
-	left: 15px;
-	content: "";
-	display: block;
-	border-radius: 50px;
-	background-image: url("@{image_path}literature.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	top: -32px;
-	width: 60px;
-	height: 60px;
-}
-
-div.ilc_media_caption_MediaCaption
-{
-	font-weight: bolder;
-	font-size: 100%;
-	padding: 10px;
-	background-color: #F9F9F9;
-}
-
-div.ilc_section_Mnemonic
-,a.ilc_section_Mnemonic
-{
-	padding-right: 30px;
-	padding-bottom: 15px;
-	padding-left: 20px;
-	background-position: left center;
-	border-style: solid;
-	padding-top: 35px;
-	position: relative;
-	border-width: 2px;
-	border-color: #F3DE2C;
-	border-radius: 3px;
-	position: relative !important;
-	margin-top: 40px;
-	margin-bottom: 10px;
-}
-
-div.ilc_section_Mnemonic::before
-,a.ilc_section_Mnemonic::before
-{
-	border-width: 2px;
-	border-color: #FFFFFF;
-	background-color: #fdfadf;
-	background-position: center center;
-	left: 15px;
-	border-style: solid;
-	content: "";
-	display: block;
-	border-radius: 50px;
-	background-image: url("@{image_path}mnemonic.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	top: -32px;
-	width: 60px;
-	height: 60px;
-}
-
-div.ilc_page_Page
-{
-	min-height: 300px;
-}
-
-div.ilc_page_cont_PageContainer
-{
-	border-width: 1px;
-	border-color: #DDDDDD;
-	padding: 20px;
-	margin: 0px;
-	border-style: solid;
-	background-color: #FFFFFF;
-	min-height: 500px;
-}
-
-div.ilc_section_Remark
-,a.ilc_section_Remark
-{
-	border-style: solid;
-	border-width: 2px;
-	position: relative;
-	border-color: #4C6586;
-	border-radius: 3px;
-	position: relative !important;
-	padding-right: 30px;
-	padding-top: 35px;
-	padding-left: 20px;
-	padding-bottom: 15px;
-	margin-top: 40px;
-	margin-bottom: 10px;
-}
-
-div.ilc_section_Remark::before
-,a.ilc_section_Remark::before
-{
-	border-width: 2px;
-	border-color: #FFFFFF;
-	background-image: url("@{image_path}remark.svg");
-	border-style: solid;
-	background-repeat: no-repeat;
-	background-color: #eceff4;
-	position: absolute;
-	background-position: center center;
-	top: -32px;
-	left: 15px;
-	width: 60px;
-	content: "";
-	height: 60px;
-	display: block;
-	border-radius: 50px;
-}
-
-
-div.ilc_rte_menu_RTELinkBar
-{
-	border-top-width: 10px;
-	border-bottom-width: 10px;
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-div.ilc_rte_menu_RTELogo
-{
-	float: left;
-}
-
-div.ilc_rte_menu_RTEMenu
-{
-	background-color: #FFFFFF;
-}
-
-div.ilc_section_Separator
-,a.ilc_section_Separator
-{
-	margin-top: 10px;
-	margin-bottom: 10px;
-	padding-top: 20px;
-	border-width: 2px;
-	padding-bottom: 20px;
-	border-color: #4C6586;
-	border-top-style: solid;
-}
-
-div.ilc_section_Special
-,a.ilc_section_Special
-{
-	padding-left: 20px;
-	border-style: none;
-	border-width: 1px;
-	padding-bottom: 20px;
-	padding-top: 20px;
-	padding-right: 20px;
-}
-
-div.ilc_question_Standard
-{
-	padding-left: 30px;
-	padding-bottom: 60px;
-	box-shadow: 0 3px 3px rgba(0,0,0,0.10), 0 6px 15px rgba(0,0,0,0.12);
-
-	background-position: right top;
-	margin-top: 20px;
-	margin-bottom: 10px;
-	padding-top: 30px;
-	padding-right: 30px;
-}
-
-div.ilc_qover_StatusMessage
-{
-	padding-bottom: 7px;
-}
-
-div.ilc_qtitle_Title
-{
-	margin-bottom: 20px;
-	font-size: 140%;
-	font-weight: normal;
-}
-
-div.ilc_sco_title_Title
-{
-	border-bottom-style: solid;
-	border-bottom-width: 2px;
-	padding-bottom: 3px;
-	font-size: 140%;
-	margin-bottom: 20px;
-	font-weight: bold;
-	margin-top: 5px;
-}
-
-
-
-em.ilc_em_Emph, span.ilc_text_inline_Emph
-{
-	font-style: italic;
-}
-
-figure.ilc_media_cont_MediaContainer
-{
-	margin: 0px;
-}
-
-figure.ilc_media_cont_MediaContainerFull100
-{
-	margin: 0px;
-	width: 100%;
-	box-shadow: 0 3px 3px rgba(0,0,0,0.10), 0 6px 15px rgba(0,0,0,0.12);
-}
-
-figure.ilc_media_cont_MediaContainerHighlighted
-{
-	margin: 0px;
-	box-shadow: 0 3px 3px rgba(0,0,0,0.10), 0 6px 15px rgba(0,0,0,0.12);
-}
-
-figure.ilc_media_cont_MediaContainerMax50
-{
-	margin: 0px;
-	box-shadow: 0 3px 3px rgba(0,0,0,0.10), 0 6px 15px rgba(0,0,0,0.12);
-	max-width: 50%;
-}
-
-figure.ilc_media_cont_MediaContainerSeparated
-{
-	margin: 40px;
-}
-
-h1.ilc_glo_ovtitle_GlossaryOvTitle
-,div.ilc_text_block_GlossaryOvTitle
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_GlossaryOvTitle p
-{
-	margin-bottom: 10px;
-	font-size: 1.5em;
-	margin-top: 10px;
-	font-weight: 600;
-}
-
-h1.ilc_heading1_Headline1
-,div.ilc_text_block_Headline1
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_Headline1 p
-{
-	padding-top: 10px;
-	margin-bottom: 15px;
-	margin-top: 20px;
-	font-size: 1.75em;
-	font-weight: 600;
-}
-
-h1.ilc_page_title_PageTitle
-,div.ilc_text_block_PageTitle
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_PageTitle p
-{
-	font-weight: 600;
-	border-bottom-width: 1px;
-	border-bottom-style: none;
-	border-style: none;
-	font-size: 1.75rem;
-	padding-bottom: 3px;
-	margin-top: 15px;
-	margin-bottom: 15px;
-	text-align: left;
-	white-space: normal;
-}
-
-h2.ilc_heading2_Headline2
-,div.ilc_text_block_Headline2
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_Headline2 p
-{
-	font-weight: 600;
-	font-size: 1.5em;
-	margin-top: 20px;
-	margin-bottom: 15px;
-}
-
-h3.ilc_heading3_Headline3
-,div.ilc_text_block_Headline3
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_Headline3 p
-{
-	font-weight: 600;
-	margin-top: 15px;
-	margin-bottom: 10px;
-	font-size: 1.115em;
-}
-
-
-
-img.ilc_qimg_QuestionImage
-{
-	margin: 10px;
-	box-shadow: 0 3px 3px rgba(0,0,0,0.10), 0 6px 15px rgba(0,0,0,0.12);
-}
-
-
-input.ilc_qsubmit_Submit
-{
-	border-style: none;
-	color: #ffffff !important;
-	padding: 0.5em;
-	margin-top: 20px;
-	background-color: #4C6586;
-}
-
-input.ilc_qsubmit_Submit:hover
-{
-	cursor: pointer;
-	background-color: #314157;
-}
-
-input.ilc_qinput_TextInput
-{
-	padding-left: 4px;
-}
-
-li.ilc_list_item_Attention
-{
-	margin-bottom: 15px;
-	padding-top: 6px;
-	padding-bottom: 6px;
-	padding-left: 45px;
-	position: relative;
-	list-style-type: none;
-}
-
-li.ilc_list_item_Attention::before
-{
-	background-image: url("@{image_path}attention_red.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	width: 35px;
-	height: 35px;
-	left: 0;
-	top: 0;
-	content: "";
-}
-
-li.ilc_list_item_Checklist
-{
-	list-style-type: none;
-	margin-bottom: 15px;
-	padding-top: 6px;
-	padding-bottom: 6px;
-	padding-left: 45px;
-	position: relative;
-}
-
-li.ilc_list_item_Checklist2::before
-{
-	background-image: url("@{image_path}wrong.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	width: 35px;
-	height: 35px;
-	left: 0;
-	top: 0;
-	content: "";
-}
-
-li.ilc_list_item_Checklist::before
-{
-	content: "";
-	background-image: url("@{image_path}checked.svg");
-	background-repeat: no-repeat;
-	width: 35px;
-	height: 35px;
-	position: absolute;
-	left: 0;
-	top: 0;
-}
-
-li.ilc_list_item_ColoredCircle::before
-{
-	font-weight: bold;
-	color: #FFFFFF;
-	background-color: #59A0A5;
-	position: absolute;
-	width: 35px;
-	height: 35px;
-	content: counter(section);
-	border-radius: 50px;
-	left: 0;
-	display: grid;
-	justify-content: center;
-	align-items: center;
-	top: 0;
-}
-
-li.ilc_list_item_ColoredCircleBackground::before
-{
-	font-size: 1.5rem;
-	font-weight: bold;
-	color: #FFFFFF;
-	margin-left: 10px;
-	background-color: #4C6586;
-	position: absolute;
-	width: 50px;
-	height: 50px;
-	content: counter(section);
-	border-radius: 50px;
-	left: 0;
-	top: 13px;
-	display: grid;
-	align-items: center;
-	justify-content: center;
-}
-
-li.ilc_list_item_ColoredSquare::before
-{
-	font-weight: bold;
-	color: #FFFFFF;
-	background-color: #F3DE2C;
-	position: absolute;
-	width: 35px;
-	height: 35px;
-	content: counter(section);
-	border-radius: 6px;
-	left: 0;
-	display: grid;
-	justify-content: center;
-	align-items: center;
-	top: 0;
-}
-
-li.ilc_list_item_ColoredSquareBackground::before
-{
-	font-weight: bold;
-	color: #FFFFFF;
-	background-color: #F3DE2C;
-	position: absolute;
-	width: 35px;
-	height: 100%;
-	text-align: center;
-	content: counter(section);
-	left: 0;
-	top: 0;
-	display: grid;
-	justify-content: center;
-	align-items: center;
-}
-
-li.ilc_flist_li_FileListItem
-{
-	padding-left: 3px;
-	padding-right: 3px;
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-
-li.ilc_list_item_FilledCircle
-{
-	margin-bottom: 15px;
-	padding-top: 6px;
-	padding-bottom: 6px;
-	padding-left: 45px;
-	position: relative;
-	list-style-type: none;
-	counter-increment: section 1;
-}
-
-li.ilc_list_item_FilledCircle::before
-{
-	font-weight: bold;
-	color: #FFFFFF;
-	background-color: #59A0A5;
-	position: absolute;
-	height: 35px;
-	min-width: 35px;
-	content: counter(section);
-	border-radius: 50px;
-	left: 0;
-	display: grid;
-	justify-content: center;
-	align-items: center;
-	top: 0;
-}
-
-li.ilc_list_item_FilledCircleLarge
-{
-	font-size: 1.5rem;
-	position: relative;
-	padding-top: 20px;
-	padding-right: 20px;
-	padding-bottom: 20px;
-	padding-left: 70px;
-	list-style-type: none;
-	counter-increment: section 1;
-}
-
-li.ilc_list_item_FilledCircleLarge::before
-{
-	font-weight: bold;
-	color: #FFFFFF;
-	margin-left: 10px;
-	position: absolute;
-	height: 50px;
-	background-color: #4C6586;
-	content: counter(section);
-	min-width: 50px;
-	border-radius: 50px;
-	left: 0;
-	top: 13px;
-	display: grid;
-	align-items: center;
-	justify-content: center;
-}
-
-li.ilc_list_item_FilledSquare
-{
-	margin-bottom: 15px;
-	padding-top: 6px;
-	padding-bottom: 6px;
-	padding-left: 45px;
-	position: relative;
-	list-style-type: none;
-	counter-increment: section 1;
-}
-
-li.ilc_list_item_FilledSquare::before
-{
-	font-weight: bold;
-	color: #FFFFFF;
-	background-color: #F3DE2C;
-	position: absolute;
-	height: 35px;
-	content: counter(section);
-	min-width: 35px;
-	border-radius: 6px;
-	left: 0;
-	display: grid;
-	justify-content: center;
-	align-items: center;
-	top: 0;
-}
-
-li.ilc_list_item_FilledSquareBackground
-{
-	margin-top: -2px;
-	padding-top: 15px;
-	padding-bottom: 15px;
-	padding-left: 50px;
-	border-width: 2px;
-	border-color: #FFFFFF;
-	border-style: solid;
-	background-color: #fdfadf;
-	list-style-type: none;
-	counter-increment: section 1;
-	position: relative;
-}
-
-li.ilc_list_item_FilledSquareBackground::before
-{
-	background-color: #F3DE2C;
-	font-weight: bold;
-	color: #FFFFFF;
-	min-width: 35px;
-	display: grid;
-	justify-content: center;
-	align-items: center;
-	content: counter(section);
-	left: 0;
-	top: 0;
-	position: absolute;
-	height: 100%;
-}
-
-li.ilc_list_item_ListItem2::before
-{
-	width: 35px;
-	height: 35px;
-	color: #FFFFFF;
-	background-color: #59A0A5;
-	font-weight: bold;
-	margin-right: 10px;
-	content: counter(section);
-	display: inline-flex;
-	border-radius: 50px;
-	justify-content: center;
-	align-items: center;
-}
-
-li.ilc_list_item_ListItem2Absolut::before
-{
-	font-weight: bold;
-	color: #FFFFFF;
-	background-color: #59A0A5;
-	width: 35px;
-	height: 35px;
-	position: absolute;
-	content: counter(section);
-	border-radius: 50px;
-	left: 0;
-	display: grid;
-	justify-content: center;
-	align-items: center;
-}
-
-li.ilc_list_item_ListItem2Grid::before
-{
-	font-weight: bold;
-	color: #FFFFFF;
-	background-color: #59A0A5;
-	width: 35px;
-	height: 35px;
-	content: counter(section);
-	border-radius: 50px;
-	display: inline-grid;
-	justify-content: center;
-	align-items: center;
-}
-
-li.ilc_list_item_ListItem3::before
-{
-	background-image: url("@{image_path}checked.svg");
-	background-repeat: no-repeat;
-	width: 35px;
-	height: 35px;
-	margin-right: 5px;
-	display: inline-flex;
-	content: "";
-}
-
-li.ilc_list_item_ListItem4::before
-{
-	background-image: url("@{image_path}wrong.svg");
-	background-repeat: no-repeat;
-	width: 35px;
-	height: 35px;
-	margin-right: 5px;
-	display: inline-flex;
-	content: "";
-}
-
-li.ilc_list_item_ListItem::before
-{
-	font-size: 1.5rem;
-	font-weight: bold;
-	color: #FFFFFF;
-	background-color: #4C6586;
-	width: 50px;
-	height: 50px;
-	vertical-align: middle;
-	margin-left: 10px;
-	position: absolute;
-	content: counter(section);
-	display: grid;
-	border-radius: 50px;
-	align-items: center;
-	justify-content: center;
-	left: 0;
-	top: 13px;
-}
-
-li.ilc_qordli_OrderListItem
-{
-	margin-top: 5px;
-	margin-bottom: 5px;
-	margin-left: 0px;
-	margin-right: 0px;
-	cursor: move;
-	padding: 10px;
-	background-color: #E2E8EF;
-}
-
-li.ilc_qordli_OrderListItemHorizontal
-{
-	float: left;
-	margin-top: 5px;
-	margin-bottom: 5px;
-	margin-right: 10px;
-	padding: 10px;
-	cursor: move;
-	background-color: #E2E8EF;
-}
-
-li.ilc_list_item_Pointer
-{
-	margin-bottom: 15px;
-	padding-top: 6px;
-	padding-bottom: 6px;
-	padding-left: 45px;
-	position: relative;
-	list-style-type: none;
-}
-
-li.ilc_list_item_Pointer::before
-{
-	background-image: url("@{image_path}pointer.svg");
-	background-repeat: no-repeat;
-	position: absolute;
-	width: 35px;
-	height: 35px;
-	left: 0;
-	top: 0;
-	content: "";
-}
-
-ol.ilc_list_o_NumberedListNoStyle
-{
-	list-style-type: none;
-	margin-top: 15px;
-	padding-top: 20px;
-	padding-bottom: 20px;
-	counter-reset: section;
-}
-
-p.ilc_text_block_Book
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_Book p
-{
-	hyphens: auto;
-	text-align: justify;
-}
-
-p.ilc_text_block_Button:hover
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_Button:hover p
-{
-	background-color: #5774A0;
-}
-
-p.ilc_text_block_List
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_List p
-{
-	margin-top: 3px;
-	margin-bottom: 3px;
-}
-
-p.ilc_text_block_Numbers
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_Numbers p
-{
-	text-align: right;
-}
-
-p.ilc_text_block_Standard
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_Standard p
-{
-	margin-bottom: 10px;
-	margin-top: 10px;
-}
-
-p.ilc_text_block_StandardLarge
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_StandardLarge p
-{
-	font-size: 1.115rem;
-}
-
-p.ilc_text_block_TableContent
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_TableContent p
-{
-	line-height: 1.8em;
-	padding-bottom: 10px;
-	padding-top: 10px;
-	padding-left: 10px;
-	padding-right: 10px;
-	margin-top: 0px;
-	margin-bottom: 0px;
-	margin-right: 0px;
-	margin-left: 0px;
-}
-
-p.ilc_text_block_Verse
-,html.il-no-tiny-bg body#tinymce.ilc_text_block_Verse p
-{
-	text-align: center;
-}
-
-pre.ilc_code_block_Code
-{
-	border-width: 1px;
-	border-color: #DDDDDD;
-	border-style: solid;
-	padding: 9px;
-	background-color: #F9F9F9;
-}
-
-span.ilc_text_inline_Accent
-{
-	color: #087e0a;
-}
-
-span.ilc_text_inline_Attention
-{
-	color: #CB4D16;
-}
-
-span.ilc_text_inline_Comment
-{
-	color: #b31bff;
-}
-
-span.ilc_qetcorr_ErrorTextCorrected
-{
-	text-decoration: line-through;
-}
-
-span.ilc_text_inline_Important
-{
-	text-decoration: underline;
-}
-
-span.ilc_text_inline_Mnemonic
-{
-	background-color: #fcf7ca;
-	padding-left: 4px;
-	padding-right: 4px;
-}
-
-span.ilc_text_inline_Quotation
-{
-	letter-spacing: 0.2px;
-	font-style: italic;
-	font-family: serif;
-	color: #1B5FFF;
-	font-size: 114%;
-}
-
-strong.ilc_strong_Strong, span.ilc_text_inline_Strong
-{
-	font-weight: bold;
-}
-
-table.ilc_table_StandardTable
-{
-	border-collapse: collapse;
-	margin-top: 10px;
-	margin-bottom: 10px;
-	border-color: #9EADBA;
-}
-
-td.ilc_table_cell_Cell1
-,th.ilc_table_cell_Cell1
-{
-	padding-top: 3px;
-	padding-right: 10px;
-	padding-bottom: 3px;
-	padding-left: 10px;
-	background-color: #FFCCCC;
-}
-
-td.ilc_table_cell_Cell2
-,th.ilc_table_cell_Cell2
-{
-	background-color: #CCCCFF;
-	padding-top: 3px;
-	padding-right: 10px;
-	padding-bottom: 3px;
-	padding-left: 10px;
-}
-
-td.ilc_table_cell_Cell3
-,th.ilc_table_cell_Cell3
-{
-	padding-left: 10px;
-	padding-bottom: 3px;
-	padding-right: 10px;
-	padding-top: 3px;
-	background-color: #CCFFCC;
-}
-
-td.ilc_table_cell_Cell4
-,th.ilc_table_cell_Cell4
-{
-	padding-top: 3px;
-	padding-right: 10px;
-	padding-bottom: 3px;
-	padding-left: 10px;
-	background-color: #FFFFCC;
-}
-
-td.ilc_table_cell_StandardCell1
-,th.ilc_table_cell_StandardCell1
-{
-	background-color: #FFFFFF;
-	border-style: solid;
-	border-color: #4C6586;
-	border-width: 1px;
-	padding-left: 10px;
-	padding-bottom: 3px;
-	font-weight: normal;
-	padding-top: 3px;
-	padding-right: 10px;
-}
-
-td.ilc_table_cell_StandardCell2
-,th.ilc_table_cell_StandardCell2
-{
-	padding-top: 3px;
-	font-weight: normal;
-	background-color: #FFFFFF;
-	border-width: 1px;
-	border-style: solid;
-	border-color: #4C6586;
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-bottom: 3px;
-}
-
-td.ilc_table_cell_StandardHeader
-,th.ilc_table_cell_StandardHeader
-{
-	font-weight: normal;
-	padding-top: 3px;
-	color: #FFFFFF;
-	padding-bottom: 3px;
-	padding-right: 10px;
-	border-width: 1px;
-	border-color: #FFFFFF;
-	padding-left: 10px;
-	border-style: solid;
-	background-color: #4C6586;
-}
-
-td.ilc_table_cell_TransparentC
-,th.ilc_table_cell_TransparentC
-{
-	font-weight: normal;
-	padding-top: 3px;
-	padding-right: 10px;
-	padding-bottom: 3px;
-	padding-left: 10px;
-	border-width: 1px;
-	border-color: #000000;
-	border-style: solid;
-}
-
-td.ilc_table_cell_TransparentH
-,th.ilc_table_cell_TransparentH
-{
-	font-weight: normal;
-	padding-top: 3px;
-	padding-bottom: 3px;
-	padding-right: 10px;
-	padding-left: 10px;
-	border-style: solid;
-	border-width: 1px;
-}
-
-textarea.ilc_qlinput_LongTextInput
-{
-	padding-left: 4px;
-}
-
-ul.ilc_flist_FileList
-{
-	list-style-type: none;
-	padding: 0px;
-	margin: 0px;
-}
-
-ul.ilc_qordul_OrderList
-{
-	padding: 0px;
-	margin: 0px;
-	list-style: none;
-	list-style-position: outside;
-}
-
-ul.ilc_qordul_OrderListHorizontal
-{
-	list-style: none;
-	margin: 0px;
-	padding: 0px;
-	list-style-position: outside;
-}
-
-div.ilc_va_iheada_AccordIHeadActive
-{
-	margin-bottom: 0px;
-	padding-top: 8px;
-	padding-right: 8px;
-	padding-bottom: 8px;
-	padding-left: 38px;
-	border-width: 1px;
-	border-color: #DDDDDD;
-	border-style: solid;
-	background-color: #E2E8EF;
-	background-image: url("@{image_path}arrow_down.svg");
-	background-repeat: no-repeat;
-	background-position: 10px center;
-	cursor: pointer;
-	background-size: 20px 20px;
-	border-top-left-radius: 3px;
-	border-top-right-radius: 3px;
-	border-bottom-right-radius: 0px;
-	border-bottom-left-radius: 0px;
-}
-
-div.ilc_va_iheada_AccordIHeadActive:hover
-{
-	background-position: 10px center;
-}
-
-div.ilc_va_iheada_ColoredAccordIHeadActive:hover
-{
-	background-color: #3d506b;
-	background-image: url("@{image_path}collapse_white.svg");
-	background-position: right center;
-	cursor: pointer;
-	transition: all 0.5s ease-out;
-}
-
-div.ilc_va_iheada_EmphasisedAccordIHeadActive
-{
-	font-size: 1.5em;
-	color: #FFFFFF;
-	padding: 15px;
-	background-color: #3d506b;
-	background-image: url("@{image_path}collapse_white.svg");
-	background-repeat: no-repeat;
-	background-position: right center;
-	border-radius: 0px;
-	transform: scale(1.01);
-	-webkit-transform: scale(1.01);
-	-moz-transform: scale(1.01);
-	-ms-transform: scale(1.01);
-	transition: all 0.5s ease-out;
-}
-
-div.ilc_va_iheada_EmphasisedAccordIHeadActive:hover
-{
-	background-color: #3d506b;
-	background-image: url("@{image_path}collapse_white.svg");
-	background-repeat: no-repeat;
-	background-position: right center;
-	cursor: pointer;
-	transition: all 0.5s ease-out;
-}
-
-div.ilc_va_iheada_LightAccordIHeadActive
-{
-	background-image: url("@{image_path}collapse.svg");
-	background-repeat: no-repeat;
-	border-radius: 0px;
-	transition: all 0.5s ease-out;
-	font-size: 1.5em;
-	color: #4C6586;
-	padding: 10px;
-	border-bottom-style: solid;
-	background-position: right center;
-	border-top-width: 0px;
-	border-right-width: 0px;
-	border-bottom-width: 2px;
-	border-left-width: 0px;
-	border-top-style: none;
-	border-right-style: none;
-	border-left-style: none;
-	background-color: #FFFFFF;
-	border-color: #FFFFFF;
-}
-
-div.ilc_va_iheada_LightAccordIHeadActive:hover
-{
-	background-position: right center;
-	background-color: #FFFFFF;
-	cursor: pointer;
-	border-width: 0px;
-	border-top-width: 0px;
-	border-right-width: 0px;
-	border-bottom-width: 2px;
-	border-left-width: 0px;
-	border-style: none;
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: solid;
-	border-left-style: none;
-	border-color: #FFFFFF;
-	transition: all 0.5s ease-out;
+a.ilc_qetitem_ErrorTextItem {
+  padding: 2px;
+  text-decoration: none;
+}
+a.ilc_qetitem_ErrorTextItem:hover {
+  color: #000000;
+  text-decoration: none;
+  background-color: #D0D0D0;
+}
+a.ilc_qetitem_ErrorTextSelected {
+  border-style: none;
+  background-color: #E2E8EF;
+  color: #161616;
+}
+a.ilc_link_ExtLink {
+  text-decoration: underline;
+}
+a.ilc_link_FileLink {
+  text-decoration: underline;
+}
+a.ilc_link_GlossaryLink {
+  text-decoration: underline;
+}
+a.ilc_glo_ovclink_GlossaryOvCloseLink {
+  text-decoration: underline;
+  font-weight: normal;
+}
+a.ilc_glo_ovuglistlink_GlossaryOvUGListLink {
+  font-weight: normal;
+}
+a.ilc_glo_ovuglink_GlossaryOvUnitGloLink {
+  font-weight: normal;
+}
+a.ilc_qimgd_ImageDetailsLink {
+  font-size: 90%;
+}
+a.ilc_link_IntLink {
+  text-decoration: underline;
+}
+a.ilc_marker_Marker {
+  background-image: url("../basic_style/images/icon_pin.svg");
+  background-repeat: no-repeat;
+  cursor: pointer;
+  display: block;
+  height: 32px;
+  width: 24px;
+  position: absolute;
+}
+a.ilc_marker_Marker:hover {
+  background-repeat: no-repeat;
+  background-image: url("../basic_style/images/icon_pin_on.svg");
+}
+a.ilc_rte_mlink_RTELink {
+  font-size: 100%;
+  margin: 1px;
+  margin-top: 10px;
+  margin-right: 5px;
+  margin-bottom: 10px;
+  margin-left: 5px;
+  padding-right: 3mm;
+  padding-top: 1mm;
+  border-style: none;
+  padding-bottom: 1mm;
+  text-decoration: none;
+  padding-left: 3mm;
+  border-width: 1px;
+  background-color: #4C6586;
+  text-align: center;
+  height: 50px;
+  color: #ffffff !important;
+  text-decoration: none !important;
+}
+a.ilc_rte_mlink_RTELink:hover {
+  background-color: #577399;
+  color: #FFFFFF;
+  text-decoration: none !important;
+}
+a.ilc_rte_texp_RTETreeCollapsed {
+  background-image: url("../basic_style/images/arrow_right.svg");
+  background-repeat: no-repeat;
+  background-position: 0px 0px;
+  background-size: 15px 15px !important;
+}
+a.ilc_rte_tclink_RTETreeControlLink {
+  color: #4C6586;
+  color: #4C6586 !important;
+}
+a.ilc_rte_tlink_RTETreeCurrent {
+  background-color: #FFFF9D;
+  color: #161616 !important;
+  background-color: #E2E8EF !important;
+}
+a.ilc_rte_texp_RTETreeExpanded {
+  background-image: url("../basic_style/images/arrow_down.svg");
+  background-size: 15px 15px;
+}
+a.ilc_rte_tlink_RTETreeLink {
+  color: #4C6586;
+  color: #4C6586 !important;
+}
+div.ilc_va_cntr_AccordCntr {
+  margin-top: 5px;
+}
+div.ilc_va_icntr_AccordICntr {
+  margin-bottom: 5px;
+}
+div.ilc_va_icont_AccordICont {
+  margin-top: -1px;
+  margin-bottom: 12px;
+  padding-top: 3px;
+  padding-right: 3px;
+  padding-bottom: 3px;
+  padding-left: 15px;
+  border-width: 1px;
+  border-color: #DDDDDD;
+  border-style: solid;
+  background-color: #FFFFFF;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+div.ilc_va_ihead_AccordIHead {
+  text-align: left;
+  margin-bottom: 12px;
+  padding-top: 8px;
+  padding-right: 8px;
+  padding-bottom: 8px;
+  padding-left: 38px;
+  border-width: 1px;
+  border-color: #DDDDDD;
+  border-style: solid;
+  background-color: #F9F9F9;
+  background-image: url("../basic_style/images/arrow_right.svg");
+  background-repeat: no-repeat;
+  background-position: 15px center;
+  cursor: pointer;
+  background-size: 20px 20px;
+  border-radius: 3px;
+  font-weight: 600;
+}
+div.ilc_va_ihead_AccordIHead:hover {
+  background-color: #E2E8EF;
+}
+div.ilc_va_ihcap_AccordIHeadCap {
+  font-size: 1em;
+  font-weight: 600;
+}
+div.ilc_section_Additional,
+a.ilc_section_Additional {
+  padding-left: 20px;
+  margin-top: 40px;
+  margin-bottom: 10px;
+  position: relative;
+  border-width: 2px;
+  border-color: #4C6586;
+  border-style: solid;
+  padding-top: 35px;
+  padding-right: 30px;
+  padding-bottom: 15px;
+  border-radius: 3px;
+  position: relative !important;
+  background-position: left top;
+}
+div.ilc_section_Additional::before,
+a.ilc_section_Additional::before {
+  border-width: 2px;
+  border-color: #FFFFFF;
+  border-style: solid;
+  background-color: #eceff4;
+  background-position: center center;
+  left: 15px;
+  background-image: url("../basic_style/images/additional.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  width: 60px;
+  height: 60px;
+  top: -32px;
+  right: 0px;
+  content: "";
+  display: block;
+  border-radius: 50px;
+}
+div.ilc_section_AdvancedKnowledge,
+a.ilc_section_AdvancedKnowledge {
+  position: relative;
+  border-width: 2px;
+  border-color: #4C6586;
+  border-style: solid;
+  padding-left: 20px;
+  padding-right: 30px;
+  padding-top: 35px;
+  padding-bottom: 15px;
+  margin-top: 40px;
+  margin-bottom: 10px;
+  background-position: left top;
+  border-radius: 3px;
+  position: relative !important;
+}
+div.ilc_section_AdvancedKnowledge::before,
+a.ilc_section_AdvancedKnowledge::before {
+  border-width: 2px;
+  border-color: #FFFFFF;
+  border-style: solid;
+  background-color: #eceff4;
+  background-position: center center;
+  left: 15px;
+  background-image: url("../basic_style/images/advknowledge.svg");
+  position: absolute;
+  top: -32px;
+  right: 0px;
+  content: "";
+  width: 60px;
+  display: block;
+  height: 60px;
+  border-radius: 50px;
+  background-repeat: no-repeat;
+}
+div.ilc_qanswer_Answer {
+  padding-right: 10px;
+  border-radius: 5px;
+}
+div.ilc_section_Attention,
+a.ilc_section_Attention {
+  position: relative;
+  border-width: 2px;
+  border-color: #FA8228;
+  border-style: solid;
+  border-radius: 3px;
+  position: relative !important;
+  padding-left: 20px;
+  padding-bottom: 15px;
+  padding-right: 30px;
+  padding-top: 35px;
+  margin-bottom: 10px;
+  margin-top: 40px;
+}
+div.ilc_section_Attention::before,
+a.ilc_section_Attention::before {
+  border-width: 2px;
+  border-color: #FFFFFF;
+  border-style: solid;
+  background-color: #fee6d4;
+  background-position: center 12px;
+  left: 15px;
+  content: "";
+  display: block;
+  border-radius: 50px;
+  background-image: url("../basic_style/images/attention.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  top: -32px;
+  width: 60px;
+  height: 60px;
+}
+div.ilc_section_Background,
+a.ilc_section_Background {
+  background-color: #F9F9F9;
+  padding-top: 10px;
+  margin-bottom: 20px;
+  padding-right: 20px;
+  padding-bottom: 10px;
+  padding-left: 20px;
+}
+div.ilc_section_Block,
+a.ilc_section_Block {
+  padding-bottom: 10px;
+  padding-right: 20px;
+  margin-bottom: 10px;
+  padding-top: 10px;
+  margin-top: 20px;
+  padding-left: 20px;
+}
+div.ilc_section_Card,
+a.ilc_section_Card {
+  min-height: 250px;
+  position: relative;
+  margin: 15px;
+  padding-top: 15px;
+  padding-right: 15px;
+  padding-bottom: 15px;
+  padding-left: 15px;
+  box-shadow: 5px 5px 40px rgba(0, 0, 0, 0.2);
+  border-radius: 15px;
+  max-width: 400px;
+}
+div.ilc_section_Citation,
+a.ilc_section_Citation {
+  padding-right: 30px;
+  padding-top: 35px;
+  margin-bottom: 10px;
+  margin-top: 40px;
+  position: relative;
+  border-width: 2px;
+  border-color: #4C6586;
+  border-style: solid;
+  background-color: #FFFFFF;
+  border-radius: 3px;
+  position: relative !important;
+  padding-left: 20px;
+  padding-bottom: 15px;
+}
+div.ilc_section_Citation::before,
+a.ilc_section_Citation::before {
+  background-color: #eceff4;
+  left: 15px;
+  background-position: center center;
+  border-width: 2px;
+  border-color: #FFFFFF;
+  border-style: solid;
+  content: "";
+  display: block;
+  border-radius: 50px;
+  background-image: url("../basic_style/images/citation.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  top: -32px;
+  width: 60px;
+  height: 60px;
+}
+div.ilc_va_ihead_ColoredAccordIHead:hover {
+  background-color: #3d506b;
+  cursor: pointer;
+  transition: all 0.5s ease-out;
+}
+div.ilc_section_Confirmation,
+a.ilc_section_Confirmation {
+  position: relative;
+  border-width: 2px;
+  border-color: #6EA03C;
+  border-style: solid;
+  border-radius: 3px;
+  position: relative !important;
+  margin-top: 40px;
+  margin-bottom: 10px;
+  padding-top: 35px;
+  padding-bottom: 15px;
+  padding-right: 30px;
+  padding-left: 20px;
+}
+div.ilc_section_Confirmation::before,
+a.ilc_section_Confirmation::before {
+  border-width: 2px;
+  border-color: #FFFFFF;
+  border-style: solid;
+  background-position: center center;
+  left: 15px;
+  background-color: #e9f3df;
+  content: "";
+  display: block;
+  border-radius: 50px;
+  background-image: url("../basic_style/images/confirmation.svg");
+  position: absolute;
+  top: -32px;
+  width: 60px;
+  height: 60px;
+  background-repeat: no-repeat;
+}
+div.ilc_iim_ContentPopup {
+  padding-left: 10px;
+  padding-bottom: 5px;
+  padding-right: 10px;
+  padding-top: 5px;
+  border-style: solid;
+  border-width: 1px;
+  background-color: #FFFFFF;
+  border-color: #d8d8d8;
+}
+div.ilc_qover_Correct {
+  padding-top: 20px;
+  padding-right: 20px;
+  background-image: url("../basic_style/images/correct.svg");
+  padding-bottom: 20px;
+  padding-left: 60px;
+  background-position: 10px;
+  background-repeat: no-repeat;
+  border-style: none;
+  background-color: #f0f7ea;
+  margin-bottom: 10px;
+  border-radius: 3px;
+  margin-top: 10px;
+}
+div.ilc_va_cntr_EmphasisedAccordCntr {
+  padding-top: 5px;
+  padding-right: 15px;
+  padding-left: 15px;
+}
+div.ilc_va_icont_EmphasisedAccordICont {
+  padding: 15px;
+  background-color: #eceff4;
+  transform: scale(1.01);
+  -webkit-transform: scale(1.01);
+  -moz-transform: scale(1.01);
+  -ms-transform: scale(1.01);
+  transition: all 0.5s ease-out;
+}
+div.ilc_va_ihead_EmphasisedAccordIHead {
+  font-size: 1.5em;
+  color: #FFFFFF;
+  padding: 15px;
+  background-color: #4C6586;
+  background-image: url("../basic_style/images/expand_white.svg");
+  background-repeat: no-repeat;
+  background-position: right center;
+  transition: all 0.5s ease-out;
+}
+div.ilc_va_ihead_EmphasisedAccordIHead:hover {
+  background-color: #3d506b;
+  transition: all 0.5s ease-out;
+}
+div.ilc_section_Example,
+a.ilc_section_Example {
+  padding-right: 30px;
+  padding-bottom: 15px;
+  padding-left: 20px;
+  background-position: left center;
+  margin-bottom: 10px;
+  margin-top: 40px;
+  position: relative;
+  border-width: 2px;
+  border-color: #4C6586;
+  border-style: solid;
+  border-radius: 3px;
+  position: relative !important;
+  padding-top: 35px;
+}
+div.ilc_section_Example::before,
+a.ilc_section_Example::before {
+  background-color: #eceff4;
+  background-position: center center;
+  left: 15px;
+  background-image: url("../basic_style/images/example.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  top: -32px;
+  width: 60px;
+  height: 60px;
+  border-width: 2px;
+  border-color: #FFFFFF;
+  border-style: solid;
+  right: 0px;
+  content: "";
+  display: block;
+  border-radius: 50px;
+}
+div.ilc_section_Excursus,
+a.ilc_section_Excursus {
+  padding-right: 30px;
+  margin-bottom: 10px;
+  margin-top: 40px;
+  border-style: solid;
+  border-width: 2px;
+  position: relative;
+  padding-top: 35px;
+  border-color: #4C6586;
+  padding-left: 20px;
+  border-radius: 3px;
+  position: relative !important;
+  padding-bottom: 15px;
+}
+div.ilc_section_Excursus::before,
+a.ilc_section_Excursus::before {
+  border-width: 2px;
+  border-color: #FFFFFF;
+  border-style: solid;
+  background-color: #eceff4;
+  background-position: center center;
+  left: 15px;
+  content: "";
+  display: block;
+  border-radius: 50px;
+  background-image: url("../basic_style/images/excursus.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  top: -32px;
+  width: 60px;
+  height: 60px;
+}
+div.ilc_qfeedr_FeedbackRight {
+  margin-top: 10px;
+  padding-top: 20px;
+  margin-bottom: 10px;
+  border-style: none;
+  background-color: #f0f7ea;
+  padding-left: 60px;
+  padding-bottom: 20px;
+  padding-right: 160px;
+  background-image: url("../basic_style/images/correct.svg");
+  background-position: 10px;
+  background-repeat: no-repeat;
+  border-radius: 3px;
+}
+div.ilc_qfeedw_FeedbackWrong {
+  padding-left: 60px;
+  padding-bottom: 20px;
+  background-position: 24px;
+  padding-right: 160px;
+  background-image: url("../basic_style/images/exclamation.svg");
+  margin-top: 10px;
+  background-repeat: no-repeat;
+  padding-top: 20px;
+  margin-bottom: 10px;
+  border-style: none;
+  background-color: #fef2ea;
+  border-radius: 3px;
+}
+div.ilc_flist_cont_FileListContainer {
+  border-radius: 3px;
+  color: #FFFFFF;
+  margin-top: 10px;
+  margin-right: 0px;
+  margin-bottom: 10px;
+  margin-left: 0px;
+  border-color: #4C6586;
+  border-style: solid;
+  border-width: 1px;
+  text-indent: 7px;
+  padding-bottom: 10px;
+}
+div.ilc_flist_head_FileListHeading {
+  margin-bottom: 10px;
+  text-align: left;
+  color: #FFFFFF;
+  font-weight: bold;
+  background-image: url("../basic_style/images/download.svg");
+  background-color: #4C6586;
+  margin-top: 0px;
+  background-position: 10px;
+  background-repeat: no-repeat;
+  padding-left: 50px;
+  padding-bottom: 10px;
+  padding-right: 20px;
+  padding-top: 10px;
+}
+div.ilc_sco_fmess_FinalMessage {
+  margin: 100px;
+  text-align: center;
+  border-style: none;
+  border-width: 1px;
+  padding: 50px;
+  font-size: 125%;
+}
+div.ilc_page_fn_Footnote {
+  margin-bottom: 5px;
+  margin-top: 5px;
+}
+div.ilc_glo_overlay_GlossaryOverlay {
+  border-style: none;
+  padding-top: 5px;
+  border-width: 2px;
+  padding-left: 10px;
+  padding-bottom: 5px;
+  padding-right: 10px;
+}
+div.ilc_ha_ihead_HAccordIHead:hover {
+  background-color: #E2E8EF;
+}
+div.ilc_qover_Incorrect {
+  padding-left: 60px;
+  background-image: url("../basic_style/images/exclamation.svg");
+  background-repeat: no-repeat;
+  background-position: 24px;
+  padding-bottom: 20px;
+  padding-right: 20px;
+  margin-bottom: 10px;
+  margin-top: 10px;
+  background-color: #fef2ea;
+  border-style: none;
+  padding-top: 20px;
+  border-radius: 3px;
+}
+div.ilc_section_Information,
+a.ilc_section_Information {
+  margin-bottom: 10px;
+  margin-top: 40px;
+  position: relative;
+  border-width: 2px;
+  border-color: #4C6586;
+  border-style: solid;
+  border-radius: 3px;
+  position: relative !important;
+  padding-left: 20px;
+  padding-bottom: 15px;
+  padding-right: 30px;
+  padding-top: 35px;
+}
+div.ilc_section_Information::before,
+a.ilc_section_Information::before {
+  background-color: #eceff4;
+  background-position: center center;
+  left: 15px;
+  border-width: 2px;
+  border-color: #FFFFFF;
+  border-style: solid;
+  background-image: url("../basic_style/images/information.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  top: -32px;
+  width: 60px;
+  height: 60px;
+  content: "";
+  display: block;
+  border-radius: 50px;
+}
+div.ilc_section_Interaction,
+a.ilc_section_Interaction {
+  margin-top: 10px;
+  padding-top: 20px;
+  margin-bottom: 10px;
+  padding-right: 20px;
+  padding-bottom: 20px;
+  background-image: url("../basic_style/images/interaction.svg");
+  padding-left: 60px;
+  background-position: 12px;
+  background-repeat: no-repeat;
+  border-width: 1px;
+  border-color: #4C6586;
+  border-style: solid;
+  border-radius: 3px;
+}
+div.ilc_section_Interaction:hover,
+a.ilc_section_Interaction:hover {
+  cursor: pointer;
+  background-color: #E2E8EF;
+}
+div.ilc_va_icont_LightAccordICont {
+  padding: 10px;
+  border-width: 4px;
+  border-color: #4C6586;
+  border-bottom-style: solid;
+}
+div.ilc_va_ihead_LightAccordIHead {
+  color: #4C6586;
+  padding: 10px;
+  border-width: 2px;
+  border-color: #4C6586;
+  border-bottom-style: solid;
+  background-image: url("../basic_style/images/expand.svg");
+  background-position: right center;
+  background-repeat: no-repeat;
+  font-size: 1.5em;
+  background-color: #FFFFFF;
+  transition: background-image 2s ease-in-out;
+}
+div.ilc_va_ihead_LightAccordIHead:hover {
+  cursor: pointer;
+  border-width: 4px;
+  border-color: #4C6586;
+  border-bottom-style: solid;
+  transition: all 0.5s ease-out;
+}
+div.ilc_section_Link,
+a.ilc_section_Link {
+  text-decoration: underline;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  padding-top: 20px;
+  padding-right: 20px;
+  padding-bottom: 20px;
+  padding-left: 60px;
+  border-width: 1px;
+  border-color: #4C6586;
+  border-style: dashed;
+  background-image: url("../basic_style/images/link.svg");
+  background-repeat: no-repeat;
+  background-position: 10px;
+  border-radius: 3px;
+}
+div.ilc_section_Literature,
+a.ilc_section_Literature {
+  margin-top: 40px;
+  margin-bottom: 10px;
+  padding-top: 35px;
+  padding-right: 30px;
+  padding-bottom: 15px;
+  padding-left: 20px;
+  position: relative;
+  border-width: 2px;
+  border-color: #4C6586;
+  border-style: solid;
+  border-radius: 3px;
+  position: relative !important;
+}
+div.ilc_section_Literature::before,
+a.ilc_section_Literature::before {
+  border-width: 2px;
+  border-color: #FFFFFF;
+  border-style: solid;
+  background-color: #eceff4;
+  background-position: center center;
+  left: 15px;
+  content: "";
+  display: block;
+  border-radius: 50px;
+  background-image: url("../basic_style/images/literature.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  top: -32px;
+  width: 60px;
+  height: 60px;
+}
+div.ilc_media_caption_MediaCaption {
+  font-weight: bolder;
+  font-size: 100%;
+  padding: 10px;
+  background-color: #F9F9F9;
+}
+div.ilc_section_Mnemonic,
+a.ilc_section_Mnemonic {
+  padding-right: 30px;
+  padding-bottom: 15px;
+  padding-left: 20px;
+  background-position: left center;
+  border-style: solid;
+  padding-top: 35px;
+  position: relative;
+  border-width: 2px;
+  border-color: #F3DE2C;
+  border-radius: 3px;
+  position: relative !important;
+  margin-top: 40px;
+  margin-bottom: 10px;
+}
+div.ilc_section_Mnemonic::before,
+a.ilc_section_Mnemonic::before {
+  border-width: 2px;
+  border-color: #FFFFFF;
+  background-color: #fdfadf;
+  background-position: center center;
+  left: 15px;
+  border-style: solid;
+  content: "";
+  display: block;
+  border-radius: 50px;
+  background-image: url("../basic_style/images/mnemonic.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  top: -32px;
+  width: 60px;
+  height: 60px;
+}
+div.ilc_page_Page {
+  min-height: 300px;
+}
+div.ilc_page_cont_PageContainer {
+  border-width: 1px;
+  border-color: #DDDDDD;
+  padding: 20px;
+  margin: 0px;
+  border-style: solid;
+  background-color: #FFFFFF;
+  min-height: 500px;
+}
+div.ilc_section_Remark,
+a.ilc_section_Remark {
+  border-style: solid;
+  border-width: 2px;
+  position: relative;
+  border-color: #4C6586;
+  border-radius: 3px;
+  position: relative !important;
+  padding-right: 30px;
+  padding-top: 35px;
+  padding-left: 20px;
+  padding-bottom: 15px;
+  margin-top: 40px;
+  margin-bottom: 10px;
+}
+div.ilc_section_Remark::before,
+a.ilc_section_Remark::before {
+  border-width: 2px;
+  border-color: #FFFFFF;
+  background-image: url("../basic_style/images/remark.svg");
+  border-style: solid;
+  background-repeat: no-repeat;
+  background-color: #eceff4;
+  position: absolute;
+  background-position: center center;
+  top: -32px;
+  left: 15px;
+  width: 60px;
+  content: "";
+  height: 60px;
+  display: block;
+  border-radius: 50px;
+}
+div.ilc_rte_menu_RTELinkBar {
+  border-top-width: 10px;
+  border-bottom-width: 10px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+div.ilc_rte_menu_RTELogo {
+  float: left;
+}
+div.ilc_rte_menu_RTEMenu {
+  background-color: #FFFFFF;
+}
+div.ilc_section_Separator,
+a.ilc_section_Separator {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  padding-top: 20px;
+  border-width: 2px;
+  padding-bottom: 20px;
+  border-color: #4C6586;
+  border-top-style: solid;
+}
+div.ilc_section_Special,
+a.ilc_section_Special {
+  padding-left: 20px;
+  border-style: none;
+  border-width: 1px;
+  padding-bottom: 20px;
+  padding-top: 20px;
+  padding-right: 20px;
+}
+div.ilc_question_Standard {
+  padding-left: 30px;
+  padding-bottom: 60px;
+  box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1), 0 6px 15px rgba(0, 0, 0, 0.12);
+  background-position: right top;
+  margin-top: 20px;
+  margin-bottom: 10px;
+  padding-top: 30px;
+  padding-right: 30px;
+}
+div.ilc_qover_StatusMessage {
+  padding-bottom: 7px;
+}
+div.ilc_qtitle_Title {
+  margin-bottom: 20px;
+  font-size: 140%;
+  font-weight: normal;
+}
+div.ilc_sco_title_Title {
+  border-bottom-style: solid;
+  border-bottom-width: 2px;
+  padding-bottom: 3px;
+  font-size: 140%;
+  margin-bottom: 20px;
+  font-weight: bold;
+  margin-top: 5px;
+}
+em.ilc_em_Emph,
+span.ilc_text_inline_Emph {
+  font-style: italic;
+}
+figure.ilc_media_cont_MediaContainer {
+  margin: 0px;
+}
+figure.ilc_media_cont_MediaContainerFull100 {
+  margin: 0px;
+  width: 100%;
+  box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1), 0 6px 15px rgba(0, 0, 0, 0.12);
+}
+figure.ilc_media_cont_MediaContainerHighlighted {
+  margin: 0px;
+  box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1), 0 6px 15px rgba(0, 0, 0, 0.12);
+}
+figure.ilc_media_cont_MediaContainerMax50 {
+  margin: 0px;
+  box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1), 0 6px 15px rgba(0, 0, 0, 0.12);
+  max-width: 50%;
+}
+figure.ilc_media_cont_MediaContainerSeparated {
+  margin: 40px;
+}
+h1.ilc_glo_ovtitle_GlossaryOvTitle,
+div.ilc_text_block_GlossaryOvTitle,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_GlossaryOvTitle p {
+  margin-bottom: 10px;
+  font-size: 1.5em;
+  margin-top: 10px;
+  font-weight: 600;
+}
+h1.ilc_heading1_Headline1,
+div.ilc_text_block_Headline1,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_Headline1 p {
+  padding-top: 10px;
+  margin-bottom: 15px;
+  margin-top: 20px;
+  font-size: 1.75em;
+  font-weight: 600;
+}
+h1.ilc_page_title_PageTitle,
+div.ilc_text_block_PageTitle,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_PageTitle p {
+  font-weight: 600;
+  border-bottom-width: 1px;
+  border-bottom-style: none;
+  border-style: none;
+  font-size: 1.75rem;
+  padding-bottom: 3px;
+  margin-top: 15px;
+  margin-bottom: 15px;
+  text-align: left;
+  white-space: normal;
+}
+h2.ilc_heading2_Headline2,
+div.ilc_text_block_Headline2,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_Headline2 p {
+  font-weight: 600;
+  font-size: 1.5em;
+  margin-top: 20px;
+  margin-bottom: 15px;
+}
+h3.ilc_heading3_Headline3,
+div.ilc_text_block_Headline3,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_Headline3 p {
+  font-weight: 600;
+  margin-top: 15px;
+  margin-bottom: 10px;
+  font-size: 1.115em;
+}
+img.ilc_qimg_QuestionImage {
+  margin: 10px;
+  box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1), 0 6px 15px rgba(0, 0, 0, 0.12);
+}
+input.ilc_qsubmit_Submit {
+  border-style: none;
+  color: #ffffff !important;
+  padding: 0.5em;
+  margin-top: 20px;
+  background-color: #4C6586;
+}
+input.ilc_qsubmit_Submit:hover {
+  cursor: pointer;
+  background-color: #314157;
+}
+input.ilc_qinput_TextInput {
+  padding-left: 4px;
+}
+li.ilc_list_item_Attention {
+  margin-bottom: 15px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-left: 45px;
+  position: relative;
+  list-style-type: none;
+}
+li.ilc_list_item_Attention::before {
+  background-image: url("../basic_style/images/attention_red.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  width: 35px;
+  height: 35px;
+  left: 0;
+  top: 0;
+  content: "";
+}
+li.ilc_list_item_Checklist {
+  list-style-type: none;
+  margin-bottom: 15px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-left: 45px;
+  position: relative;
+}
+li.ilc_list_item_Checklist2::before {
+  background-image: url("../basic_style/images/wrong.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  width: 35px;
+  height: 35px;
+  left: 0;
+  top: 0;
+  content: "";
+}
+li.ilc_list_item_Checklist::before {
+  content: "";
+  background-image: url("../basic_style/images/checked.svg");
+  background-repeat: no-repeat;
+  width: 35px;
+  height: 35px;
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+li.ilc_list_item_ColoredCircle::before {
+  font-weight: bold;
+  color: #FFFFFF;
+  background-color: #59A0A5;
+  position: absolute;
+  width: 35px;
+  height: 35px;
+  content: counter(section);
+  border-radius: 50px;
+  left: 0;
+  display: grid;
+  justify-content: center;
+  align-items: center;
+  top: 0;
+}
+li.ilc_list_item_ColoredCircleBackground::before {
+  font-size: 1.5rem;
+  font-weight: bold;
+  color: #FFFFFF;
+  margin-left: 10px;
+  background-color: #4C6586;
+  position: absolute;
+  width: 50px;
+  height: 50px;
+  content: counter(section);
+  border-radius: 50px;
+  left: 0;
+  top: 13px;
+  display: grid;
+  align-items: center;
+  justify-content: center;
+}
+li.ilc_list_item_ColoredSquare::before {
+  font-weight: bold;
+  color: #FFFFFF;
+  background-color: #F3DE2C;
+  position: absolute;
+  width: 35px;
+  height: 35px;
+  content: counter(section);
+  border-radius: 6px;
+  left: 0;
+  display: grid;
+  justify-content: center;
+  align-items: center;
+  top: 0;
+}
+li.ilc_list_item_ColoredSquareBackground::before {
+  font-weight: bold;
+  color: #FFFFFF;
+  background-color: #F3DE2C;
+  position: absolute;
+  width: 35px;
+  height: 100%;
+  text-align: center;
+  content: counter(section);
+  left: 0;
+  top: 0;
+  display: grid;
+  justify-content: center;
+  align-items: center;
+}
+li.ilc_flist_li_FileListItem {
+  padding-left: 3px;
+  padding-right: 3px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+li.ilc_list_item_FilledCircle {
+  margin-bottom: 15px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-left: 45px;
+  position: relative;
+  list-style-type: none;
+  counter-increment: section 1;
+}
+li.ilc_list_item_FilledCircle::before {
+  font-weight: bold;
+  color: #FFFFFF;
+  background-color: #59A0A5;
+  position: absolute;
+  height: 35px;
+  min-width: 35px;
+  content: counter(section);
+  border-radius: 50px;
+  left: 0;
+  display: grid;
+  justify-content: center;
+  align-items: center;
+  top: 0;
+}
+li.ilc_list_item_FilledCircleLarge {
+  font-size: 1.5rem;
+  position: relative;
+  padding-top: 20px;
+  padding-right: 20px;
+  padding-bottom: 20px;
+  padding-left: 70px;
+  list-style-type: none;
+  counter-increment: section 1;
+}
+li.ilc_list_item_FilledCircleLarge::before {
+  font-weight: bold;
+  color: #FFFFFF;
+  margin-left: 10px;
+  position: absolute;
+  height: 50px;
+  background-color: #4C6586;
+  content: counter(section);
+  min-width: 50px;
+  border-radius: 50px;
+  left: 0;
+  top: 13px;
+  display: grid;
+  align-items: center;
+  justify-content: center;
+}
+li.ilc_list_item_FilledSquare {
+  margin-bottom: 15px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-left: 45px;
+  position: relative;
+  list-style-type: none;
+  counter-increment: section 1;
+}
+li.ilc_list_item_FilledSquare::before {
+  font-weight: bold;
+  color: #FFFFFF;
+  background-color: #F3DE2C;
+  position: absolute;
+  height: 35px;
+  content: counter(section);
+  min-width: 35px;
+  border-radius: 6px;
+  left: 0;
+  display: grid;
+  justify-content: center;
+  align-items: center;
+  top: 0;
+}
+li.ilc_list_item_FilledSquareBackground {
+  margin-top: -2px;
+  padding-top: 15px;
+  padding-bottom: 15px;
+  padding-left: 50px;
+  border-width: 2px;
+  border-color: #FFFFFF;
+  border-style: solid;
+  background-color: #fdfadf;
+  list-style-type: none;
+  counter-increment: section 1;
+  position: relative;
+}
+li.ilc_list_item_FilledSquareBackground::before {
+  background-color: #F3DE2C;
+  font-weight: bold;
+  color: #FFFFFF;
+  min-width: 35px;
+  display: grid;
+  justify-content: center;
+  align-items: center;
+  content: counter(section);
+  left: 0;
+  top: 0;
+  position: absolute;
+  height: 100%;
+}
+li.ilc_list_item_ListItem2::before {
+  width: 35px;
+  height: 35px;
+  color: #FFFFFF;
+  background-color: #59A0A5;
+  font-weight: bold;
+  margin-right: 10px;
+  content: counter(section);
+  display: inline-flex;
+  border-radius: 50px;
+  justify-content: center;
+  align-items: center;
+}
+li.ilc_list_item_ListItem2Absolut::before {
+  font-weight: bold;
+  color: #FFFFFF;
+  background-color: #59A0A5;
+  width: 35px;
+  height: 35px;
+  position: absolute;
+  content: counter(section);
+  border-radius: 50px;
+  left: 0;
+  display: grid;
+  justify-content: center;
+  align-items: center;
+}
+li.ilc_list_item_ListItem2Grid::before {
+  font-weight: bold;
+  color: #FFFFFF;
+  background-color: #59A0A5;
+  width: 35px;
+  height: 35px;
+  content: counter(section);
+  border-radius: 50px;
+  display: inline-grid;
+  justify-content: center;
+  align-items: center;
+}
+li.ilc_list_item_ListItem3::before {
+  background-image: url("../basic_style/images/checked.svg");
+  background-repeat: no-repeat;
+  width: 35px;
+  height: 35px;
+  margin-right: 5px;
+  display: inline-flex;
+  content: "";
+}
+li.ilc_list_item_ListItem4::before {
+  background-image: url("../basic_style/images/wrong.svg");
+  background-repeat: no-repeat;
+  width: 35px;
+  height: 35px;
+  margin-right: 5px;
+  display: inline-flex;
+  content: "";
+}
+li.ilc_list_item_ListItem::before {
+  font-size: 1.5rem;
+  font-weight: bold;
+  color: #FFFFFF;
+  background-color: #4C6586;
+  width: 50px;
+  height: 50px;
+  vertical-align: middle;
+  margin-left: 10px;
+  position: absolute;
+  content: counter(section);
+  display: grid;
+  border-radius: 50px;
+  align-items: center;
+  justify-content: center;
+  left: 0;
+  top: 13px;
+}
+li.ilc_qordli_OrderListItem {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-left: 0px;
+  margin-right: 0px;
+  cursor: move;
+  padding: 10px;
+  background-color: #E2E8EF;
+}
+li.ilc_qordli_OrderListItemHorizontal {
+  float: left;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-right: 10px;
+  padding: 10px;
+  cursor: move;
+  background-color: #E2E8EF;
+}
+li.ilc_list_item_Pointer {
+  margin-bottom: 15px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-left: 45px;
+  position: relative;
+  list-style-type: none;
+}
+li.ilc_list_item_Pointer::before {
+  background-image: url("../basic_style/images/pointer.svg");
+  background-repeat: no-repeat;
+  position: absolute;
+  width: 35px;
+  height: 35px;
+  left: 0;
+  top: 0;
+  content: "";
+}
+ol.ilc_list_o_NumberedListNoStyle {
+  list-style-type: none;
+  margin-top: 15px;
+  padding-top: 20px;
+  padding-bottom: 20px;
+  counter-reset: section;
+}
+p.ilc_text_block_Book,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_Book p {
+  hyphens: auto;
+  text-align: justify;
+}
+p.ilc_text_block_Button:hover,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_Button:hover p {
+  background-color: #5774A0;
+}
+p.ilc_text_block_List,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_List p {
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+p.ilc_text_block_Numbers,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_Numbers p {
+  text-align: right;
+}
+p.ilc_text_block_Standard,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_Standard p {
+  margin-bottom: 10px;
+  margin-top: 10px;
+}
+p.ilc_text_block_StandardLarge,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_StandardLarge p {
+  font-size: 1.115rem;
+}
+p.ilc_text_block_TableContent,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_TableContent p {
+  line-height: 1.8em;
+  padding-bottom: 10px;
+  padding-top: 10px;
+  padding-left: 10px;
+  padding-right: 10px;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-right: 0px;
+  margin-left: 0px;
+}
+p.ilc_text_block_Verse,
+html.il-no-tiny-bg body#tinymce.ilc_text_block_Verse p {
+  text-align: center;
+}
+pre.ilc_code_block_Code {
+  border-width: 1px;
+  border-color: #DDDDDD;
+  border-style: solid;
+  padding: 9px;
+  background-color: #F9F9F9;
+}
+span.ilc_text_inline_Accent {
+  color: #087e0a;
+}
+span.ilc_text_inline_Attention {
+  color: #CB4D16;
+}
+span.ilc_text_inline_Comment {
+  color: #b31bff;
+}
+span.ilc_qetcorr_ErrorTextCorrected {
+  text-decoration: line-through;
+}
+span.ilc_text_inline_Important {
+  text-decoration: underline;
+}
+span.ilc_text_inline_Mnemonic {
+  background-color: #fcf7ca;
+  padding-left: 4px;
+  padding-right: 4px;
+}
+span.ilc_text_inline_Quotation {
+  letter-spacing: 0.2px;
+  font-style: italic;
+  font-family: serif;
+  color: #1B5FFF;
+  font-size: 114%;
+}
+strong.ilc_strong_Strong,
+span.ilc_text_inline_Strong {
+  font-weight: bold;
+}
+table.ilc_table_StandardTable {
+  border-collapse: collapse;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  border-color: #9EADBA;
+}
+td.ilc_table_cell_Cell1,
+th.ilc_table_cell_Cell1 {
+  padding-top: 3px;
+  padding-right: 10px;
+  padding-bottom: 3px;
+  padding-left: 10px;
+  background-color: #FFCCCC;
+}
+td.ilc_table_cell_Cell2,
+th.ilc_table_cell_Cell2 {
+  background-color: #CCCCFF;
+  padding-top: 3px;
+  padding-right: 10px;
+  padding-bottom: 3px;
+  padding-left: 10px;
+}
+td.ilc_table_cell_Cell3,
+th.ilc_table_cell_Cell3 {
+  padding-left: 10px;
+  padding-bottom: 3px;
+  padding-right: 10px;
+  padding-top: 3px;
+  background-color: #CCFFCC;
+}
+td.ilc_table_cell_Cell4,
+th.ilc_table_cell_Cell4 {
+  padding-top: 3px;
+  padding-right: 10px;
+  padding-bottom: 3px;
+  padding-left: 10px;
+  background-color: #FFFFCC;
+}
+td.ilc_table_cell_StandardCell1,
+th.ilc_table_cell_StandardCell1 {
+  background-color: #FFFFFF;
+  border-style: solid;
+  border-color: #4C6586;
+  border-width: 1px;
+  padding-left: 10px;
+  padding-bottom: 3px;
+  font-weight: normal;
+  padding-top: 3px;
+  padding-right: 10px;
+}
+td.ilc_table_cell_StandardCell2,
+th.ilc_table_cell_StandardCell2 {
+  padding-top: 3px;
+  font-weight: normal;
+  background-color: #FFFFFF;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #4C6586;
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-bottom: 3px;
+}
+td.ilc_table_cell_StandardHeader,
+th.ilc_table_cell_StandardHeader {
+  font-weight: normal;
+  padding-top: 3px;
+  color: #FFFFFF;
+  padding-bottom: 3px;
+  padding-right: 10px;
+  border-width: 1px;
+  border-color: #FFFFFF;
+  padding-left: 10px;
+  border-style: solid;
+  background-color: #4C6586;
+}
+td.ilc_table_cell_TransparentC,
+th.ilc_table_cell_TransparentC {
+  font-weight: normal;
+  padding-top: 3px;
+  padding-right: 10px;
+  padding-bottom: 3px;
+  padding-left: 10px;
+  border-width: 1px;
+  border-color: #000000;
+  border-style: solid;
+}
+td.ilc_table_cell_TransparentH,
+th.ilc_table_cell_TransparentH {
+  font-weight: normal;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-right: 10px;
+  padding-left: 10px;
+  border-style: solid;
+  border-width: 1px;
+}
+textarea.ilc_qlinput_LongTextInput {
+  padding-left: 4px;
+}
+ul.ilc_flist_FileList {
+  list-style-type: none;
+  padding: 0px;
+  margin: 0px;
+}
+ul.ilc_qordul_OrderList {
+  padding: 0px;
+  margin: 0px;
+  list-style: none;
+  list-style-position: outside;
+}
+ul.ilc_qordul_OrderListHorizontal {
+  list-style: none;
+  margin: 0px;
+  padding: 0px;
+  list-style-position: outside;
+}
+div.ilc_va_iheada_AccordIHeadActive {
+  margin-bottom: 0px;
+  padding-top: 8px;
+  padding-right: 8px;
+  padding-bottom: 8px;
+  padding-left: 38px;
+  border-width: 1px;
+  border-color: #DDDDDD;
+  border-style: solid;
+  background-color: #E2E8EF;
+  background-image: url("../basic_style/images/arrow_down.svg");
+  background-repeat: no-repeat;
+  background-position: 10px center;
+  cursor: pointer;
+  background-size: 20px 20px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+div.ilc_va_iheada_AccordIHeadActive:hover {
+  background-position: 10px center;
+}
+div.ilc_va_iheada_ColoredAccordIHeadActive:hover {
+  background-color: #3d506b;
+  background-image: url("../basic_style/images/collapse_white.svg");
+  background-position: right center;
+  cursor: pointer;
+  transition: all 0.5s ease-out;
+}
+div.ilc_va_iheada_EmphasisedAccordIHeadActive {
+  font-size: 1.5em;
+  color: #FFFFFF;
+  padding: 15px;
+  background-color: #3d506b;
+  background-image: url("../basic_style/images/collapse_white.svg");
+  background-repeat: no-repeat;
+  background-position: right center;
+  border-radius: 0px;
+  transform: scale(1.01);
+  -webkit-transform: scale(1.01);
+  -moz-transform: scale(1.01);
+  -ms-transform: scale(1.01);
+  transition: all 0.5s ease-out;
+}
+div.ilc_va_iheada_EmphasisedAccordIHeadActive:hover {
+  background-color: #3d506b;
+  background-image: url("../basic_style/images/collapse_white.svg");
+  background-repeat: no-repeat;
+  background-position: right center;
+  cursor: pointer;
+  transition: all 0.5s ease-out;
+}
+div.ilc_va_iheada_LightAccordIHeadActive {
+  background-image: url("../basic_style/images/collapse.svg");
+  background-repeat: no-repeat;
+  border-radius: 0px;
+  transition: all 0.5s ease-out;
+  font-size: 1.5em;
+  color: #4C6586;
+  padding: 10px;
+  border-bottom-style: solid;
+  background-position: right center;
+  border-top-width: 0px;
+  border-right-width: 0px;
+  border-bottom-width: 2px;
+  border-left-width: 0px;
+  border-top-style: none;
+  border-right-style: none;
+  border-left-style: none;
+  background-color: #FFFFFF;
+  border-color: #FFFFFF;
+}
+div.ilc_va_iheada_LightAccordIHeadActive:hover {
+  background-position: right center;
+  background-color: #FFFFFF;
+  cursor: pointer;
+  border-width: 0px;
+  border-top-width: 0px;
+  border-right-width: 0px;
+  border-bottom-width: 2px;
+  border-left-width: 0px;
+  border-style: none;
+  border-top-style: none;
+  border-right-style: none;
+  border-bottom-style: solid;
+  border-left-style: none;
+  border-color: #FFFFFF;
+  transition: all 0.5s ease-out;
 }

From ef6158e893c26b016b14f58b5f80dfbdc2b7af35 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Mon, 16 Feb 2026 10:08:52 +0100
Subject: [PATCH 061/141] 45550: Offline/Online in tab Settings ignored

---
 .../Template/class.ilObjPortfolioTemplate.php |  3 +-
 .../class.ilObjPortfolioTemplateGUI.php       |  6 ++-
 .../Setup/class.ilPortfolioDBUpdateSteps.php  | 22 ++++++++
 .../classes/class.ilObjPortfolioBase.php      | 28 ++--------
 .../classes/class.ilObjPortfolioGUI.php       | 52 ++-----------------
 .../class.ilPortfolioAccessHandler.php        |  2 +-
 .../class.ilPortfolioRepositoryGUI.php        |  8 +--
 7 files changed, 40 insertions(+), 81 deletions(-)

diff --git a/components/ILIAS/Portfolio/Template/class.ilObjPortfolioTemplate.php b/components/ILIAS/Portfolio/Template/class.ilObjPortfolioTemplate.php
index 49934f3c0c60..6070d2f502e8 100755
--- a/components/ILIAS/Portfolio/Template/class.ilObjPortfolioTemplate.php
+++ b/components/ILIAS/Portfolio/Template/class.ilObjPortfolioTemplate.php
@@ -81,9 +81,10 @@ protected function doCloneObject(ilObject2 $new_obj, int $a_target_id, ?int $a_c
         //copy online status if object is not the root copy object
         $cp_options = ilCopyWizardOptions::_getInstance($a_copy_id);
 
+        /* should be handled by object
         if (!$cp_options->isRootNode($this->getRefId())) {
             $new_obj->setOnline($this->isOnline());
-        }
+        }*/
 
         self::cloneBasics($this, $new_obj);
 
diff --git a/components/ILIAS/Portfolio/Template/class.ilObjPortfolioTemplateGUI.php b/components/ILIAS/Portfolio/Template/class.ilObjPortfolioTemplateGUI.php
index 92fda400c13b..08b9902c89a0 100755
--- a/components/ILIAS/Portfolio/Template/class.ilObjPortfolioTemplateGUI.php
+++ b/components/ILIAS/Portfolio/Template/class.ilObjPortfolioTemplateGUI.php
@@ -311,6 +311,7 @@ public function edit(): void
         $this->ctrl->redirectByClass(SettingsGUI::class);
     }
 
+    /*
     protected function getEditFormCustomValues(array &$a_values): void
     {
         $a_values["online"] = $this->object->isOnline();
@@ -329,8 +330,9 @@ protected function getEditFormCustomValues(array &$a_values): void
         );
 
         parent::getEditFormCustomValues($a_values);
-    }
+    }*/
 
+    /*
     protected function updateCustom(ilPropertyFormGUI $form): void
     {
         $obj_service = $this->object_service;
@@ -360,7 +362,7 @@ protected function updateCustom(ilPropertyFormGUI $form): void
             )
         );
     }
-
+    */
 
     //
     // PAGES
diff --git a/components/ILIAS/Portfolio/classes/Setup/class.ilPortfolioDBUpdateSteps.php b/components/ILIAS/Portfolio/classes/Setup/class.ilPortfolioDBUpdateSteps.php
index 97abb03c3b09..f3c6e8478011 100755
--- a/components/ILIAS/Portfolio/classes/Setup/class.ilPortfolioDBUpdateSteps.php
+++ b/components/ILIAS/Portfolio/classes/Setup/class.ilPortfolioDBUpdateSteps.php
@@ -63,4 +63,26 @@ public function step_2(): void
             [2]
         );
     }
+
+    public function step_3(): void
+    {
+        $db = $this->db;
+
+        $set = $db->query("SELECT * FROM usr_portfolio");
+        while ($rec = $db->fetchAssoc($set)) {
+            $offline = ($rec["is_online"] == 1) ? 0 : 1;
+            $db->update(
+                "object_data",
+                [
+                "offline" => ["integer", $offline]
+            ],
+                [
+                    "obj_id" => ["integer", $rec["id"]],
+                    "type" => ["text", "prtf"]
+                ]
+            );
+
+        }
+    }
+
 }
diff --git a/components/ILIAS/Portfolio/classes/class.ilObjPortfolioBase.php b/components/ILIAS/Portfolio/classes/class.ilObjPortfolioBase.php
index 515f77479166..1f9ab7e07a92 100755
--- a/components/ILIAS/Portfolio/classes/class.ilObjPortfolioBase.php
+++ b/components/ILIAS/Portfolio/classes/class.ilObjPortfolioBase.php
@@ -25,7 +25,6 @@ abstract class ilObjPortfolioBase extends ilObject2
 {
     protected \ILIAS\Notes\Service $notes;
     protected ilSetting $setting;
-    protected bool $online = false;
     protected bool $comments = false;
     protected string $bg_color = "";
     protected string $font_color = "";
@@ -53,28 +52,12 @@ public function __construct(
     // PROPERTIES
     //
 
+    /*
     public function setOnline(bool $a_value): void
     {
         $this->online = $a_value;
-    }
-
-    public function isOnline(): bool
-    {
-        return $this->online;
-    }
-
-    public static function lookupOnline(int $a_id): bool
-    {
-        global $DIC;
-
-        $ilDB = $DIC->database();
+    }*/
 
-        $set = $ilDB->query("SELECT is_online" .
-            " FROM usr_portfolio" .
-            " WHERE id = " . $ilDB->quote($a_id, "integer"));
-        $row = $ilDB->fetchAssoc($set);
-        return  (bool) $row["is_online"];
-    }
 
     public function setPublicComments(bool $a_value): void
     {
@@ -137,7 +120,6 @@ protected function doRead(): void
                 " WHERE id = " . $ilDB->quote($this->id, "integer"));
         $row = $ilDB->fetchAssoc($set);
 
-        $this->setOnline((bool) $row["is_online"]);
         $this->setProfilePicture((bool) $row["ppic"]);
         $this->setBackgroundColor((string) $row["bg_color"]);
         $this->setFontColor((string) $row["font_color"]);
@@ -159,9 +141,8 @@ protected function doCreate(bool $clone_mode = false): void
     {
         $ilDB = $this->db;
 
-        $ilDB->manipulate("INSERT INTO usr_portfolio (id,is_online)" .
-            " VALUES (" . $ilDB->quote($this->id, "integer") . "," .
-            $ilDB->quote(0, "integer") . ")");
+        $ilDB->manipulate("INSERT INTO usr_portfolio (id)" .
+            " VALUES (" . $ilDB->quote($this->id, "integer") . ")");
     }
 
     protected function doUpdate(): void
@@ -169,7 +150,6 @@ protected function doUpdate(): void
         $ilDB = $this->db;
 
         $fields = array(
-            "is_online" => array("integer", $this->isOnline()),
             "ppic" => array("integer", $this->hasProfilePicture()),
             "bg_color" => array("text", $this->getBackgroundColor()),
             "font_color" => array("text", $this->getFontColor())
diff --git a/components/ILIAS/Portfolio/classes/class.ilObjPortfolioGUI.php b/components/ILIAS/Portfolio/classes/class.ilObjPortfolioGUI.php
index da7b9fe9bc69..9449c09e883e 100755
--- a/components/ILIAS/Portfolio/classes/class.ilObjPortfolioGUI.php
+++ b/components/ILIAS/Portfolio/classes/class.ilObjPortfolioGUI.php
@@ -245,7 +245,7 @@ protected function setTitleAndDescription(): void
         );
 
         if ($this->object &&
-            !$this->object->isOnline()) {
+            $this->object->getOfflineStatus()) {
             $this->tpl->setAlertProperties(array(
                 array("alert" => true,
                     "property" => $this->lng->txt("status"),
@@ -417,52 +417,6 @@ protected function toRepository(): void
         $this->ctrl->redirectByClass("ilportfoliorepositorygui", "show");
     }
 
-    protected function initEditForm(): ilPropertyFormGUI
-    {
-        $form = new ilPropertyFormGUI();
-        $form->setFormAction($this->ctrl->getFormAction($this));
-
-        // title
-        $ti = new ilTextInputGUI($this->lng->txt("title"), "title");
-        $ti->setSize(min(40, ilObject::TITLE_LENGTH));
-        $ti->setMaxLength(ilObject::TITLE_LENGTH);
-        $ti->setRequired(true);
-        $ti->setValue($this->object->getTitle());
-        $form->addItem($ti);
-
-        // :TODO: online
-        $online = new ilCheckboxInputGUI($this->lng->txt("online"), "online");
-        $online->setChecked($this->object->isOnline());
-        $form->addItem($online);
-
-        $this->initEditCustomForm($form);
-
-        $form->setTitle($this->lng->txt("prtf_edit_portfolio"));
-        $form->addCommandButton("update", $this->lng->txt("save"));
-        $form->addCommandButton("view", $this->lng->txt("cancel"));
-
-        return $form;
-    }
-
-    protected function getEditFormCustomValues(array &$a_values): void
-    {
-        $a_values["online"] = $this->object->isOnline();
-
-        parent::getEditFormCustomValues($a_values);
-    }
-
-    protected function updateCustom(ilPropertyFormGUI $form): void
-    {
-        $this->object->setOnline($form->getInput("online"));
-
-        // if portfolio is not online, it cannot be default
-        if (!$form->getInput("online")) {
-            ilObjPortfolio::setUserDefault($this->user_id, 0);
-        }
-
-        parent::updateCustom($form);
-    }
-
 
     //
     // PAGES
@@ -874,7 +828,7 @@ protected function getOfflineMessage(): string
         $lng = $this->lng;
         $ctrl = $this->ctrl;
 
-        if (!$this->object->isOnline()) {
+        if ($this->object->getOfflineStatus()) {
             $f = $ui->factory();
             $renderer = $ui->renderer();
 
@@ -898,7 +852,7 @@ protected function setOnlineAndShare(): void
         $lng = $this->lng;
 
         if (ilObjPortfolio::_lookupOwner($this->object->getId()) === $this->user_id) {
-            $this->object->setOnline(true);
+            $this->object->setOfflineStatus(false);
             $this->object->update();
             $this->tpl->setOnScreenMessage('success', $lng->txt("prtf_has_been_set_online"), true);
         }
diff --git a/components/ILIAS/Portfolio/classes/class.ilPortfolioAccessHandler.php b/components/ILIAS/Portfolio/classes/class.ilPortfolioAccessHandler.php
index 84f2223b7466..d569175484d2 100755
--- a/components/ILIAS/Portfolio/classes/class.ilPortfolioAccessHandler.php
+++ b/components/ILIAS/Portfolio/classes/class.ilPortfolioAccessHandler.php
@@ -102,7 +102,7 @@ public function checkAccessOfUser(
         }
 
         // #11921
-        if (!$pf->isOnline()) {
+        if ($pf->getOfflineStatus()) {
             return false;
         }
 
diff --git a/components/ILIAS/Portfolio/classes/class.ilPortfolioRepositoryGUI.php b/components/ILIAS/Portfolio/classes/class.ilPortfolioRepositoryGUI.php
index 88ddd7304f59..123506bd85df 100755
--- a/components/ILIAS/Portfolio/classes/class.ilPortfolioRepositoryGUI.php
+++ b/components/ILIAS/Portfolio/classes/class.ilPortfolioRepositoryGUI.php
@@ -330,7 +330,7 @@ protected function setOnline(): void
         $prt_id = $this->port_request->getPortfolioId();
         if (ilObjPortfolio::_lookupOwner($prt_id) === $this->user_id) {
             $portfolio = new ilObjPortfolio($prt_id, false);
-            $portfolio->setOnline(true);
+            $portfolio->setOfflineStatus(false);
             $portfolio->update();
             $this->tpl->setOnScreenMessage('success', $lng->txt("saved_successfully"), true);
             $ilCtrl->redirect($this, "show");
@@ -346,7 +346,7 @@ protected function setOffline(): void
         $prt_id = $this->port_request->getPortfolioId();
         if (ilObjPortfolio::_lookupOwner($prt_id) === $this->user_id) {
             $portfolio = new ilObjPortfolio($prt_id, false);
-            $portfolio->setOnline(false);
+            $portfolio->setOfflineStatus(true);
             $portfolio->update();
             $this->tpl->setOnScreenMessage('success', $lng->txt("saved_successfully"), true);
             $ilCtrl->redirect($this, "show");
@@ -368,9 +368,9 @@ protected function saveTitles(): void
                 $portfolio->setTitle(ilUtil::stripSlashes($title));
 
                 if (in_array($id, $online)) {
-                    $portfolio->setOnline(true);
+                    $portfolio->setOfflineStatus(false);
                 } else {
-                    $portfolio->setOnline(false);
+                    $portfolio->setOfflineStatus(true);
                 }
 
                 $portfolio->update();

From 6a316c7732cee7009f13e1ea8def26e95e72de3d Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Mon, 16 Feb 2026 10:52:38 +0100
Subject: [PATCH 062/141] possibel fix for 47182: Failed test: Testergebnisse
 drucken

---
 components/ILIAS/Repository/Service/IRSS/IRSSWrapper.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/ILIAS/Repository/Service/IRSS/IRSSWrapper.php b/components/ILIAS/Repository/Service/IRSS/IRSSWrapper.php
index df4777312a95..5401bc3beffe 100755
--- a/components/ILIAS/Repository/Service/IRSS/IRSSWrapper.php
+++ b/components/ILIAS/Repository/Service/IRSS/IRSSWrapper.php
@@ -451,7 +451,13 @@ public function hasContainerEntry(
         string $rid,
         string $entry
     ): bool {
+        if ($rid === "") {
+            return false;
+        }
         $zip_path = $this->stream($rid)?->getMetadata("uri");
+        if (is_null($zip_path)) {
+            return false;
+        }
         try {
             $stream = Streams::ofFileInsideZIP(
                 $zip_path,

From 91c10f315215f2bf3e66436306c69b09473a68c9 Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Mon, 16 Feb 2026 11:21:48 +0100
Subject: [PATCH 063/141] 45924: Mitwirkende nicht aufrufbar

---
 components/ILIAS/COPage/classes/class.ilPageObject.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/ILIAS/COPage/classes/class.ilPageObject.php b/components/ILIAS/COPage/classes/class.ilPageObject.php
index c845f460a2f8..9bdd0fb89a41 100755
--- a/components/ILIAS/COPage/classes/class.ilPageObject.php
+++ b/components/ILIAS/COPage/classes/class.ilPageObject.php
@@ -2369,6 +2369,7 @@ public static function getParentObjectContributors(
         global $DIC;
 
         $db = $DIC->database();
+        $profile = $DIC->copage()->internal()->domain()->profile();
 
         $and_lang = "";
         if ($a_lang != "") {
@@ -2411,7 +2412,7 @@ public static function getParentObjectContributors(
 
         $c = array();
         foreach ($contributors as $k => $co) {
-            if (ilObject::_lookupType($k) == "usr") {
+            if ($profile->exists($k)) {
                 $name = ilObjUser::_lookupName($k);
                 $c[] = array("user_id" => $k,
                              "pages" => $co,

From 0b9dd6d6858e6cd112312ea510412f3492eb718d Mon Sep 17 00:00:00 2001
From: Chris Potter <chris.potter@ilias.de>
Date: Mon, 16 Feb 2026 11:53:44 +0100
Subject: [PATCH 064/141] Correction of grammatical error

---
 lang/ilias_en.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index 3b92cb31fbf8..c12c8ef0b967 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -16986,7 +16986,7 @@ survey#:#svy_results_view_own_info#:#After finishing the survey, participants ca
 survey#:#svy_save_and_continue#:#Save and Continue
 survey#:#svy_save_sync#:#Save and Sync Question Copies
 survey#:#svy_search_user#:#Look Up User
-survey#:#svy_search_user_info#:#Look up for specific users of this platform or for the members of specific groups, courses, roles or organisational units.
+survey#:#svy_search_user_info#:#Look up specific users of this platform or the members of specific groups, courses, roles or organisational units.
 survey#:#svy_search_users#:#Look Up Users
 survey#:#svy_select_rater#:#Select Rater
 survey#:#svy_selected_user_data_deleted#:#The survey data of the selected participants(s) has been successfully deleted.

From 4bda3bb744b49dca745ed44693bbbcc83cb18160 Mon Sep 17 00:00:00 2001
From: Aaron Bidzan <abidzan@databay.de>
Date: Mon, 8 Dec 2025 14:37:45 +0100
Subject: [PATCH 065/141] Changes _getStatusInfo to also return other statuses
 to update LP accordingly

---
 .../status/class.ilLPStatusTestPassed.php     | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/components/ILIAS/Tracking/classes/status/class.ilLPStatusTestPassed.php b/components/ILIAS/Tracking/classes/status/class.ilLPStatusTestPassed.php
index 5e26a7c0b6ba..f8d991e89de1 100755
--- a/components/ILIAS/Tracking/classes/status/class.ilLPStatusTestPassed.php
+++ b/components/ILIAS/Tracking/classes/status/class.ilLPStatusTestPassed.php
@@ -19,6 +19,7 @@
 declare(strict_types=0);
 
 use ILIAS\Test\Results\Data\Repository;
+use ILIAS\Test\Participants\ParticipantRepository;
 use ILIAS\Test\TestDIC;
 
 /**
@@ -71,9 +72,27 @@ private static function getUserIdsByResultArrayStatus(
 
     public static function _getStatusInfo(int $a_obj_id): array
     {
-        /** @var Repository $test_result_repository */
-        $test_result_repository = TestDIC::dic()['results.data.repository'];
-        $status_info['results'] = $test_result_repository->getPassedParticipants($a_obj_id);
+        /** @var ParticipantRepository $participant_repository */
+        $participant_repository = TestDIC::dic()['participant.repository'];
+        $test_id = ilObjTestAccess::_getTestIDFromObjectID($a_obj_id);
+
+        $lp_status = new self($a_obj_id);
+        $results = [];
+
+        foreach ($participant_repository->getParticipants($test_id) as $participant) {
+            $user_id = $participant->getUserId();
+            $status = $lp_status->determineStatus($a_obj_id, $user_id);
+
+            $results[] = [
+                'user_id' => $user_id,
+                'passed' => ($status === self::LP_STATUS_COMPLETED_NUM),
+                'failed' => ($status === self::LP_STATUS_FAILED_NUM),
+                'in_progress' => ($status === self::LP_STATUS_IN_PROGRESS_NUM),
+                'not_attempted' => ($status === self::LP_STATUS_NOT_ATTEMPTED_NUM)
+            ];
+        }
+
+        $status_info['results'] = $results;
         return $status_info;
     }
 

From b51e69f6f996f73e714c0b1c104e94f31839789d Mon Sep 17 00:00:00 2001
From: Fabian Schmid <fabian@sr.solutions>
Date: Mon, 16 Feb 2026 13:40:09 +0100
Subject: [PATCH 066/141] [FIX] #45264 UI: pass `MainControls\SystemInfo`
 more-button in JavaScript facility. (#11121)

* Fixes https://mantis.ilias.de/view.php?id=45264

Co-authored-by: Thibeau Fuhrer <thibeau@sr.solutions>
---
 .../UI/resources/js/MainControls/system_info.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/components/ILIAS/UI/resources/js/MainControls/system_info.js b/components/ILIAS/UI/resources/js/MainControls/system_info.js
index dfae4a6f2a38..b12c8e0cb79f 100755
--- a/components/ILIAS/UI/resources/js/MainControls/system_info.js
+++ b/components/ILIAS/UI/resources/js/MainControls/system_info.js
@@ -1,3 +1,18 @@
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ */
+
 il = il || {};
 il.UI = il.UI || {};
 il.UI.maincontrols = il.UI.maincontrols || {};
@@ -19,7 +34,7 @@ il.UI.maincontrols = il.UI.maincontrols || {};
       maybeShowMoreButton(item, more_button);
       $(window).resize(() => {
         if (!calculating) {
-          maybeShowMoreButton(item);
+          maybeShowMoreButton(item, more_button);
         }
       });
     };

From abe3e0316ab69cabd80af79f2adb73a45805b5cc Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Mon, 16 Feb 2026 18:30:48 +0100
Subject: [PATCH 067/141] 37204: deleting a participant not working properly

---
 .../class.RandomAssignmentsDBRepository.php      | 16 ++++++++++++++++
 .../Mandatory/class.RandomAssignmentsManager.php |  6 ++++++
 .../Members/classes/class.ilExerciseMembers.php  |  6 ++++++
 3 files changed, 28 insertions(+)

diff --git a/components/ILIAS/Exercise/Assignment/Mandatory/class.RandomAssignmentsDBRepository.php b/components/ILIAS/Exercise/Assignment/Mandatory/class.RandomAssignmentsDBRepository.php
index e48511bc58f9..ae2c3e9c7052 100755
--- a/components/ILIAS/Exercise/Assignment/Mandatory/class.RandomAssignmentsDBRepository.php
+++ b/components/ILIAS/Exercise/Assignment/Mandatory/class.RandomAssignmentsDBRepository.php
@@ -98,4 +98,20 @@ public function saveAssignmentsOfUser(
             }
         }
     }
+
+    public function deleteAssignmentsOfUser(
+        int $user_id,
+        int $exc_id
+    ): void {
+        $db = $this->db;
+
+        $db->manipulateF(
+            "DELETE FROM exc_mandatory_random  WHERE " .
+            " exc_id = %s" .
+            " AND usr_id = %s",
+            array("integer", "integer"),
+            array($exc_id, $user_id)
+        );
+    }
+
 }
diff --git a/components/ILIAS/Exercise/Assignment/Mandatory/class.RandomAssignmentsManager.php b/components/ILIAS/Exercise/Assignment/Mandatory/class.RandomAssignmentsManager.php
index 388633f0561f..a137785eea54 100755
--- a/components/ILIAS/Exercise/Assignment/Mandatory/class.RandomAssignmentsManager.php
+++ b/components/ILIAS/Exercise/Assignment/Mandatory/class.RandomAssignmentsManager.php
@@ -228,4 +228,10 @@ public function isAssignmentVisible(
         }
         return true;
     }
+
+    public function deleteAssignmentsOfUser(
+        int $user_id
+    ): void {
+        $this->rand_ass_repo->deleteAssignmentsOfUser($user_id, $this->exc_id);
+    }
 }
diff --git a/components/ILIAS/Exercise/Members/classes/class.ilExerciseMembers.php b/components/ILIAS/Exercise/Members/classes/class.ilExerciseMembers.php
index 62cf81b11030..e2e013a2a558 100755
--- a/components/ILIAS/Exercise/Members/classes/class.ilExerciseMembers.php
+++ b/components/ILIAS/Exercise/Members/classes/class.ilExerciseMembers.php
@@ -25,6 +25,7 @@
  */
 class ilExerciseMembers
 {
+    protected \ILIAS\Exercise\InternalDomainService $domain;
     protected IndividualDeadlineManager $individual_deadlines;
     protected ilDBInterface $db;
     public int $ref_id;
@@ -45,6 +46,7 @@ public function __construct(ilObjExercise $a_exc)
         $this->read();
         $this->recommended_content_manager = new ilRecommendedContentManager();
         $this->individual_deadlines = $DIC->exercise()->internal()->domain()->individualDeadline();
+        $this->domain = $DIC->exercise()->internal()->domain();
     }
 
     // Get exercise ref id
@@ -160,6 +162,10 @@ public function deassignMember(int $a_usr_id): void
             $idl->delete();
         }
 
+        // delete random assignments
+        $random = $this->domain->assignment()->randomAssignments($this->exc);
+        $random->deleteAssignmentsOfUser($a_usr_id);
+
         // @todo: delete all assignment associations (and their files)
     }
 

From 592047e15b9f545baa22b441b6d74b3e7b36c10e Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Mon, 16 Feb 2026 20:58:51 +0100
Subject: [PATCH 068/141] 43239: Button not displayed correctly in the Team
 Wiki overview

---
 lang/ilias_de.lang | 1 +
 lang/ilias_en.lang | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 906169e39005..3715926308e9 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -9725,6 +9725,7 @@ exc#:#exc_type_upload#:#Datei
 exc#:#exc_type_upload_team#:#Datei als Team einreichen
 exc#:#exc_value_can_not_set#:#Dieser Wert kann nicht gesetzt werden
 exc#:#exc_view_portfolio#:#Portfolio anzeigen
+exc#:#exc_view_wiki#:#Wiki anzeigen
 exc#:#exc_wait_for_files#:#Der Download sollte automatisch starten. Bei Problemen klicken Sie bitte hier.
 exc#:#exc_wiki_container#:#Wiki-Container
 exc#:#exc_wiki_container_info#:#An dieser Stelle werden die neuen Team-Wikis angelegt.
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index c12c8ef0b967..bac32e256c4b 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -9698,6 +9698,7 @@ exc#:#exc_type_upload#:#Upload
 exc#:#exc_type_upload_team#:#Team Upload
 exc#:#exc_value_can_not_set#:#This value can not be set.
 exc#:#exc_view_portfolio#:#View Portfolio
+exc#:#exc_view_wiki#:#View Wiki
 exc#:#exc_wait_for_files#:#Your download should start automatically. If the download doesn't start in 5 secs, please click here
 exc#:#exc_wiki_container#:#Wiki Container
 exc#:#exc_wiki_container_info#:#Location where wikis of participants will be created.

From 2e38b8ad87da0bfc25096e9722747c3ebe7c3dfc Mon Sep 17 00:00:00 2001
From: Fabian Helfer <82493694+fhelfer@users.noreply.github.com>
Date: Tue, 17 Feb 2026 11:44:53 +0100
Subject: [PATCH 069/141] [FIX] #45422: render `Filter\Standard` glyphs as
 `<span>`. (#11019)

* Fixes https://mantis.ilias.de/view.php?id=45422
* Update `Symbol\Glyph\GlyphRendererFactory` and use for `Filter\Standard` as well
---
 .../Symbol/Glyph/GlyphRendererFactory.php     | 41 +++++++++++++++++--
 .../Container/Filter/StandardFilterTest.php   | 32 +++++++--------
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/GlyphRendererFactory.php b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/GlyphRendererFactory.php
index 417c37e3549f..0b8c11008f5b 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/GlyphRendererFactory.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Symbol/Glyph/GlyphRendererFactory.php
@@ -27,8 +27,10 @@
 class GlyphRendererFactory extends Render\DefaultRendererFactory
 {
     /**
-     * components which render glyphs inside an HTML <button> element, where only
-     * palpable content is allowed.
+     * components which render glyphs inside an HTML <button> element (or equivalent),
+     * where only palpable content is allowed (no <a>).
+     * Any glyph rendered anywhere within these components' subtree will use the
+     * ButtonContextRenderer.
      * @see https://html.spec.whatwg.org/#palpable-content
      */
     protected const array USE_BUTTON_CONTEXT_RENDERER_FOR = [
@@ -45,9 +47,24 @@ class GlyphRendererFactory extends Render\DefaultRendererFactory
         'RadioFieldInput',
     ];
 
+    /**
+     * Components that render glyphs inside an HTML <button> element themselves
+     * but also contain child components whose glyphs should NOT use the
+     * ButtonContextRenderer. Only glyphs that are direct children of these
+     * components (i.e. these components are the immediate parent context) will
+     * use the ButtonContextRenderer. This prevents false-positives for glyphs
+     * in nested child components.
+     */
+    protected const array USE_BUTTON_CONTEXT_RENDERER_FOR_DIRECT_CONTEXT = [
+        'StandardFilterContainerInput',
+    ];
+
     public function getRendererInContext(Component\Component $component, array $contexts): ComponentRenderer
     {
-        if (count(array_intersect(self::USE_BUTTON_CONTEXT_RENDERER_FOR, $contexts)) > 0) {
+        if (
+            $this->isDirectContextMatch($contexts) ||
+            count(array_intersect(self::USE_BUTTON_CONTEXT_RENDERER_FOR, $contexts)) > 0
+        ) {
             return new ButtonContextRenderer(
                 $this->ui_factory,
                 $this->tpl_factory,
@@ -70,4 +87,22 @@ public function getRendererInContext(Component\Component $component, array $cont
             $this->upload_limit_resolver
         );
     }
+
+    /**
+     * Checks whether the immediate parent context (the component that directly
+     * renders this glyph) matches one of the DIRECT_CONTEXT components.
+     * The context array has the current component (glyph) as the last element,
+     * so the immediate parent is the second-to-last element.
+     *
+     * @param string[] $contexts
+     */
+    private function isDirectContextMatch(array $contexts): bool
+    {
+        $count = count($contexts);
+        if ($count < 2) {
+            return false;
+        }
+        $immediate_parent = $contexts[$count - 2];
+        return in_array($immediate_parent, self::USE_BUTTON_CONTEXT_RENDERER_FOR_DIRECT_CONTEXT, true);
+    }
 }
diff --git a/components/ILIAS/UI/tests/Component/Input/Container/Filter/StandardFilterTest.php b/components/ILIAS/UI/tests/Component/Input/Container/Filter/StandardFilterTest.php
index 99f20a3d5fbc..04ce9e3ae1d7 100755
--- a/components/ILIAS/UI/tests/Component/Input/Container/Filter/StandardFilterTest.php
+++ b/components/ILIAS/UI/tests/Component/Input/Container/Filter/StandardFilterTest.php
@@ -184,14 +184,14 @@ public function testRenderActivatedCollapsed(): void
                 <button type="button" aria-expanded="false" aria-controls="active_inputs_id_1 section_inputs_id_1" id="opener_id_1">
                     <span>
                         <span data-collapse-glyph-visibility="0">
-                            <a class="glyph" aria-label="collapse_content">
+                            <span class="glyph" aria-label="collapse_content" role="img">
                                 <span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
-                            </a>
+                            </span>
                         </span>
                         <span data-expand-glyph-visibility="1">
-                            <a class="glyph" aria-label="expand_content">
+                            <span class="glyph" aria-label="expand_content" role="img">
                                 <span class="glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
-                            </a>
+                            </span>
                         </span> filter
                     </span>
                 </button>
@@ -322,14 +322,14 @@ public function testRenderDeactivatedCollapsed(): void
                 <button type="button" aria-expanded="false" aria-controls="active_inputs_id_1 section_inputs_id_1" id="opener_id_1">
                     <span>
                         <span data-collapse-glyph-visibility="0">
-                            <a class="glyph" aria-label="collapse_content">
+                            <span class="glyph" aria-label="collapse_content" role="img">
                                 <span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
-                            </a>
+                            </span>
                         </span>
                         <span data-expand-glyph-visibility="1">
-                            <a class="glyph" aria-label="expand_content">
+                            <span class="glyph" aria-label="expand_content" role="img">
                                 <span class="glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
-                            </a>
+                            </span>
                         </span> filter
                     </span>
                 </button>
@@ -460,14 +460,14 @@ public function testRenderActivatedExpanded(): void
                 <button type="button" aria-expanded="true" aria-controls="active_inputs_id_1 section_inputs_id_1" id="opener_id_1">
                     <span>
                         <span data-collapse-glyph-visibility="1">
-                            <a class="glyph" aria-label="collapse_content">
+                            <span class="glyph" aria-label="collapse_content" role="img">
                                 <span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
-                            </a>
+                            </span>
                         </span>
                         <span data-expand-glyph-visibility="0">
-                            <a class="glyph" aria-label="expand_content">
+                            <span class="glyph" aria-label="expand_content" role="img">
                                 <span class="glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
-                            </a>
+                            </span>
                         </span> filter
                     </span>
                 </button>
@@ -598,14 +598,14 @@ public function testRenderDeactivatedExpanded(): void
                 <button type="button" aria-expanded="true" aria-controls="active_inputs_id_1 section_inputs_id_1" id="opener_id_1">
                     <span>
                         <span data-collapse-glyph-visibility="1">
-                            <a class="glyph" aria-label="collapse_content">
+                            <span class="glyph" aria-label="collapse_content" role="img">
                                 <span class="glyphicon glyphicon-triangle-bottom" aria-hidden="true"></span>
-                            </a>
+                            </span>
                         </span>
                         <span data-expand-glyph-visibility="0">
-                            <a class="glyph" aria-label="expand_content">
+                            <span class="glyph" aria-label="expand_content" role="img">
                                 <span class="glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
-                            </a>
+                            </span>
                         </span> filter
                     </span>
                 </button>

From 4aa35fc322942b81cc7a644433807e84254267b9 Mon Sep 17 00:00:00 2001
From: Fabian Helfer <82493694+fhelfer@users.noreply.github.com>
Date: Tue, 17 Feb 2026 12:54:53 +0100
Subject: [PATCH 070/141] [FIX] #46870 UI: preserve role attributes of
 `MainControls\MainBar` content. (#10987)

* Fixes https://mantis.ilias.de/view.php?id=46870
---
 .../UI/resources/js/MainControls/dist/mainbar.js     | 12 +++++++++---
 .../js/MainControls/src/mainbar.renderer.js          | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/components/ILIAS/UI/resources/js/MainControls/dist/mainbar.js b/components/ILIAS/UI/resources/js/MainControls/dist/mainbar.js
index 272e61d1a4b0..1c349d92a953 100644
--- a/components/ILIAS/UI/resources/js/MainControls/dist/mainbar.js
+++ b/components/ILIAS/UI/resources/js/MainControls/dist/mainbar.js
@@ -801,7 +801,10 @@ var persistence = function() {
 
                 element.attr('aria-hidden', false);
                 //https://www.w3.org/TR/wai-aria-practices-1.1/examples/accordion/accordion.html
-                element.attr('role', 'region');
+                var currentRole = element.attr('role');
+                if (!currentRole || currentRole === 'region') {
+                    element.attr('role', 'region');
+                }
                 if(isInView && !thrown) {
                     element.trigger('in_view'); //this is most important for async loading of slates,
                                                 //it triggers the GlobalScreen-Service.
@@ -814,8 +817,11 @@ var persistence = function() {
             additional_disengage: function(){
                 var entry_id = dom_ref_to_element[this.html_id];
                 thrown_for[entry_id] = false;
-                this.getElement().attr('aria-hidden', true);
-                this.getElement().removeAttr('role', 'region');
+                var element = this.getElement();
+                element.attr('aria-hidden', true);
+                if (element.attr('role') === 'region') {
+                    element.removeAttr('role');
+                }
             }
         }),
         remover: Object.assign({}, dom_element, {
diff --git a/components/ILIAS/UI/resources/js/MainControls/src/mainbar.renderer.js b/components/ILIAS/UI/resources/js/MainControls/src/mainbar.renderer.js
index da537876f190..0cc38a685ee8 100755
--- a/components/ILIAS/UI/resources/js/MainControls/src/mainbar.renderer.js
+++ b/components/ILIAS/UI/resources/js/MainControls/src/mainbar.renderer.js
@@ -95,7 +95,10 @@
 
                 element.attr('aria-hidden', false);
                 //https://www.w3.org/TR/wai-aria-practices-1.1/examples/accordion/accordion.html
-                element.attr('role', 'region');
+                var currentRole = element.attr('role');
+                if (!currentRole || currentRole === 'region') {
+                    element.attr('role', 'region');
+                }
                 if(isInView && !thrown) {
                     element.trigger('in_view'); //this is most important for async loading of slates,
                                                 //it triggers the GlobalScreen-Service.
@@ -108,8 +111,11 @@
             additional_disengage: function(){
                 var entry_id = dom_ref_to_element[this.html_id];
                 thrown_for[entry_id] = false;
-                this.getElement().attr('aria-hidden', true);
-                this.getElement().removeAttr('role', 'region');
+                var element = this.getElement();
+                element.attr('aria-hidden', true);
+                if (element.attr('role') === 'region') {
+                    element.removeAttr('role');
+                }
             }
         }),
         remover: Object.assign({}, dom_element, {

From 8c4ce264b848c4bf79e82b0130d18150f5549013 Mon Sep 17 00:00:00 2001
From: mjansen <mjansen@databay.de>
Date: Tue, 17 Feb 2026 14:42:54 +0100
Subject: [PATCH 071/141] [Fix] Certificate: Add type restrictions for
 templates

---
 .../classes/API/UserCertificateAPI.php        | 53 ++++++++++++-------
 .../Clone/class.ilCertificateCloneAction.php  |  2 -
 .../Template/class.ilCertificateTemplate.php  |  8 ++-
 .../class.ilCertificateAppEventListener.php   |  5 +-
 4 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/components/ILIAS/Certificate/classes/API/UserCertificateAPI.php b/components/ILIAS/Certificate/classes/API/UserCertificateAPI.php
index c031d26765a4..67f3b1dcfb07 100755
--- a/components/ILIAS/Certificate/classes/API/UserCertificateAPI.php
+++ b/components/ILIAS/Certificate/classes/API/UserCertificateAPI.php
@@ -86,13 +86,15 @@ public function getUserCertificateDataMaxCount(UserDataFilter $filter): int
     public function certificateCriteriaMetForGivenTemplate(int $usr_id, ilCertificateTemplate $template): void
     {
         if (!$template->isCurrentlyActive()) {
-            $this->logger->debug(sprintf(
-                'Did not trigger certificate achievement for inactive template: usr_id: %s/obj_id: %s/type: %s/template_id: %s',
-                $usr_id,
-                $template->getObjId(),
-                $template->getObjType(),
-                $template->getId()
-            ));
+            $this->logger->debug(
+                \sprintf(
+                    'Did not trigger certificate achievement for inactive template: usr_id: %s/obj_id: %s/type: %s/template_id: %s',
+                    $usr_id,
+                    $template->getObjId(),
+                    $template->getObjType(),
+                    $template->getId()
+                )
+            );
             return;
         }
 
@@ -106,13 +108,26 @@ public function certificateCriteriaMet(int $usr_id, int $obj_id): void
     {
         $type = $this->object_data_cache->lookupType($obj_id);
         if (!$this->type_class_map->typeExistsInMap($type)) {
-            throw new ilCertificateConsumerNotSupported(sprintf(
-                "Oject type '%s' is not supported by the certificate component!",
-                $type
-            ));
+            throw new ilCertificateConsumerNotSupported(
+                \sprintf(
+                    "Oject type '%s' is not supported by the certificate component!",
+                    $type
+                )
+            );
         }
 
         $template = $this->template_repository->fetchCurrentlyActiveCertificate($obj_id);
+        if ($template->getObjType() !== $type) {
+            $this->logger->error(
+                'Object type mismatch between template and determined type for object with id {obj_id}: '
+                    . 'Expected {type} but got {template_type}!',
+                [
+                    'obj_id' => $obj_id,
+                    'type' => $type,
+                    'template_type' => $template->getObjType()
+                ]
+            );
+        }
 
         $this->certificateCriteriaMetForGivenTemplate($usr_id, $template);
     }
@@ -136,13 +151,15 @@ private function processEntry(
         int $userId,
         ilCertificateTemplate $template
     ): void {
-        $this->logger->debug(sprintf(
-            'Trigger persisting certificate achievement for: usr_id: %s/obj_id: %s/type: %s/template_id: %s',
-            $userId,
-            $template->getObjId(),
-            $template->getObjType(),
-            $template->getId()
-        ));
+        $this->logger->debug(
+            \sprintf(
+                'Trigger persisting certificate achievement for: usr_id: %s/obj_id: %s/type: %s/template_id: %s',
+                $userId,
+                $template->getObjId(),
+                $template->getObjType(),
+                $template->getId()
+            )
+        );
 
         $entry = new ilCertificateQueueEntry(
             $template->getObjId(),
diff --git a/components/ILIAS/Certificate/classes/Template/Action/Clone/class.ilCertificateCloneAction.php b/components/ILIAS/Certificate/classes/Template/Action/Clone/class.ilCertificateCloneAction.php
index 94328b7d8755..509a3e85eeb0 100755
--- a/components/ILIAS/Certificate/classes/Template/Action/Clone/class.ilCertificateCloneAction.php
+++ b/components/ILIAS/Certificate/classes/Template/Action/Clone/class.ilCertificateCloneAction.php
@@ -69,8 +69,6 @@ public function cloneCertificate(
             ));
         }
 
-        $certificatePath = $this->pathFactory->create($newObject);
-
         $templates = $this->templateRepository->fetchCertificateTemplatesByObjId($oldObject->getId());
 
         /** @var ilCertificateTemplate $template */
diff --git a/components/ILIAS/Certificate/classes/Template/class.ilCertificateTemplate.php b/components/ILIAS/Certificate/classes/Template/class.ilCertificateTemplate.php
index fa04211552c1..703d01a683e8 100755
--- a/components/ILIAS/Certificate/classes/Template/class.ilCertificateTemplate.php
+++ b/components/ILIAS/Certificate/classes/Template/class.ilCertificateTemplate.php
@@ -18,8 +18,6 @@
 
 declare(strict_types=1);
 
-use ILIAS\ResourceStorage\Identification\ResourceIdentification;
-
 /**
  * @author  Niels Theen <ntheen@databay.de>
  */
@@ -40,6 +38,12 @@ public function __construct(
         private readonly ?int $id = null,
         private readonly bool $deleted = false
     ) {
+        if ($this->obj_type === '' || is_numeric($this->obj_type)) {
+            throw new ilInvalidCertificateException(
+                'Certificate template object type must be a non-numeric string '
+                    . ', got ' . var_export($this->obj_type, true)
+            );
+        }
     }
 
     public function getObjId(): int
diff --git a/components/ILIAS/Certificate/classes/class.ilCertificateAppEventListener.php b/components/ILIAS/Certificate/classes/class.ilCertificateAppEventListener.php
index 51576eb483b3..abaebd213d77 100755
--- a/components/ILIAS/Certificate/classes/class.ilCertificateAppEventListener.php
+++ b/components/ILIAS/Certificate/classes/class.ilCertificateAppEventListener.php
@@ -195,8 +195,9 @@ private function handleLPUpdate(): void
                         $usr_id,
                         $courseTemplate
                     );
-                } catch (ilException $e) {
-                    $this->logger->warning($e->getMessage());
+                } catch (Throwable $e) {
+                    $this->logger->error($e->getMessage());
+                    $this->logger->error($e->getTraceAsString());
                     continue;
                 }
             }

From d582a81fd8516f13f5f7400eb46cc059c29157d5 Mon Sep 17 00:00:00 2001
From: mjansen <mjansen@databay.de>
Date: Tue, 17 Feb 2026 14:47:18 +0100
Subject: [PATCH 072/141] [Fix] Certificate: Add type restrictions for
 templates

---
 .../ILIAS/Certificate/tests/ilCertificateCloneActionTest.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/ILIAS/Certificate/tests/ilCertificateCloneActionTest.php b/components/ILIAS/Certificate/tests/ilCertificateCloneActionTest.php
index e7ac2f372993..37a1526bbc86 100755
--- a/components/ILIAS/Certificate/tests/ilCertificateCloneActionTest.php
+++ b/components/ILIAS/Certificate/tests/ilCertificateCloneActionTest.php
@@ -98,6 +98,8 @@ public function testCloneCertificate(): void
 
         $objectHelper->method('lookupObjId')
             ->willReturn(1000);
+        $objectHelper->method('lookupType')
+            ->willReturn('crs');
 
         $global_certificate_settings = $this->getMockBuilder(ilObjCertificateSettings::class)
             ->disableOriginalConstructor()

From c1a3ed02487c79f3e0e77fa046a8ebffd4a67823 Mon Sep 17 00:00:00 2001
From: Matthias Kunkel <mkunkel@me.com>
Date: Tue, 17 Feb 2026 17:21:05 +0100
Subject: [PATCH 073/141] Removed outdated lang vars and gender mainstreamed
 existing lang vars in German

(cherry picked from commit 18a88b22799fbdee4889dbb62bbbe28de9f8095b)
---
 lang/ilias_de.lang | 123 +++++++++++++++++++++------------------------
 lang/ilias_en.lang |   7 ---
 2 files changed, 58 insertions(+), 72 deletions(-)

diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 3715926308e9..22a4eac3ae5c 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -689,10 +689,10 @@ assessment#:#exp_scored_test_attempt#:#Bewerteter Durchlauf
 assessment#:#exp_type_certificate#:#Zertifikat (PDF)
 assessment#:#exp_type_excel#:#Microsoft Excel
 assessment#:#expected_result_type#:#Erwarteter Ergebnistyp
-assessment#:#export_cert_failed_for_users_p#:#Für die folgenden %s Konten konnte kein Zertifikats-Dokument generiert und in das Archiv gelegt werden: %s. Bitte kontaktieren Sie einen Administrator zur Sichtung der Protokolldateien.
-assessment#:#export_cert_failed_for_users_s#:#Für das folgende Konto konnte kein Zertifikats-Dokument generiert und in das Archiv gelegt werden: %s. Bitte kontaktieren Sie einen Administrator zur Sichtung der Protokolldateien.
-assessment#:#export_cert_ignored_for_users_p#:#Für die folgenden %s Konten liegt kein Zertifikats-Dokument im generierten Archiv, da für diese noch kein Zertifikat ausgestellt wurde: %s
-assessment#:#export_cert_ignored_for_users_s#:#Für das folgende Konto liegt kein Zertifikats-Dokument im generierten Archiv, da für dieses noch kein Zertifikat ausgestellt wurde: %s
+assessment#:#export_cert_failed_for_users_p#:#Für die folgenden %s Konten konnte kein Zertifikat generiert und in das Archiv gelegt werden: %s. Kontaktieren Sie die technische Betreuung zur Sichtung der Protokolldateien.
+assessment#:#export_cert_failed_for_users_s#:#Für das folgende Konto konnte kein Zertifikat generiert und in das Archiv gelegt werden: %s. Kontaktieren Sie die technische Betreuung zur Sichtung der Protokolldateien.
+assessment#:#export_cert_ignored_for_users_p#:#Für die folgenden %s Konten liegt kein Zertifikat im generierten Archiv, da noch kein Zertifikat für diese Konten ausgestellt wurde: %s
+assessment#:#export_cert_ignored_for_users_s#:#Für das folgende Konto liegt kein Zertifikat im generierten Archiv, da noch kein Zertifikat für dieses Konto ausgestellt wurde: %s
 assessment#:#export_cert_no_users#:#Ein Zertifikats-Archiv kann nicht generiert werden, da aktuell keine Teilnehmer existierten.
 assessment#:#export_essay_qst_with_html#:#Exportiere Freitext-Frage mit HTML Code
 assessment#:#export_essay_qst_with_html_desc#:#Wenn aktiviert, haben Sie die Möglichkeit Freitext-Fragen mit dem eingegebenen HTML-Code nach Excel zu exportieren.
@@ -742,11 +742,11 @@ assessment#:#finish_test_no_valid_participants_selected#:#Für die gewählten Te
 assessment#:#finish_test_single#:#Sind Sie sicher, dass Sie den Testdurchlauf für den Teilnehmer "%s" beenden möchten?
 assessment#:#finish_unfinished_passes#:#Beendet noch offene Testdurchläufe
 assessment#:#finish_unfinished_passes_desc#:#Noch nicht beendete Testdurchläufe werden automatisch beendet – vorausgesetzt, es wurde für diese Tests ein Endzeitpunkt festgelegt oder Teilnehmende haben die maximale Bearbeitungsdauer überschritten.
-assessment#:#finished_by_administrator#:#Beendet durch Administrator
-assessment#:#finished_by_cronjob#:#Beendet durch Cron-Job
-assessment#:#finished_by_duration#:#Beendet aufgrund Zeitlimit
-assessment#:#finished_by_participant#:#Beendet durch Teilnehmer
-assessment#:#finished_by_unknown#:#Beendet durch Unbekannt
+assessment#:#finished_by_administrator#:#Administrativ beendet
+assessment#:#finished_by_cronjob#:#Vom System beendet
+assessment#:#finished_by_duration#:#Beendet: Zeitlimit erreicht
+assessment#:#finished_by_participant#:#Selbst beendet
+assessment#:#finished_by_unknown#:#Beendet: Grund unbekannt
 assessment#:#fixed_participants_hint#:#Dieser Test ist nur für die nachfolgend definierte Gruppe von Teilnehmern verfügbar. Soll der Test für alle Personen verfügbar sein, deren Rollen Lesezugriff auf den Test gewähren, müssen Sie im Reiter „Einstellungen“ die Option „Nur ausgewählte Teilnehmer“ deaktivieren.
 assessment#:#fixedparticipants_subtab#:#Ausgewählte Teilnehmer
 assessment#:#flashfile#:#Flash-Datei
@@ -1875,7 +1875,7 @@ assessment#:#tst_settings_header_execution#:#Durchführung: Zugang
 assessment#:#tst_settings_header_intro#:#Informationen zum Einstieg
 assessment#:#tst_settings_header_test_run#:#Durchführung: Steuerung Testdurchlauf
 assessment#:#tst_settings_not_found#:#Fehlende Testeinstellungen
-assessment#:#tst_settings_not_found_msg#:#Testeinstellungen wurden nicht gefunden. Möglicherweise fehlt ein Migrationsschritt. Bitte wenden Sie sich an Ihren Systemadministrator.
+assessment#:#tst_settings_not_found_msg#:#Die Testeinstellungen wurden nicht gefunden. Möglicherweise fehlt ein Migrationsschritt. Wenden Sie sich an die technische Betreuung.
 assessment#:#tst_show_answer_sheet#:#Antwortenübersicht anzeigen
 assessment#:#tst_show_cancel#:#"Test unterbrechen" anzeigen
 assessment#:#tst_show_cancel_description#:#Zeigt während der Durchführung des Tests einen Button an, mit der der Test unterbrochen werden kann. Achtung: Das Unterbrechen des Tests hält nicht die unter „Maximale Bearbeitungsdauer“ festgelegte Bearbeitungszeit an.
@@ -2539,10 +2539,10 @@ book#:#book_add_schedule#:#Zeitplan hinzufügen
 book#:#book_additional_info_file#:#Zusätzliche Beschreibung
 book#:#book_all#:#Alle anzeigen
 book#:#book_all_pools_need_schedules#:#Die Änderungen wurden nicht gespeichert. Alle ausgewählten Buchungspools benötigen mindestens einen Zeitplan.
-book#:#book_all_users#:#Alle Teilnehmer
+book#:#book_all_users#:#Alle Personen
 book#:#book_assign#:#Buchen
-book#:#book_assign_object#:#Für Teilnehmer buchen
-book#:#book_assign_participant#:#Für andere Teilnehmer buchen
+book#:#book_assign_object#:#Für diese Person buchen
+book#:#book_assign_participant#:#Für andere Personen buchen
 book#:#book_back_to_list#:#Zurück zur Liste
 book#:#book_bobj#:#Angebote
 book#:#book_book#:#Buchen
@@ -2558,7 +2558,7 @@ book#:#book_bulk_creation#:#Massenerstellung
 book#:#book_bulk_data#:#Daten zu Angeboten
 book#:#book_cal_entry#:#Buchung:
 book#:#book_confirm_booking#:#Buchung vornehmen
-book#:#book_confirm_booking_for_users#:#Sind Sie sicher, dass Sie dieses Angebot für die folgenden Teilnehmer buchen wollen?
+book#:#book_confirm_booking_for_users#:#Sind Sie sicher, dass Sie dieses Angebot für die folgenden Personen buchen wollen?
 book#:#book_confirm_booking_no_schedule#:#Sind Sie sicher, dass Sie das folgende Angebot buchen wollen?
 book#:#book_confirm_booking_schedule_number_of_objects#:#Buchungsbestätigung
 book#:#book_confirm_booking_schedule_number_of_objects_info#:#Bitte wählen Sie die Anzahl der zu buchenden Angebote.
@@ -2582,13 +2582,13 @@ book#:#book_filter_past_reservations#:#Abgelaufene Buchungen anzeigen
 book#:#book_fromto#:#Datumsbereich
 book#:#book_hours#:#Stunden vor Beginn des Zeitfensters
 book#:#book_is_used#:#In Benutzung
-book#:#book_limit_objects_available#:#Dieses Angebot können Sie nicht für %s Teilnehmer buchen. „%s“ ist nur %s Mal verfügbar.
+book#:#book_limit_objects_available#:#Dieses Angebot können Sie nicht für %s Personen buchen. „%s“ ist nur %s Mal verfügbar.
 book#:#book_list#:#Liste
 book#:#book_log#:#Buchungen
 book#:#book_mail_permanent_link#:#Link zum Buchungspool
 book#:#book_mail_to_booker#:#Mail an den Buchenden
 book#:#book_message#:#Mitteilung
-book#:#book_message_info#:#Sie können hier eine Mitteilung an den Organisator des Buchungspools eingeben.
+book#:#book_message_info#:#Diese Mitteilung sehen die Verantwortlichen des Buchungspools.
 book#:#book_messages#:#Mitteilungen
 book#:#book_messages_info#:#Buchende können einer Buchung eine Mitteilung mitgeben.
 book#:#book_missing_availability#:#Es können leider nicht alle Termine gebucht werden.
@@ -2604,9 +2604,9 @@ book#:#book_not#:#Nicht
 book#:#book_not_enough_preferences#:#Sie haben nicht genügend Präferenzen ausgewählt. Die Präferenzen wurden nicht gespeichert.
 book#:#book_notification#:#Benachrichtigungen über Reservierungen
 book#:#book_notification_cron_not_active#:#Achtung: Der notwendige Cron-Job "Benachrichtigungen über Reservierungen" ist zurzeit nicht aktiviert.
-book#:#book_notification_info#:#Sendet eine Liste der Buchungen des nächsten Tages an den jeweiligen Teilnehmer (nur eigene) und – wenn aktiviert – an die Administratoren.
+book#:#book_notification_info#:#Sendet eine Mail mit den Buchungen für den nächsten Tag an alle Personen, die Benachrichtigungen aktiviert haben.
 book#:#book_nr_of_preferences#:#Anzahl
-book#:#book_nr_of_preferences_info#:#Anzahl an Präferenzen, die jeder Teilnehmer abgeben muss.
+book#:#book_nr_of_preferences_info#:#Anzahl an Präferenzen, die jede Person abgeben muss.
 book#:#book_nr_preferences#:#Präferenzen
 book#:#book_obj_select#:#Auswählen
 book#:#book_object_added#:#Ein Angebot wurde hinzugefügt.
@@ -2617,8 +2617,8 @@ book#:#book_objects_available#:#Verfügbare Angebote: %s
 book#:#book_open#:#Buchungspool öffnen
 book#:#book_overall_limit#:#Gesamtzahl der Buchungen pro Benutzer begrenzen
 book#:#book_overall_limit_warning#:#Sie haben die maximale Anzahl Buchungen erreicht.
-book#:#book_participant_already_assigned#:#Ein oder mehrere Teilnehmer waren bereits zugewiesen.
-book#:#book_participant_assigned#:#Teilnehmer wurde/n hinzugefügt.
+book#:#book_participant_already_assigned#:#Mindestens eine Person war bereits zugewiesen.
+book#:#book_participant_assigned#:#Die Personen wurden hinzugefügt.
 book#:#book_period#:#Dauer
 book#:#book_pool_added#:#Ein Buchungspool wurde angelegt.
 book#:#book_pool_selection#:#Auswahl Buchungspool
@@ -2631,7 +2631,7 @@ book#:#book_pref_book_cron_info#:#Automatische Zuweisung von Buchungen auf der G
 book#:#book_pref_deadline#:#Deadline
 book#:#book_pref_deadline_info#:#Bis zu diesem Zeitpunkt können Präferenzen abgegeben werden.
 book#:#book_pref_overview#:#Übersicht
-book#:#book_preference_info#:#Bitte wählen Sie %1 Präferenz(en) bis %2. Nach der Frist werden die Zuordnungen auf der Basis der Präferenzen aller Teilnehmer automatisch durchgeführt.
+book#:#book_preference_info#:#Bitte wählen Sie %1 Präferenzen bis %2. Nach der Frist werden die Angebote automatisch zugeordnet. Die Präferenzen aller Beteiligten werden nach Möglichkeit berücksichtigt.
 book#:#book_preferences#:#Präferenzen
 book#:#book_preferences_saved#:#Die Präferenzen wurden gespeichert.
 book#:#book_public_log#:#Benutzer sehen alle Buchungen
@@ -2641,9 +2641,9 @@ book#:#book_refresh#:#Aktualisieren
 book#:#book_rem_intro#:#Dies ist eine Übersicht über anstehende Buchungen.
 book#:#book_rem_reason#:#Sie erhalten diese Mail, da Sie die Benachrichtigung der entsprechenden Buchungsobjekte aktiviert haben.
 book#:#book_reminder_day#:#Versenden
-book#:#book_reminder_day_info#:#Sendet eine Liste eigener anstehenden Buchungen und zusätzlich eine Gesamtliste an Benutzenden mit dem Recht „Einstellungen bearbeiten“. Bitte beachten Sie: um Benachrichtigungen zu erhalten, müssen Teilnehmer diese über das Menü „Aktionen" oben rechts im Buchungspool „Benachrichtigungen“ aktiviert haben.
+book#:#book_reminder_day_info#:#Sendet eine Liste eigener anstehender Buchungen und zusätzlich eine Gesamtliste an Personen mit dem Recht „Einstellungen bearbeiten“. Bitte beachten Sie: Um Benachrichtigungen zu erhalten, müssen die Personen diese über das Menü „Aktionen“ oben rechts im Buchungspool „Benachrichtigungen“ aktiviert haben.
 book#:#book_reminder_days#:#Tage vor der Buchung
-book#:#book_reminder_setting#:#Teilnehmer an Reservierung erinnern
+book#:#book_reminder_setting#:#Per Mail an eigene Buchung erinnern
 book#:#book_rerun_assignments#:#Zuweisungen erneut durchführen
 book#:#book_rerun_confirmation#:#Achtung. Die Zuweisung nach Präferenzen ist bereits erfolgt. In seltenen Fällen kann ein Abbruch des Prozesses zu keinen oder unvollständigen Buchungen führen und ein erneutes Starten des Prozesses notwendig machen. Bevor sie den automatischen Prozess erneut starten, müssen sie alle bestehenden Buchungen entfernen, um Mehrfachzuweisungen zu verhindern.
 book#:#book_reservation_available#:#%s verfügbar
@@ -2668,10 +2668,10 @@ book#:#book_schedule_type_fixed#:#Buchung nach festem Zeitplan
 book#:#book_schedule_type_fixed_info#:#Geeignet für Buchungen von Dingen für einen bestimmten Zeitraum, wie Räume, Dienstleistungen oder Geräte.
 book#:#book_schedule_type_none#:#Ohne Zeitplan
 book#:#book_schedule_type_none_direct#:#Buchung ohne Termine
-book#:#book_schedule_type_none_direct_info#:#Dieser Buchungsmodus ist ideal für Präsentationsthemen oder Plätze in Seminaren, die keine festen Zeiten erfordern. Teilnehmende können Elemente direkt nach dem Prinzip „wer zuerst kommt, mahlt zuerst“ buchen. Jedes Element kann nur einmal pro Teilnehmendem gebucht werden.
+book#:#book_schedule_type_none_direct_info#:#Personen können direkt buchen. Der Modus ist geeignet für Referatsthemen oder Seminarplätze, die ohne Termin vergeben werden.
 book#:#book_schedule_type_none_info#:#Dieser Buchungsmodus ist geeignet für die Vergabe von Referatsthemen, Seminarplätzen oder vergleichbaren Angeboten.
 book#:#book_schedule_type_none_preference#:#Automatisch nach Präferenzen verteilen
-book#:#book_schedule_type_none_preference_info#:#Teilnehmer benennen zunächst Präferenzen. Zu einem gewählten Enddatum werden dann die Buchungen automatisch vorgenommen. Der Buchungsmodus ist geeignet für Referatsthemen oder Seminarplätze, die ohne Termin vergeben werden.
+book#:#book_schedule_type_none_preference_info#:#Personen benennen zunächst Präferenzen. Zu einem gewählten Enddatum werden die Buchungen automatisch vorgenommen. Der Buchungsmodus ist geeignet für Referatsthemen oder Seminarplätze, die ohne Termin vergeben werden.
 book#:#book_schedule_updated#:#Der Zeitplan wurde geändert.
 book#:#book_schedule_warning_edit#:#Es sind momentan keine Zeitpläne vorhanden. Um den Pool nutzen zu können, muss zuerst ein Zeitplan angelegt werden. Alternativ wählen Sie einen anderen Typ für den Buchungspool.
 book#:#book_schedules#:#Zeitpläne
@@ -2691,7 +2691,7 @@ book#:#book_your_reservations#:#Ihre Buchungen
 book#:#booking_multiple_succesfully#:#Buchungen erfolgreich durchgeführt
 book#:#booking_nr_of_items#:#Anzahl
 book#:#obj_book_duplicate#:#Buchungspool kopieren
-book#:#participants#:#Teilnehmer
+book#:#participants#:#Personen
 book#:#reservation_deleted#:#Buchung gelöscht
 buddysystem#:#buddy_allow_to_contact_me#:#Kontaktanfragen erlauben
 buddysystem#:#buddy_allow_to_contact_me_default_info#:#Bestimmt ob standardmässig Kontaktanfragen verschickt werden können.
@@ -3521,7 +3521,7 @@ common#:#all_objects#:#Alle Objekte
 common#:#all_roles#:#Alle Rollen
 common#:#all_topics#:#Alle Themen
 common#:#all_users#:#Alle Benutzer
-common#:#allow_assign_users#:#Benutzerzuweisung für lokale Administratoren erlauben
+common#:#allow_assign_users#:#Rolle darf lokalen Konten zugewiesen werden.
 common#:#allow_override_alert#:#Die Regeln der .htaccess-Datei können nicht ausgewertet werden.
 common#:#allow_register#:#Verfügbar im Registrierungsformular
 common#:#allow_user_toggle_noti#:#Mitglied darf Benachrichtigung deaktivieren
@@ -3955,7 +3955,7 @@ common#:#dpro_withdraw_consent_description_external#:#Bitte kehren Sie zu Ihrer
 common#:#dpro_withdraw_consent_description_internal#:#Bitte loggen Sie sich wieder ein, um den Widerrufsvorgang abzuschließen.
 common#:#dpro_withdraw_consent_header#:#Einverständnis zur Datenschutzerklärung widerrufen
 common#:#dpro_withdraw_consent_info#:#Widerrufen der Zustimmung zu der Datenschutzerklärung
-common#:#dpro_withdraw_consent_info_external#:#Bitte benachrichtigen Sie den zuständigen Administrator Ihres Autorisierungssystems, und teilen Sie Ihre Absicht mit.
+common#:#dpro_withdraw_consent_info_external#:#Benachrichtigen Sie die zuständige Administration Ihres Autorisierungssystems, dass Ihr Konto gelöscht werden soll.
 common#:#drafts#:#Entwürfe
 common#:#drag_file_here#:#Ziehen Sie die Datei in diesen Bereich
 common#:#drag_files_here#:#Ziehen Sie die Dateien in diesen Bereich
@@ -4019,7 +4019,7 @@ common#:#err_2_param#:#Nur 2 Parameter!
 common#:#err_auth_apache_failed#:#Die Authentifikation ist fehlgeschlagen.
 common#:#err_auth_ldap_no_ilias_user#:#Die Anmeldung ist fehlgeschlagen. Die LDAP-Authentifizierung war erfolgreich, aber es existiert kein entsprechendes ILIAS-Konto. Bitte kontaktieren Sie Ihre technische Betreuung.
 common#:#err_auth_mode_inactive#:#Zur Zeit ist leider keine Anmeldung möglich.
-common#:#err_auth_soap_no_ilias_user#:#Anmeldung fehlgeschlagen! Die SOAP-Authentifizierung war erfolgreich, aber es existiert kein entsprechender ILIAS-Benutzer. Bitte kontaktieren Sie Ihren Systemadministrator.
+common#:#err_auth_soap_no_ilias_user#:#Die Anmeldung ist fehlgeschlagen. Die SOAP-Authentifizierung war erfolgreich, aber es existiert kein entsprechendes ILIAS-Konto. Bitte kontaktieren Sie die technische Betreuung.
 common#:#err_check_input#:#Die Einstellungen konnten nicht gespeichert werden. Bitte überprüfen Sie Ihre Eingaben.
 common#:#err_count_param#:#Grund: Falsche Parameteranzahl
 common#:#err_disabled#:#Die Kontoerstellung via Shibboleth wurde deaktiviert. Bitte kontaktieren Sie die Systemadministration für weitere Informationen.
@@ -5005,7 +5005,6 @@ common#:#obj_nots_desc#:#Notizfunktion administrieren
 common#:#obj_nwss#:#Neuigkeiten und Webfeeds
 common#:#obj_nwss_desc#:#Einstellungen für interne Neuigkeiten und externe Webfeeds
 common#:#obj_objf#:#Objektdefinitionen
-common#:#obj_objf_desc#:#ILIAS-Objekttypen und -rechte. (Nur für Experten!)
 common#:#obj_orgu#:#Organisationseinheit
 common#:#obj_orgu_description#:#Anlage und Verwaltung der Organisationsstruktur
 common#:#obj_page#:#Seite
@@ -5788,7 +5787,7 @@ common#:#tos_withdraw_consent_description_external#:#Bitte kehren Sie zu Ihrer H
 common#:#tos_withdraw_consent_description_internal#:#Bitte loggen Sie sich wieder ein, um den Widerrufsvorgang abzuschließen.
 common#:#tos_withdraw_consent_header#:#Einverständnis zur Nutzungsvereinbarung widerrufen
 common#:#tos_withdraw_consent_info#:#Zustimmung zur Nutzungsvereinbarung widerrufen
-common#:#tos_withdraw_consent_info_external#:#Bitte benachrichtigen Sie den zuständigen Administrator Ihres Autorisierungssystems, und teilen Sie Ihre Absicht mit.
+common#:#tos_withdraw_consent_info_external#:#Benachrichtigen Sie die zuständige Administration Ihres Autorisierungssystems, dass Ihr Konto gelöscht werden soll.
 common#:#total#:#Gesamt
 common#:#tracking_settings#:#Einstellungen
 common#:#translation#:#Übersetzung
@@ -5919,7 +5918,7 @@ common#:#usr_filter_lastlogin#:#Letztes Login eines Benutzers
 common#:#usr_filter_role#:#Zugewiesene Rolle
 common#:#usr_inactive_only#:#Nur nicht-aktive Benutzer
 common#:#usr_limited_access_only#:#Nur Benutzer mit Zugangsbefristung
-common#:#usr_name_undisclosed#:#Nicht freigegeben
+common#:#usr_name_undisclosed#:#Profil nicht veröffentlicht
 common#:#usr_new#:#Neuer Benutzer
 common#:#usr_settings_changeable_lua#:#Änderbar in „Lokale Konten“ in Kategorien
 common#:#usr_settings_explanation_profile#:#Pro Datenfeld kann der Zugriff in Profil, Mitglieder-Reitern und lokalen Konten konfiguriert werden:<ul><li>Sichtbar: Angabe wird angezeigt, kann aber nicht geändert werden.</li><li>Änderbar: Angabe wird angezeigt und kann geändert werden.</li><li>Export: Angabe kann in Listen der Teilnehmerinnen und Teilnehmern exportiert werden.</li><li>Durchsuchbar: Nach der Angabe kann gesucht werden, und es gibt eine Autovervollständigung in Formularfeldern.</li><li>Bei der Einstellung „Erforderliche Angabe“ ist die Eingabe verpflichtend.</li></ul>Unabhängig von diesen Einstellungen kann die Systemadministration alle Daten ändern.
@@ -7340,7 +7339,7 @@ content#:#st#:#Kapitel
 content#:#start_lm#:#Lernmodul starten
 content#:#text_repr#:#Alternativtext
 content#:#text_repr_info#:#Wird verwendet, wenn die Grafik nicht angezeigt werden kann.
-copa#:#copa_activation_online_info#:#Nur wenn die Inhaltsseite online geschaltet ist, können Benutzer auf die Inhaltsseite zugreifen. Wenn nicht, ist die Inhaltsseite nur für Administratoren verfügbar.
+copa#:#copa_activation_online_info#:#Objekt ist veröffentlicht und kann von allen Personen mit dem Recht „Lesezugriff“ genutzt werden. Andernfalls ist das Objekt nur für Personen mit dem Recht „Einstellungen bearbeiten“ verfügbar.
 copa#:#copa_add#:#Inhaltsseite anlegen
 copa#:#copa_btn_lp_toggle_state_completed#:#Auf "Nicht bearbeitet" setzen
 copa#:#copa_btn_lp_toggle_state_not_completed#:#Auf "Bearbeitet" setzen
@@ -8933,7 +8932,7 @@ didactic#:#sess_closed#:#Geschlossene Sitzung
 didactic#:#sess_closed_info#:#Die Sitzung ist für Nicht-Teilnehmer unsichtbar.
 dpro#:#dpro_accept_usr_agreement_anonymous#:#Datenschutzerklärung
 dpro#:#dpro_accept_usr_agreement_anonymous_intro#:#Bevor Sie zu ILIAS wechseln, akzeptieren Sie die folgende Datenschutzerklärung.
-dpro#:#dpro_account_reg_not_possible#:#Eine Selbstregistrierung ist aktuell nicht möglich, da in dieser Installation keine Datenschutzerklärung angeboten wird. Bitte kontaktieren Sie Ihren <a href="%1$s">Systemadministrator</a> für weitere Informationen.
+dpro#:#dpro_account_reg_not_possible#:#Eine Selbstregistrierung ist aktuell nicht möglich, da in dieser Installation keine Datenschutzerklärung angeboten wird. Bitte kontaktieren Sie die <a href="%1$s">technische Betreuung</a> für weitere Informationen.
 dpro#:#dpro_agree_date#:#Datenschutzerklärung zugestimmt am
 dpro#:#dpro_last_reset_date#:#Die Datenschutzerklärung wurde zuletzt am %s zurückgesetzt. Setzen Sie die Datenschutzerklärung nur zurück, wenn sich die Dokumente in der Zwischenzeit geändert haben und eine Zustimmung zu dieser geänderten Vereinbarung gewünscht ist.
 dpro#:#dpro_mode#:#Zustimmungsmodus
@@ -9384,7 +9383,7 @@ exc#:#exc_individual_deadline#:#Individueller Abgabetermin
 exc#:#exc_individual_deadline_action#:#Individuellen Abgabetermin setzen
 exc#:#exc_individual_deadline_before_global#:#Das Datum muss hinter der (letzten) Deadline liegen: %s.
 exc#:#exc_instruction_files#:#Dateien zur Arbeitsanweisung
-exc#:#exc_instruction_migration_not_run#:#Die Migration der Dateien zur Arbeitsanweisung ist noch nicht abgeschlossen. Kontaktieren Sie ihren Systemadministrator.
+exc#:#exc_instruction_migration_not_run#:#Die Migration der Dateien zur Arbeitsanweisung ist noch nicht abgeschlossen. Kontaktieren Sie die technische Betreuung.
 exc#:#exc_late_submission#:#Verspätete Abgabe
 exc#:#exc_late_submission_warning#:#Abgaben nach %s werden als verspätet gekennzeichnet.
 exc#:#exc_lead_request_idl#:#Abgabefrist anfragen
@@ -10129,9 +10128,9 @@ forum#:#frm_revoke_censorship#:#Zensur aufheben
 forum#:#frm_search#:#Suche
 forum#:#frm_selected_merge_src#:#Gewähltes Thema für die Zusammenführung: %s
 forum#:#frm_settings_form_header#:#Einstellungen des Forums
-forum#:#frm_settings_mod_functions_header#:#Funktionen für Moderation
+forum#:#frm_settings_mod_functions_header#:#Moderation
 forum#:#frm_settings_privacy_header#:#Datenschutz
-forum#:#frm_settings_user_functions_header#:#Funktionen für Teilnehmer
+forum#:#frm_settings_user_functions_header#:#Beiträge und Themen
 forum#:#frm_statistics#:#Statistik
 forum#:#frm_statistics_disabled_for_participants#:#Die Statistik ist für normale Forennutzer nicht sichtbar.
 forum#:#frm_statistics_enabled#:#Statistik anzeigen
@@ -10943,7 +10942,7 @@ ldap#:#ldap_username_filter_info#:#Der Anmeldenamen-Filter kann optional verwend
 ldoc#:#deleteDocument#:#Löschen
 ldoc#:#detachCriterionAssignment#:#Löschen
 ldoc#:#ldoc_acceptance_history#:#Zustimmungshistorie
-ldoc#:#ldoc_account_reg_not_possible#:#Eine Selbstregistrierung ist aktuell nicht möglich, da in dieser Installation keine Benutzervereinbarung angeboten wird. Bitte kontaktieren Sie Ihren <a href="%1$s">Systemadministrator</a> für weitere Informationen.
+ldoc#:#ldoc_account_reg_not_possible#:#Eine Selbstregistrierung ist aktuell nicht möglich, da in dieser Installation keine Nutzungsvereinbarung angeboten wird. Bitte kontaktieren Sie die <a href="%1$s">technische Betreuung</a> für weitere Informationen.
 ldoc#:#ldoc_add_document_btn_label#:#Dokument hinzufügen
 ldoc#:#ldoc_agreement_document#:#Dokument
 ldoc#:#ldoc_agreement_document_missing#:#Nicht vorhanden
@@ -11566,11 +11565,11 @@ mail#:#mail_email_usr_subject#:#Test-E-Mail „Benutzer-Mail”
 mail#:#mail_empty_trash#:#Papierkorb leeren
 mail#:#mail_empty_trash_confirmation#:#Sind Sie sicher, dass alle Mails im Papierkorb gelöscht werden sollen?
 mail#:#mail_enable_crs_admin_notification#:#Kursadministration benachrichtigen
-mail#:#mail_enable_crs_admin_notification_info#:#Kursbetreuung und Kursadministration erhalten in neuen Kursen Mails, wenn ein Mitglied beitritt, den Kurs verlässt oder die Mindestanzahl an Teilnehmerinnen und Teilnehmern zur Durchführung des Kurses nicht erreicht wird. Diese Einstellung kann für einzelne Kurse lokal im Reiter „Mitglieder“ geändert werden.
+mail#:#mail_enable_crs_admin_notification_info#:#Kursbetreuung und Kursadministration erhalten in neuen Kursen Mails, wenn ein Mitglied beitritt, den Kurs verlässt oder die Mindestanzahl an Mitgliedern zur Durchführung des Kurses nicht erreicht wird. Diese Einstellung kann für einzelne Kurse lokal im Reiter „Mitglieder“ geändert werden.
 mail#:#mail_enable_crs_member_notification#:#Mitglieder benachrichtigen
 mail#:#mail_enable_crs_member_notification_info#:#Mitglieder erhalten automatisch eine E-Mail, wenn sich ihr Mitgliedsstatus ändert. Diese Einstellung betrifft alle Kurse der Plattform.
 mail#:#mail_enable_grp_admin_notification#:#Gruppenadministration benachrichtigen
-mail#:#mail_enable_grp_admin_notification_info#:#Die Gruppenadministration erhält in neuen Gruppen Mails, wenn ein Mitglied beitritt, die Gruppe verlässt oder die Mindestanzahl an Teilnehmerinnen und Teilnehmern zur Durchführung der Gruppe nicht erreicht wird. Diese Einstellung kann für einzelne Gruppe lokal im Reiter „Mitglieder“ geändert werden.
+mail#:#mail_enable_grp_admin_notification_info#:#Die Gruppenadministration erhält in neuen Gruppen Mails, wenn ein Mitglied beitritt, die Gruppe verlässt oder die Mindestanzahl an Mitgliedern zur Durchführung der Gruppe nicht erreicht wird. Diese Einstellung kann für einzelne Gruppe lokal im Reiter „Mitglieder“ geändert werden.
 mail#:#mail_enable_grp_member_notification#:#Mitglieder benachrichtigen
 mail#:#mail_enable_grp_member_notification_info#:#Mitglieder erhalten automatisch eine E-Mail, wenn sich ihr Mitgliedsstatus ändert. Diese Einstellung betrifft alle Gruppen der Plattform.
 mail#:#mail_enable_lso_admin_notification#:#Administration der Lernsequenz benachrichtigen
@@ -11638,7 +11637,7 @@ mail#:#mail_mark_unread#:#Als ungelesen markieren
 mail#:#mail_max_size_attachments_total#:#Bitte geben Sie die maximal zulässige Gesamtgröße aller Anhänge pro E-Mail an. Diese Einstellung hat keinen Einfluss auf das Hochladen von Dateien (hier gelten die Serverlimitierungen, z.B. upload_max_filesize), sondern lediglich auf die Gesamtdatenmenge der als Anhang einer Mail ausgewählten Dateien.
 mail#:#mail_max_size_attachments_total_error#:#Die maximal zulässige Gesamtgröße aller Anhänge beträgt:
 mail#:#mail_maxsize_attachment_error#:#Die maximale Dateigröße beträgt:
-mail#:#mail_member_notification#:#Teilnehmerbenachrichtigung
+mail#:#mail_member_notification#:#Benachrichtigungen
 mail#:#mail_members_of_mailing_list#:#Mitglieder der Verteilerliste „%s“
 mail#:#mail_members_search_continue#:#Weiter
 mail#:#mail_message_send#:#Die Mail wurde versandt.
@@ -12765,7 +12764,6 @@ meta#:#meta_source#:#Quelle
 meta#:#meta_status#:#Status
 meta#:#meta_string#:#Text
 meta#:#meta_structure#:#Struktur
-meta#:#meta_subjectmatterexpert#:#Experte für das Thema
 meta#:#meta_tab_advmd#:#Benutzerdefinierte Metadaten
 meta#:#meta_tab_advmd_def#:#Metadatensätze verwalten
 meta#:#meta_tab_lom#:#LOM
@@ -12811,7 +12809,6 @@ mmbr#:#mmbr_btn_mail_selected_users#:#Mail verschicken
 mmbr#:#mmbr_info_delete_sure_unsubscribe#:#Wollen Sie wirklich die Mitgliedschaft für die folgenden Kurse und Gruppen beenden?
 mmbr#:#mmbr_memberships#:#Mitgliedschaften
 mmbr#:#mmbr_role_error#:#Mitglieder müssen mindestens eine Rolle haben.
-mmbr#:#mmbr_selected_users#:#Ausgewählte Teilnehmer
 mmbr#:#mmbr_unsubscribed_from_objs#:#Sie wurden von den ausgewählten Objekten abgemeldet.
 mme#:#add_languages#:#Sprache hinzufügen
 mme#:#additional_langs#:#Zusätzliche Sprachen
@@ -13284,10 +13281,8 @@ orgu#:#org_op_edit_employee_talk#:#Gespräche bearbeiten
 orgu#:#org_op_edit_individual_plan#:#Individuellen Plan bearbeiten
 orgu#:#org_op_edit_submissions_grades#:#Abgaben von anderen Benutzern bearbeiten
 orgu#:#org_op_manage_members#:#Mitglieder bearbeiten
-orgu#:#org_op_manage_participants#:#Teilnehmer verwalten
 orgu#:#org_op_read_employee_talk#:#Auf Gespräche lesend zugreifen
 orgu#:#org_op_read_learning_progress#:#Lernfortschritt von anderen Benutzern einsehen
-orgu#:#org_op_score_participants#:#Teilnehmer bewerten
 orgu#:#org_op_view_certificates#:#Zertifikate von anderen Benutzern einsehen
 orgu#:#org_op_view_competences#:#Kompetenzen von anderen Benutzern einsehen
 orgu#:#org_op_view_individual_plan#:#Individuellen Plan einsehen
@@ -13415,21 +13410,21 @@ poll#:#poll_cannot_set_online_no_answers#:#Der Status kann nicht auf &quot;onlin
 poll#:#poll_chart_votes#:#Stimmen
 poll#:#poll_comments#:#Kommentare
 poll#:#poll_copy#:#Abstimmung kopieren
-poll#:#poll_delete_votes#:#Stimmen aller Teilnehmenden löschen
-poll#:#poll_delete_votes_sure#:#Sind Sie sicher, dass Sie die Stimmen aller Teilnehmenden dieser Abstimmung löschen möchten?
+poll#:#poll_delete_votes#:#Alle Stimmabgaben löschen
+poll#:#poll_delete_votes_sure#:#Sind Sie sicher, dass Sie alle Stimmabgaben löschen möchten?
 poll#:#poll_edit#:#Abstimmung editieren
 poll#:#poll_edit_question#:#Frage bearbeiten
 poll#:#poll_image#:#Bild
 poll#:#poll_import#:#Abstimmung importieren
 poll#:#poll_limit_not_below_answer_count#:#Die begrenzte Anzahl muss kleiner sein als die Anzahl der möglichen Antworten.
-poll#:#poll_limit_number_of_answers#:#Anzahl Antworten je Teilnehmer begrenzen
-poll#:#poll_max_number_of_answers#:#Maximale Antworten
+poll#:#poll_limit_number_of_answers#:#Anzahl Antworten begrenzen
+poll#:#poll_max_number_of_answers#:#Maximale Anzahl pro Person
 poll#:#poll_max_number_of_answers_info#:#Sie dürfen bis zu %s Antworten auswählen.
 poll#:#poll_mode#:#Modus
 poll#:#poll_mode_anonymous#:#Ohne Namen / Anonym
-poll#:#poll_mode_anonymous_info#:#Im Tab "Abstimmungsergebnisse" werden Namen der Teilnehmenden nicht aufgeführt. Systeminterne IDs der Teilnehmenden werden allerding in der Datenbank gespeichert.
+poll#:#poll_mode_anonymous_info#:#Im Reiter „Abstimmungsergebnisse“ werden keine Namen aufgeführt. Systeminterne IDs der teilnehmenden Personen werden in der Datenbank gespeichert.
 poll#:#poll_mode_personal#:#Mit Namen
-poll#:#poll_mode_personal_info#:#Im Tab "Abstimmungsergebnisse" werden die Namen der Teilnehmenden mit ihren Antworten aufgeführt. Wer Zugriff auf diesen Tab hat, kann prüfen, wer welche Antwort gegeben hat.
+poll#:#poll_mode_personal_info#:#Im Reiter „Abstimmungsergebnisse“ werden die Namen der teilnehmenden Personen mit ihren Antworten aufgeführt.
 poll#:#poll_new#:#Neue Abstimmung anlegen
 poll#:#poll_non_anonymous_warning#:#Ihr Name und Votum sind für die Administration in den Ergebnissen sichtbar.
 poll#:#poll_notification_activated#:#Änderungs-Benachrichtigung aktiviert
@@ -13437,15 +13432,15 @@ poll#:#poll_notification_deactivated#:#Änderungs-Benachrichtigung deaktiviert
 poll#:#poll_notification_subscribe#:#Benachrichtigung aktivieren
 poll#:#poll_notification_unsubscribe#:#Benachrichtigung deaktivieren
 poll#:#poll_percentage#:#Aktueller Anteil
-poll#:#poll_population#:#%s Teilnehmende
-poll#:#poll_population_singular#:#1 Teilnehmer
+poll#:#poll_population#:#%s Stimmabgaben
+poll#:#poll_population_singular#:#Eine Stimmabgabe
 poll#:#poll_question#:#Frage
 poll#:#poll_result#:#Abstimmungsergebnisse
 poll#:#poll_result_answers#:#Stimmen
 poll#:#poll_result_sorting#:#Sortierung
 poll#:#poll_result_sorting_answers#:#In der Reihenfolge der Antworten
 poll#:#poll_result_sorting_votes#:#Nach Anzahl der Stimmen (absteigend)
-poll#:#poll_result_users#:#Teilnehmer
+poll#:#poll_result_users#:#Pro Person
 poll#:#poll_show_results_as#:#Ergebnisse anzeigen als
 poll#:#poll_sortorder#:#Sortierung
 poll#:#poll_stacked_chart#:#Stapeldiagramm
@@ -13630,7 +13625,7 @@ prg#:#prg_import_action_not_allowed#:#Studienprogramme unterstützen keinen Impo
 prg#:#prg_invalidate_expired_progresses_desc#:#Setzt 'Gültigkeit' auf 'ungültig' wenn Ablaufdatum erreicht.
 prg#:#prg_invalidate_expired_progresses_title#:#Zeitlich begrenzte Gültigkeit von Studienprogrammen
 prg#:#prg_link#:#Link
-prg#:#prg_mail_context_info#:#Für die Teilnehmer-E-Mails auf den Mitglieds- und Lernfortschrittsansichten eines Studienprogramms
+prg#:#prg_mail_context_info#:#Mails, die aus den Reitern „Zuweisungen“ oder „Lernfortschritt“ eines Studienprogramms versendet werden.
 prg#:#prg_mail_context_title#:#Studienprogramm: Mail an Mitglieder
 prg#:#prg_mail_permanent_link#:#Wählen Sie den folgenden Link, um auf den Inhalt des Studienprogramms zuzugreifen:
 prg#:#prg_manage#:#Verwalten
@@ -13688,7 +13683,7 @@ prg#:#prg_remove_user_success#:#Die Zuweisung wurde entfernt.
 prg#:#prg_remove_users_not_possible#:#Ausgewählte Benutzer können nicht entfernt werden.
 prg#:#prg_remove_users_partial_success#:#Zuweisungen (teilweise) entfernt.
 prg#:#prg_remove_users_success#:#Ausgewählte Benutzer wurden entfernt.
-prg#:#prg_restart_assignments_temporal_progress_desc#:#Bucht Teilnehmer erneut auf Studienprogramme wenn Wiederholungszeitraum beginnt.
+prg#:#prg_restart_assignments_temporal_progress_desc#:#Weist Personen erneut Studienprogrammen zu, sobald der Wiederholungszeitraum beginnt.
 prg#:#prg_restart_assignments_temporal_progress_title#:#Automatische Wiederaufnahme in Studienprogramme
 prg#:#prg_save_tree_order#:#Reihenfolge des Baums speichern
 prg#:#prg_saved_order_successful#:#Reihenfolge des Baums erfolgreich gespeichert.
@@ -13759,7 +13754,7 @@ prg#:#prg_validity_of_qualification_limit#:#Ablauf der Gültigkeit
 prg#:#prg_validity_of_qualification_restart#:#Wiederaufnahme
 prg#:#prg_view#:#Anzeigen
 prg#:#prgr_may_not_create_circular_reference#:#Das Verlinken dieses Programms ist hierher nicht möglich, da das beinhaltende Programm darin erhalten ist.
-prg#:#re_assigned_mail_body#:#%s %s,<br/><br/>Sie wurden erneut dem Studienprogramm „%s“ als Teilnehmer zugeordnet.
+prg#:#re_assigned_mail_body#:#%s %s,<br/><br/>Sie wurden dem Studienprogramm „%s“ erneut zugewiesen.
 prg#:#re_assigned_mail_subject#:#Erneute Teilnahme am Studienprogramm
 prg#:#restart_information#:#Wiederaufnahme (in Tagen) vor Ablauf der Qualifikation
 prg#:#restart_period#:#Automatische Wiederaufnahme vor Ablauf der Qualifikation
@@ -13989,7 +13984,7 @@ ps#:#ps_grp_user_fields#:#Persönliche Angaben zu dieser Gruppe
 ps#:#ps_login_max_attempts#:#Maximale Anzahl von Anmeldeversuchen
 ps#:#ps_login_max_attempts_info#:# Bestimmt wie viele Anmeldeversuche eines Benutzer höchstens fehlschlagen dürfen. Schlagen mehr Anmeldeversuche fehl, wird dieser Benutzer auf 'inaktiv' gesetzt und muss im 'Benutzer Management' wieder aktiviert werden, bevor er die Plattform benutzen kann. Wird kein Wert eingetragen, ist die Funktion deaktiviert und ILIAS zählt die fehlgeschlagenen Anmeldeversuche nicht.
 ps#:#ps_not_accepted#:#Nicht zugestimmt
-ps#:#ps_participants_list_courses#:#Aktivierung von Teilnehmerlisten in der Galerie der Kurse erlauben
+ps#:#ps_participants_list_courses#:#Aktivierung der Teilnahmeliste in Galerien von Kursen erlauben
 ps#:#ps_passwd_policy_change_force_user_reset_succ#:#Die Aktion wurde erfolgreich durchgeführt.
 ps#:#ps_passwd_policy_changed_force_user_reset#:#Die Änderungen wurden erfolgreich übernommen. Sie haben mindestens eine Änderung bzgl. der Passwortrichtlinie vorgenommen. Möchten Sie, dass lokale Anmeldekonten nach der nächsten erfolgreichen Anmeldung ein neues Passwort vergeben müssen?
 ps#:#ps_password_change_on_first_login_enabled#:#Passwort ändern bei Erstanmeldung
@@ -14013,9 +14008,9 @@ ps#:#ps_privacy_protection#:#Einstellungen für den Datenschutz
 ps#:#ps_profile_export#:#Schutz der Daten des Persönlichen Profils
 ps#:#ps_security_protection#:#Einstellungen zur Sicherheit
 ps#:#ps_select_one#:#Bitte wählen Sie eine Datei aus.
-ps#:#ps_show_crs_access#:#Anzeige der letzten Zugriffszeit von Kursteilnehmern
-ps#:#ps_show_grp_access#:#Anzeige der letzten Zugriffszeit von Gruppenteilnehmern
-ps#:#ps_show_lso_access#:#Anzeige der letzten Zugriffszeit von Lernsequenzteilnehmern
+ps#:#ps_show_crs_access#:#Anzeige der letzten Zugriffszeit von Kursmitgliedern
+ps#:#ps_show_grp_access#:#Anzeige der letzten Zugriffszeit von Gruppenmitgliedern
+ps#:#ps_show_lso_access#:#Anzeige der letzten Zugriffszeit von Lernsequenzmitgliedern
 ps#:#ps_size#:#Dateigröße
 ps#:#ps_type_select#:#Auswahlliste
 ps#:#ps_type_select_long#:#Auswahlliste (feste Werte)
@@ -15217,8 +15212,6 @@ rtst#:#rtst_call#:#ECS-Test aufrufen
 rwik#:#rwik_call#:#ECS-Wiki aufrufen
 sahs#:#cont_insert_after_chap#:#Elemente nach einem Kapitel einfügen.
 sahs#:#cont_insert_into_chap#:#Elemente innerhalb eines Kapitels einfügen.
-sahs#:#sahs_activate_expert_mode#:#Sequencing-Expertenmodus aktivieren
-sahs#:#sahs_activate_expert_mode_info#:#In diesem Modus können Sie direkt die Sequencing-Informationen des SCORM-Packages editieren. Achtung: ILIAS prüft dabei nicht Ihre Eingaben auf Gültigkeit.
 sahs#:#sahs_add#:#SCORM-Lernmodul anlegen
 sahs#:#sahs_authoring_mode#:#Autorenmodus
 sahs#:#sahs_authoring_mode_info#:#Die SCORM ZIP-Datei muß mit dem ILIAS-SCORM-Editor erstellt worden sein und als SCORM 1.2/2004 Package exportiert worden sein.
@@ -15736,7 +15729,7 @@ shib#:#shib_account_creation_enabled#:#Aktiviert
 shib#:#shib_account_creation_enabled_info#:#Ein aktives neues Anmeldekonto wird angelegt.
 shib#:#shib_account_creation_info#:#Die Kontoerstellung wird ausgelöst, wenn ein Benutzer ohne ein bereits bestehendes ILIAS-Konto versucht, sich über Shibboleth anzumelden.
 shib#:#shib_account_creation_with_approval#:#Mit Freischaltung
-shib#:#shib_account_creation_with_approval_info#:#Ein inaktives neues Anmeldekonto wird angelegt. Das Konto bleibt inaktiv, bis es von einem Administrator freigeschaltet wird.
+shib#:#shib_account_creation_with_approval_info#:#Ein inaktives neues Anmeldekonto wird angelegt. Das Konto bleibt inaktiv, bis es von der technischen Betreuung freigeschaltet wird.
 shib#:#shib_add_missing#:#Fehlende Rollen zuordnen
 shib#:#shib_add_remove#:#Rollen hinzufügen/entfernen
 shib#:#shib_assignment_type#:#Art der Zuordnung
@@ -17721,7 +17714,7 @@ user#:#usr_id#:#Systeminterne ID
 user#:#usr_letter_avatars#:#Letter-Avatare
 user#:#usr_letter_avatars_info#:#Wenn kein öffentliches Profilbild vorliegt, zeigt ILIAS als Avatar die Initialen des Vor- und Nachnamens bzw. Anmeldenamens an.
 user#:#usr_public_profile_disabled#:#Profil deaktiviert
-user#:#usr_public_profile_disabled_info#:#Ihre Angaben sind nur für Systemadministratoren einsehbar.
+user#:#usr_public_profile_disabled_info#:#Nur Ihr Anmeldename wird öffentlich angezeigt. Weitere persönliche Daten sind nur für Personen mit Zugriff auf die Kontenverwaltung einsehbar.
 user#:#usr_public_profile_global#:#WWW / Für alle Benutzer des Internets sichtbar
 user#:#usr_public_profile_logged_in#:#Für angemeldete Benutzer sichtbar
 usr#:#user_action#:#Benutzeraktion
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index bac32e256c4b..10477560e93f 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -5007,7 +5007,6 @@ common#:#obj_nots_desc#:#Notes settings
 common#:#obj_nwss#:#News and Web Feeds
 common#:#obj_nwss_desc#:#Settings for internal news and external web feeds.
 common#:#obj_objf#:#Object Definitions
-common#:#obj_objf_desc#:#Manage ILIAS object types and object permissions. (only for experts!)
 common#:#obj_orgu#:#Organisational Unit
 common#:#obj_orgu_description#:#Creating and editing organisational structure
 common#:#obj_page#:#Page
@@ -12738,7 +12737,6 @@ meta#:#meta_source#:#Source
 meta#:#meta_status#:#Status
 meta#:#meta_string#:#Text
 meta#:#meta_structure#:#Structure
-meta#:#meta_subjectmatterexpert#:#Subject matter expert(s)
 meta#:#meta_tab_advmd#:#Custom Metadata
 meta#:#meta_tab_advmd_def#:#Manage Custom Metadata Sets
 meta#:#meta_tab_lom#:#LOM
@@ -12784,7 +12782,6 @@ mmbr#:#mmbr_btn_mail_selected_users#:#Send Mail
 mmbr#:#mmbr_info_delete_sure_unsubscribe#:#Are you sure you want to unsubscribe from the following objects?
 mmbr#:#mmbr_memberships#:#Memberships
 mmbr#:#mmbr_role_error#:#Members must have at least one role assigned.
-mmbr#:#mmbr_selected_users#:#Selected Participants
 mmbr#:#mmbr_unsubscribed_from_objs#:#You have been unsubscribed from the selected objects.
 mme#:#add_languages#:#Add Language
 mme#:#additional_langs#:#Additional Languages
@@ -13257,10 +13254,8 @@ orgu#:#org_op_edit_employee_talk#:#Edit Talk appointments
 orgu#:#org_op_edit_individual_plan#:#Edit Individual Plan
 orgu#:#org_op_edit_submissions_grades#:#Edit submissions of other users
 orgu#:#org_op_manage_members#:#Manage Members
-orgu#:#org_op_manage_participants#:#Manage Participants
 orgu#:#org_op_read_employee_talk#:#Read access talk appointments
 orgu#:#org_op_read_learning_progress#:#View learning progress of other users
-orgu#:#org_op_score_participants#:#Score Participants
 orgu#:#org_op_view_certificates#:#View certificates of other users
 orgu#:#org_op_view_competences#:#View competences of other users
 orgu#:#org_op_view_individual_plan#:#View Individual Plan
@@ -15190,8 +15185,6 @@ rtst#:#rtst_call#:#Call ECS Test
 rwik#:#rwik_call#:#Call ECS Wiki
 sahs#:#cont_insert_after_chap#:#Insert items after chapter
 sahs#:#cont_insert_into_chap#:#Insert items inside chapter
-sahs#:#sahs_activate_expert_mode#:#Activate Sequencing Expert Mode
-sahs#:#sahs_activate_expert_mode_info#:#The sequencing expert mode allows you to directly edit the sequencing information of the package tree. If you are unsure what this means we recommend to use the default sequencing behaviour.
 sahs#:#sahs_add#:#Create SCORM Learning Module
 sahs#:#sahs_authoring_mode#:#Authoring Mode
 sahs#:#sahs_authoring_mode_info#:#The SCORM ZIP package must have been created with the ILIAS SCORM editor and it must have been exported as SCORM 1.2/2004 package.

From 5e8f79722d45874ca32789836c3fb6b7c5be27aa Mon Sep 17 00:00:00 2001
From: Alexander Killing <killing@leifos.de>
Date: Tue, 17 Feb 2026 21:37:19 +0100
Subject: [PATCH 074/141] 45550: Offline/Online in tab Settings ignored

---
 components/ILIAS/Portfolio/classes/class.ilObjPortfolio.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/ILIAS/Portfolio/classes/class.ilObjPortfolio.php b/components/ILIAS/Portfolio/classes/class.ilObjPortfolio.php
index cb2cf65dfa99..1d7f99bdc8d2 100755
--- a/components/ILIAS/Portfolio/classes/class.ilObjPortfolio.php
+++ b/components/ILIAS/Portfolio/classes/class.ilObjPortfolio.php
@@ -67,6 +67,7 @@ public static function getPortfoliosOfUser(
             " ORDER BY od.title");
         $res = array();
         while ($rec = $ilDB->fetchAssoc($set)) {
+            $rec["is_online"] = !ilObject::lookupOfflineStatus($rec["id"]);
             $res[] = $rec;
         }
         return $res;

From 21eae3a8271f6e9fc9bc33e177c719ae1fca6088 Mon Sep 17 00:00:00 2001
From: Abraham <abrahammordev@gmail.com>
Date: Wed, 18 Feb 2026 09:39:59 +0100
Subject: [PATCH 075/141] fix: Update Survey access code language variable

---
 components/ILIAS/Survey/Settings/class.SettingsFormGUI.php | 2 +-
 lang/ilias_ar.lang                                         | 2 +-
 lang/ilias_bg.lang                                         | 2 +-
 lang/ilias_cs.lang                                         | 2 +-
 lang/ilias_da.lang                                         | 2 +-
 lang/ilias_de.lang                                         | 2 +-
 lang/ilias_el.lang                                         | 2 +-
 lang/ilias_en.lang                                         | 2 +-
 lang/ilias_es.lang                                         | 2 +-
 lang/ilias_et.lang                                         | 2 +-
 lang/ilias_fa.lang                                         | 2 +-
 lang/ilias_fr.lang                                         | 2 +-
 lang/ilias_hr.lang                                         | 2 +-
 lang/ilias_hu.lang                                         | 2 +-
 lang/ilias_it.lang                                         | 2 +-
 lang/ilias_ja.lang                                         | 2 +-
 lang/ilias_ka.lang                                         | 2 +-
 lang/ilias_lt.lang                                         | 2 +-
 lang/ilias_nl.lang                                         | 2 +-
 lang/ilias_pl.lang                                         | 2 +-
 lang/ilias_pt.lang                                         | 2 +-
 lang/ilias_ro.lang                                         | 2 +-
 lang/ilias_ru.lang                                         | 2 +-
 lang/ilias_sk.lang                                         | 2 +-
 lang/ilias_sl.lang                                         | 2 +-
 lang/ilias_sq.lang                                         | 2 +-
 lang/ilias_sr.lang                                         | 2 +-
 lang/ilias_sv.lang                                         | 2 +-
 lang/ilias_tr.lang                                         | 2 +-
 lang/ilias_uk.lang                                         | 2 +-
 lang/ilias_vi.lang                                         | 2 +-
 lang/ilias_zh.lang                                         | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/components/ILIAS/Survey/Settings/class.SettingsFormGUI.php b/components/ILIAS/Survey/Settings/class.SettingsFormGUI.php
index 633f2e10afba..5ba15dec9453 100755
--- a/components/ILIAS/Survey/Settings/class.SettingsFormGUI.php
+++ b/components/ILIAS/Survey/Settings/class.SettingsFormGUI.php
@@ -375,7 +375,7 @@ public function withAccess(
 
         // anonymization
         if ($feature_config->supportsAccessCodes()) {
-            $codes = new \ilCheckboxInputGUI($lng->txt("survey_access_codes"), "acc_codes");
+            $codes = new \ilCheckboxInputGUI($lng->txt("survey_access_code"), "acc_codes");
             $codes->setInfo($lng->txt("survey_access_codes_info"));
             $codes->setChecked(!$survey->isAccessibleWithoutCode());
             $form->addItem($codes);
diff --git a/lang/ilias_ar.lang b/lang/ilias_ar.lang
index ccd67f58c9eb..df063d48179b 100644
--- a/lang/ilias_ar.lang
+++ b/lang/ilias_ar.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_bg.lang b/lang/ilias_bg.lang
index 9815f2721af8..d76f74c1e402 100644
--- a/lang/ilias_bg.lang
+++ b/lang/ilias_bg.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_cs.lang b/lang/ilias_cs.lang
index 128b88054598..dae8857eec59 100644
--- a/lang/ilias_cs.lang
+++ b/lang/ilias_cs.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Opravdu chcete uzavřít přehled pro
 survey#:#survey_360_sure_appraisee_close_admin#:#Opravdu chcete uzavřít přehled pro následující hodnocené osoby?
 survey#:#survey_360_sure_delete_appraises#:#Opravdu chcete odstranit následující hodnocené osoby?
 survey#:#survey_360_sure_delete_raters#:#Opravdu chcete odstranit následující hodnotitele pro %s?
-survey#:#survey_access_codes#:#Ověřování pomocí přístupových kódů
+survey#:#survey_access_code#:#Ověřování pomocí přístupových kódů
 survey#:#survey_access_codes_info#:#Uživatelé získají přístup k průzkumu zadáním kódu na kartě „Info“. Tyto přístupové kódy jsou generovány v záložce 'Přístupové kódy' na kartě 'Účastníci'.
 survey#:#survey_activate_skill_service#:#Aktivujte službu způsobilosti
 survey#:#survey_activate_skill_service_info#:#todo12
diff --git a/lang/ilias_da.lang b/lang/ilias_da.lang
index fa576a310e64..8a95d5ae1f01 100644
--- a/lang/ilias_da.lang
+++ b/lang/ilias_da.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###16 09 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###16 09 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###16 09 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###16 09 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 22a4eac3ae5c..51950a836da7 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -16790,7 +16790,7 @@ survey#:#survey_360_sure_appraisee_close#:#Wollen Sie wirklich die Umfrage für
 survey#:#survey_360_sure_appraisee_close_admin#:#Wollen Sie wirklich die Umfrage für die folgenden Feedback-Nehmer schließen?
 survey#:#survey_360_sure_delete_appraises#:#Wollen Sie wirklich die folgenden Feedback-Nehmer entfernen?
 survey#:#survey_360_sure_delete_raters#:#Wollen Sie wirklich die folgenden Feedback-Geber für %s entfernen?
-survey#:#survey_access_codes#:#Authentifizierung mit Zugangsschlüsseln
+survey#:#survey_access_code#:#Authentifizierung mit Zugangsschlüssel
 survey#:#survey_access_codes_info#:#Im Reiter „Info“ muss ein Zugangsschlüssel eingegeben werden, um Zugang zur Umfrage zu erhalten. Diese Zugangsschlüssel werden erzeugt im Reiter „Befragte » Zugangsschlüssel“.
 survey#:#survey_activate_skill_service#:#Kompetenz-Service aktivieren
 survey#:#survey_activate_skill_service_info#:#Es wird ein weiterer Reiter „Kompetenzen“ eingeblendet. Hier werden zunächst den Fragen Kompetenzen zugeordnet, danach werden den Schwellenwerte für die Erreichung bestimmter Kompetenzstufen gesetzt.
diff --git a/lang/ilias_el.lang b/lang/ilias_el.lang
index bc1b91d9841d..6c4b55710bdf 100644
--- a/lang/ilias_el.lang
+++ b/lang/ilias_el.lang
@@ -16720,7 +16720,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index 10477560e93f..c92b72993303 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -16760,7 +16760,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?
-survey#:#survey_access_codes#:#Authentication by Access Code
+survey#:#survey_access_code#:#Authentication by Access Code
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code in the survey’s ‘Info’ tab. These access codes can be generated in the ‘Access Codes’ sub tab of the ‘Participants’ tab.
 survey#:#survey_activate_skill_service#:#Activate Competence Service
 survey#:#survey_activate_skill_service_info#:#Display a new ‘Competences’ tab. In this tab questions are assigned to competences. Thresholds can then be established that are required to reach a specific level of a competence.
diff --git a/lang/ilias_es.lang b/lang/ilias_es.lang
index 50b2eaae96c0..c6b83cb6110f 100644
--- a/lang/ilias_es.lang
+++ b/lang/ilias_es.lang
@@ -16721,7 +16721,7 @@ survey#:#survey_360_sure_appraisee_close#:#¿Está seguro que desea cerrar la en
 survey#:#survey_360_sure_appraisee_close_admin#:#¿Está seguro de que quiere cerrar las encuestas para los siguientes evaluadores?
 survey#:#survey_360_sure_delete_appraises#:#¿Está seguro que desea eliminar a los siguientes evaluados?
 survey#:#survey_360_sure_delete_raters#:#¿Está seguro que desea eliminar los siguientes calificadores para %s?
-survey#:#survey_access_codes#:#Autenticación por Código de Acceso
+survey#:#survey_access_code#:#Autenticación por Código de Acceso
 survey#:#survey_access_codes_info#:#Los usuarios consiguen acceder a la encuesta mediante la introducción de un código en la pestaña 'Info'. Estos códigos de acceso se generan en "Códigos de acceso" una subpestaña en la pestaña 'participantes'.
 survey#:#survey_activate_skill_service#:#Activar el Servicio de Competencias
 survey#:#survey_activate_skill_service_info#:#Se mostrará una nueva pestaña llamada "competencias". En esta pestaña las preguntas se asignan a competencias y se pueden establecer umbrales para alcanzar un determinado nivel de competencia.
diff --git a/lang/ilias_et.lang b/lang/ilias_et.lang
index ddf6f01c1f7e..8295925a1768 100644
--- a/lang/ilias_et.lang
+++ b/lang/ilias_et.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?
-survey#:#survey_access_codes#:#Authentication by Access Codes
+survey#:#survey_access_code#:#Authentication by Access Codes
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.
 survey#:#survey_activate_skill_service#:#Activate Competence Service
 survey#:#survey_activate_skill_service_info#:#todo12
diff --git a/lang/ilias_fa.lang b/lang/ilias_fa.lang
index b43f4ed0c870..b113a42862c6 100644
--- a/lang/ilias_fa.lang
+++ b/lang/ilias_fa.lang
@@ -16720,7 +16720,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_fr.lang b/lang/ilias_fr.lang
index 3a86149b8b0e..d81d9e153be4 100644
--- a/lang/ilias_fr.lang
+++ b/lang/ilias_fr.lang
@@ -16704,7 +16704,7 @@ survey#:#survey_360_sure_appraisee_close#:#Etes-vous sûr de vouloir fermer l'é
 survey#:#survey_360_sure_appraisee_close_admin#:#Etes-vous sûr de vouloir fermer l'évaluation aux participants suivants ?
 survey#:#survey_360_sure_delete_appraises#:#Etes-vous sûr de vouloir supprimer les participants suivants ?
 survey#:#survey_360_sure_delete_raters#:#Etes-vous sûr de vouloir supprimer les évaluateurs suivants pour %s?
-survey#:#survey_access_codes#:#Authentification par codes d’accès
+survey#:#survey_access_code#:#Authentification par codes d’accès
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.
 survey#:#survey_activate_skill_service#:#Activer le Service Compétences
 survey#:#survey_activate_skill_service_info#:#Un nouvel onglet "Compétences" s'affiche. Dans cet onglet, les questions sont assignées aux compétences, puis des seuils sont attribués pour atteindre un niveau spécifique d'une compétence.
diff --git a/lang/ilias_hr.lang b/lang/ilias_hr.lang
index 5396b38850e9..accdc7d3c8b8 100644
--- a/lang/ilias_hr.lang
+++ b/lang/ilias_hr.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Jeste li sigurni da želite zatvoriti
 survey#:#survey_360_sure_appraisee_close_admin#:#Jeste li sigurni da želite zatvoriti ankete za sljedeće procijenjene osobe?
 survey#:#survey_360_sure_delete_appraises#:#Jeste li sigurni da želite ukloniti sljedeće procijenjene osobe?
 survey#:#survey_360_sure_delete_raters#:#Jeste li sigurni da želite ukloniti sljedeće ocjenjivače za %s?
-survey#:#survey_access_codes#:#Autentifikacija pristupnim kodovima
+survey#:#survey_access_code#:#Autentifikacija pristupnim kodovima
 survey#:#survey_access_codes_info#:#Korisnici pristup anketi dobivaju unosom koda na kartici ‘Informacije’. Ovi pristupni kodovi generiraju se na potkartici ‘Pristupni kodovi’ na kartici ‘Sudionici’.
 survey#:#survey_activate_skill_service#:#Aktiviraj servis za kompetencije
 survey#:#survey_activate_skill_service_info#:#Prikazat će se nova kartica ‘Kompetencije’. U ovoj su kartici pitanja dodijeljena kompetencijama, a zatim se određuju pragovi za postizanje određene razine kompetencije.
diff --git a/lang/ilias_hu.lang b/lang/ilias_hu.lang
index 1459790e305b..12f4538865fb 100644
--- a/lang/ilias_hu.lang
+++ b/lang/ilias_hu.lang
@@ -16720,7 +16720,7 @@ survey#:#survey_360_sure_appraisee_close#:#Biztos, hogy lezárja a kérdőívet
 survey#:#survey_360_sure_appraisee_close_admin#:#Biztos, hogy lezárja a kérdőíveket az alábbi értékelendő személyek számára?
 survey#:#survey_360_sure_delete_appraises#:#Biztos, hogy eltávolítja az alábbi értékelendő személyeket?
 survey#:#survey_360_sure_delete_raters#:#Biztos, hogy eltávolítja %s értékelőit?
-survey#:#survey_access_codes#:#Hitelesítés kódokkal
+survey#:#survey_access_code#:#Hitelesítés kódokkal
 survey#:#survey_access_codes_info#:#A felhasználók az 'Információ' fülön megadható kóddal férhet hozzá a teszthez. Kódokat generálni a 'Válaszadók' fül alatti 'Hozzáférési kódok' alfül alatt lehet.
 survey#:#survey_activate_skill_service#:#Kompetenciaszolgáltatás bekapcsolása
 survey#:#survey_activate_skill_service_info#:#Egy új, 'Kompetencia' nevű fül jelenik meg. Itt kompetenciákat rendelhet a kérdésekhez, majd küszöbértéket kompetenciaszintekhez.
diff --git a/lang/ilias_it.lang b/lang/ilias_it.lang
index 721868734076..1d520533c5d5 100644
--- a/lang/ilias_it.lang
+++ b/lang/ilias_it.lang
@@ -16726,7 +16726,7 @@ survey#:#survey_360_sure_appraisee_close#:#Sei sicuro di voler chiudere il sonda
 survey#:#survey_360_sure_appraisee_close_admin#:#Sei sicuro di voler chiudere il sondaggio per tutti i seguenti valutati?
 survey#:#survey_360_sure_delete_appraises#:#Sei sicuro di voler rimuovere i seguenti valutati?
 survey#:#survey_360_sure_delete_raters#:#Sei sicuro di voler rimuovere i seguenti valutati per %s?
-survey#:#survey_access_codes#:#Autenticazione tramite codici di accesso
+survey#:#survey_access_code#:#Autenticazione tramite codici di accesso
 survey#:#survey_access_codes_info#:#Gli utenti ottengono l'accesso al sondaggio inserendo un codice nella scheda "Informazioni". Questi codici di accesso sono generati in una sottoscheda "Codici di accesso" nella scheda "Partecipanti".
 survey#:#survey_activate_skill_service#:#Attivare il servizio di competenze
 survey#:#survey_activate_skill_service_info#:#Verrà visualizzata una nuova scheda "Competenze". In questa scheda le domande vengono assegnate alle competenze, quindi vengono attribuite le soglie per raggiungere un livello specifico di una competenza.
diff --git a/lang/ilias_ja.lang b/lang/ilias_ja.lang
index fbe9f21d51e8..0a6517acfa9b 100644
--- a/lang/ilias_ja.lang
+++ b/lang/ilias_ja.lang
@@ -16720,7 +16720,7 @@ survey#:#survey_360_sure_appraisee_close#:#本当に全ての評価のサーベ
 survey#:#survey_360_sure_appraisee_close_admin#:#本当に次の評価者のサーベイを終了しますか?
 survey#:#survey_360_sure_delete_appraises#:#本当に次の評価者を削除しますか?
 survey#:#survey_360_sure_delete_raters#:#本当に次の%sの考課者を削除しますか?
-survey#:#survey_access_codes#:#アクセスコードによる認証
+survey#:#survey_access_code#:#アクセスコードによる認証
 survey#:#survey_access_codes_info#:#ユーザは"Info"タブのコード入力でサーベイへアクセスします。このアクセスコードは"受験者"タブ内の"アクセスコード"サブタブに作成されます。
 survey#:#survey_activate_skill_service#:#能力サービスをアクティブ
 survey#:#survey_activate_skill_service_info#:#新規"能力"タブが表示されます。このタブ内の質問は能力へ割り当てられてしきい値が能力の特定のレベルに達していること示します。
diff --git a/lang/ilias_ka.lang b/lang/ilias_ka.lang
index 5112d7205cdc..d8b7619c75ce 100644
--- a/lang/ilias_ka.lang
+++ b/lang/ilias_ka.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_lt.lang b/lang/ilias_lt.lang
index 9d0161eab175..0e2ddfbea482 100644
--- a/lang/ilias_lt.lang
+++ b/lang/ilias_lt.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_nl.lang b/lang/ilias_nl.lang
index af02faadc2a9..0fc4a03f032b 100644
--- a/lang/ilias_nl.lang
+++ b/lang/ilias_nl.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Weet je zeker dat je de enqûete wilt
 survey#:#survey_360_sure_appraisee_close_admin#:#Weet je zeker dat je de 360° Feedback wilt sluiten voor de volgende gebruikers?
 survey#:#survey_360_sure_delete_appraises#:#Weet je zeker dat je de volgende beoordelingen wilt verwijderen?
 survey#:#survey_360_sure_delete_raters#:#Weet je zeker dat je de volgende feedbackgevers voor %s wilt verwijderen?
-survey#:#survey_access_codes#:#Authentication by Access Codes###06 02 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###06 02 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the ‘Info’-tab. These access codes are generated in a sub-tab ‘Access Codes’ in the tab ‘Participants’.###06 02 2015 new variable
 survey#:#survey_activate_skill_service#:#Inschakelen van Competentie Service
 survey#:#survey_activate_skill_service_info#:#todo12
diff --git a/lang/ilias_pl.lang b/lang/ilias_pl.lang
index ca52ded87dbd..75010a4338d2 100644
--- a/lang/ilias_pl.lang
+++ b/lang/ilias_pl.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Czy naprawdę chcesz zamknąć ankiet
 survey#:#survey_360_sure_appraisee_close_admin#:#Czy naprawdę chcesz zamknąć ankietę dla poniższych odbiorców feedbacku?
 survey#:#survey_360_sure_delete_appraises#:#Czy naprawdę chcesz usunąć poniższych odbiorców feedbacku?
 survey#:#survey_360_sure_delete_raters#:#0
-survey#:#survey_access_codes#:#Identyfikacja z kodami dostępu
+survey#:#survey_access_code#:#Identyfikacja z kodami dostępu
 survey#:#survey_access_codes_info#:#Użytkownicy otrzymują dostęp do ankiety po wpisaniu w zakładce 'Informacje' kodu dostępu. Te kody dostępu generowane są w zakładce 'Uczestnicy' w podzakładce o tej samej nazwie.
 survey#:#survey_activate_skill_service#:#Aktywuj serwis kompetencyjny
 survey#:#survey_activate_skill_service_info#:#Wyświetlona zostanie kolejna zakładka 'Kompetencje'. Tutaj w pierwszej kolejności o pytań przydzielane są kompetencje, a następnie ustalane są wartości progowe dla osiągnięcia poszczególnych poziomów kompetencji.
diff --git a/lang/ilias_pt.lang b/lang/ilias_pt.lang
index db83600892f5..a07d86107727 100644
--- a/lang/ilias_pt.lang
+++ b/lang/ilias_pt.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Tem a certeza que quer fechar o inqu
 survey#:#survey_360_sure_appraisee_close_admin#:#Tem a certeza que quer fechar os inquéritos para os seguintes avaliados?
 survey#:#survey_360_sure_delete_appraises#:#Tem a certeza que quer remover os seguintes avaliados?
 survey#:#survey_360_sure_delete_raters#:#Tem a certeza que quer remover os seguintes examinadores para %s?
-survey#:#survey_access_codes#:#Autenticação por códigos de acesso
+survey#:#survey_access_code#:#Autenticação por códigos de acesso
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.
 survey#:#survey_activate_skill_service#:#Ativar serviço de competência
 survey#:#survey_activate_skill_service_info#:#todo12
diff --git a/lang/ilias_ro.lang b/lang/ilias_ro.lang
index a9f746389e3a..0317c171ece7 100644
--- a/lang/ilias_ro.lang
+++ b/lang/ilias_ro.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_ru.lang b/lang/ilias_ru.lang
index 8f826bb496f6..3157f44ce0e7 100644
--- a/lang/ilias_ru.lang
+++ b/lang/ilias_ru.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_sk.lang b/lang/ilias_sk.lang
index e61daafaec68..235aeefe2d72 100644
--- a/lang/ilias_sk.lang
+++ b/lang/ilias_sk.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_sl.lang b/lang/ilias_sl.lang
index 1a4adbd30d5e..8a5ce071bdc5 100644
--- a/lang/ilias_sl.lang
+++ b/lang/ilias_sl.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Ali res želite zapreti anketo za vse
 survey#:#survey_360_sure_appraisee_close_admin#:#Ali res želite zapreti anketo za naslednje prejemnike povratnih informacij?
 survey#:#survey_360_sure_delete_appraises#:#Ali res želite odstraniti naslednje ocenjevane osebe?
 survey#:#survey_360_sure_delete_raters#:#Ali res želite odstraniti naslednje dajalce povratnih informacij za %s?
-survey#:#survey_access_codes#:#Avtentikacija s kodo za dostop
+survey#:#survey_access_code#:#Avtentikacija s kodo za dostop
 survey#:#survey_access_codes_info#:#Uporabniki dobijo dostop do ankete z vnosom kode za dostop v zavihku 'Info'.  Te kode za dostop se ustvarijo v istoimenskem podzavihku zavihku 'Udeleženec'.
 survey#:#survey_activate_skill_service#:#Aktiviraj kompetenčno podporo
 survey#:#survey_activate_skill_service_info#:#Prikazal se bo nadaljnji zavihek 'Kompetence'. Tukaj so najprej vprašanjem dodeljene kompetence in nato se nastavijo mejne vrednosti za doseganje določene ravni kompetenc.
diff --git a/lang/ilias_sq.lang b/lang/ilias_sq.lang
index 1d0e66156301..6101be2a71c8 100644
--- a/lang/ilias_sq.lang
+++ b/lang/ilias_sq.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_sr.lang b/lang/ilias_sr.lang
index d8174f7d188b..3f0ba5a63627 100644
--- a/lang/ilias_sr.lang
+++ b/lang/ilias_sr.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_sv.lang b/lang/ilias_sv.lang
index 02012f6b2069..4528d0a8a805 100644
--- a/lang/ilias_sv.lang
+++ b/lang/ilias_sv.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Vill du verkligen stänga enkäten f
 survey#:#survey_360_sure_appraisee_close_admin#:#Vill du verkligen stänga enkäten för följande feedbackmottagare?
 survey#:#survey_360_sure_delete_appraises#:#Vill du verkligen ta bort följande feedbackmottagare?
 survey#:#survey_360_sure_delete_raters#:#Vill du verkligen ta bort följande feedbackgivare för %s?
-survey#:#survey_access_codes#:#Autentisering med åtkomstnycklar
+survey#:#survey_access_code#:#Autentisering med åtkomstnycklar
 survey#:#survey_access_codes_info#:#Användare får tillgång till undersökningen genom att ange en åtkomstnyckel på fliken "Info". Dessa åtkomstnycklar genereras i underfliken med samma namn i fliken "Deltagare".
 survey#:#survey_activate_skill_service#:#Aktivera kompetenstjänst
 survey#:#survey_activate_skill_service_info#:#Ytterligare en flik "Kompetenser" visas. Här tilldelas först kompetenser till frågorna, sedan sätts tröskelvärden för att uppnå vissa kompetensnivåer.
diff --git a/lang/ilias_tr.lang b/lang/ilias_tr.lang
index a0b0826bb881..e3feb695a53a 100644
--- a/lang/ilias_tr.lang
+++ b/lang/ilias_tr.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_uk.lang b/lang/ilias_uk.lang
index 5f1021cbe5c8..d8cb42dec5c9 100644
--- a/lang/ilias_uk.lang
+++ b/lang/ilias_uk.lang
@@ -16719,7 +16719,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_vi.lang b/lang/ilias_vi.lang
index 9aec497f8522..c7ec5ebefc38 100644
--- a/lang/ilias_vi.lang
+++ b/lang/ilias_vi.lang
@@ -16721,7 +16721,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable
diff --git a/lang/ilias_zh.lang b/lang/ilias_zh.lang
index b4a87d16a53a..b4b5f9cfbd10 100644
--- a/lang/ilias_zh.lang
+++ b/lang/ilias_zh.lang
@@ -16718,7 +16718,7 @@ survey#:#survey_360_sure_appraisee_close#:#Are you sure you want to close the su
 survey#:#survey_360_sure_appraisee_close_admin#:#Are you sure you want to close the surveys for the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_appraises#:#Are you sure you want to remove the following appraisees?###24 10 2013 new variable
 survey#:#survey_360_sure_delete_raters#:#Are you sure you want to remove the following raters for %s?###24 10 2013 new variable
-survey#:#survey_access_codes#:#Authentication by Access Codes###27 01 2015 new variable
+survey#:#survey_access_code#:#Authentication by Access Codes###27 01 2015 new variable
 survey#:#survey_access_codes_info#:#Users get access to the survey by entering a code on the 'Info'-tab. These access codes are generated in a sub-tab 'Access Codes' in the tab 'Participants'.###27 01 2015 new variable
 survey#:#survey_activate_skill_service#:#Activate Competence Service###24 10 2013 new variable
 survey#:#survey_activate_skill_service_info#:#todo12###07 11 2014 new variable

From ac166dee9e9a01f61bf99280599cf3e1f18cba67 Mon Sep 17 00:00:00 2001
From: Tim Schmitz <schmitz@leifos.de>
Date: Wed, 18 Feb 2026 11:13:46 +0100
Subject: [PATCH 076/141] Weblinks: fix setting subtabs on manage screen
 (47217)

---
 .../ILIAS/WebResource/classes/class.ilObjLinkResourceGUI.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/WebResource/classes/class.ilObjLinkResourceGUI.php b/components/ILIAS/WebResource/classes/class.ilObjLinkResourceGUI.php
index fa665f3cfbfb..e1711ad590cc 100755
--- a/components/ILIAS/WebResource/classes/class.ilObjLinkResourceGUI.php
+++ b/components/ILIAS/WebResource/classes/class.ilObjLinkResourceGUI.php
@@ -1321,7 +1321,6 @@ protected function showToolbar(string $a_tpl_var): void
     protected function confirmDeleteLink(): void
     {
         $this->checkPermission('write');
-        $this->activateTabs('content', 'id_content_view');
 
         $link_ids = [];
         if ($this->http->wrapper()->query()->has('link_id')) {
@@ -1345,6 +1344,7 @@ protected function confirmDeleteLink(): void
             $this->view();
             return;
         }
+        $this->activateTabs('content', 'id_content_manage');
 
         $confirm = new ilConfirmationGUI();
         $confirm->setFormAction($this->ctrl->getFormAction($this, 'view'));

From 22e12c70769ff1e738a366596388f5e0d9ef502a Mon Sep 17 00:00:00 2001
From: Tim Schmitz <schmitz@leifos.de>
Date: Wed, 18 Feb 2026 11:49:00 +0100
Subject: [PATCH 077/141] Course/Group: disallow sorting by actions in members
 table (46639)

---
 .../ILIAS/Course/classes/class.ilCourseParticipantsTableGUI.php | 2 +-
 .../ILIAS/Group/classes/class.ilGroupParticipantsTableGUI.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/ILIAS/Course/classes/class.ilCourseParticipantsTableGUI.php b/components/ILIAS/Course/classes/class.ilCourseParticipantsTableGUI.php
index dbaf41e7daec..47663169ca2e 100755
--- a/components/ILIAS/Course/classes/class.ilCourseParticipantsTableGUI.php
+++ b/components/ILIAS/Course/classes/class.ilCourseParticipantsTableGUI.php
@@ -113,7 +113,7 @@ public function __construct(
         $this->addColumn($this->lng->txt('crs_blocked'), 'blocked');
         $this->addColumn($this->lng->txt('crs_notification_list_title'), 'notification');
 
-        $this->addColumn($this->lng->txt('actions'), 'optional', '', false, 'ilMembershipRowActionsHeader');
+        $this->addColumn($this->lng->txt('actions'), '', '', false, 'ilMembershipRowActionsHeader');
 
         $this->setRowTemplate("tpl.show_participants_row.html", "components/ILIAS/Course");
 
diff --git a/components/ILIAS/Group/classes/class.ilGroupParticipantsTableGUI.php b/components/ILIAS/Group/classes/class.ilGroupParticipantsTableGUI.php
index c686b52f1f7e..3ca3d591899b 100755
--- a/components/ILIAS/Group/classes/class.ilGroupParticipantsTableGUI.php
+++ b/components/ILIAS/Group/classes/class.ilGroupParticipantsTableGUI.php
@@ -88,7 +88,7 @@ public function __construct(
         $this->addColumn($this->lng->txt('grp_mem_contacts'), 'contact');
         $this->addColumn($this->lng->txt('grp_notification'), 'notification');
 
-        $this->addColumn($this->lng->txt('actions'), 'optional', '', false, 'ilMembershipRowActionsHeader');
+        $this->addColumn($this->lng->txt('actions'), '', '', false, 'ilMembershipRowActionsHeader');
         $this->setDefaultOrderField('roles');
 
         $this->setRowTemplate("tpl.show_participants_row.html", "components/ILIAS/Group");

From 4603be34d5570507357f1c56d3daf0288957a871 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 3 Sep 2025 08:41:42 +0200
Subject: [PATCH 078/141] Questions: Build General Structure

---
 .../classes/AdministrationMainBarProvider.php |   2 +-
 .../Administration/class.ilObjQuestions.php   |  28 +
 .../class.ilObjQuestionsAccess.php            |  27 +
 .../class.ilObjQuestionsGUI.php               | 142 ++++
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  85 ++
 .../Legacy/PageEditor/QstsQuestionPage.php    |  27 +
 .../PageEditor/QstsQuestionPageConfig.php     |  30 +
 .../PageEditor/class.QstsQuestionPageGUI.php  |  42 +
 .../PageEditor/class.ilPCAnswerForm.php       | 460 +++++++++++
 .../PageEditor/class.ilPCAnswerFormGUI.php    |  96 +++
 components/ILIAS/Questions/Questions.php      |  56 ++
 components/ILIAS/Questions/README.md          |   1 +
 components/ILIAS/Questions/maintenance.json   |  14 +
 components/ILIAS/Questions/service.xml        |  20 +
 .../Questions/src/AnswerForm/Feedback.php     |  27 +
 .../ILIAS/Questions/src/AnswerForm/Form.php   |  68 ++
 .../Questions/src/AnswerForm/Marking.php      |  30 +
 .../Questions/src/AnswerForm/Persistence.php  |  36 +
 .../ILIAS/Questions/src/AnswerForm/Type.php   |  46 ++
 .../Questions/src/AnswerForm/Views/Edit.php   |  46 ++
 .../src/AnswerForm/Views/Participant.php      |  31 +
 .../src/AnswerFormTypes/Cloze/Marking.php     |  43 +
 .../src/AnswerFormTypes/Cloze/Persistence.php | 141 ++++
 .../src/AnswerFormTypes/Cloze/Type.php        | 100 +++
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  |  90 ++
 .../Cloze/Views/Participant.php               |  48 ++
 .../Questions/src/AnswerFormTypes/Factory.php |  60 ++
 components/ILIAS/Questions/src/Collector.php  |  74 ++
 .../ILIAS/Questions/src/Presentation/Edit.php | 440 ++++++++++
 .../src/Presentation/Editability.php          |  28 +
 .../src/Presentation/LayoutProvider.php       | 154 ++++
 .../src/Presentation/QuestionsTable.php       | 119 +++
 .../ILIAS/Questions/src/PublicInterface.php   |  43 +
 .../Questions/src/Question/Lifecycle.php      |  31 +
 .../src/Question/Persistence/Column.php       |  40 +
 .../src/Question/Persistence/Join.php         |  51 ++
 .../src/Question/Persistence/JoinType.php     |  27 +
 .../src/Question/Persistence/Junctor.php      |  27 +
 .../src/Question/Persistence/Operator.php     |  50 ++
 .../src/Question/Persistence/Order.php        |  35 +
 .../Question/Persistence/OrderDirection.php   |  27 +
 .../src/Question/Persistence/Repository.php   | 234 ++++++
 .../src/Question/Persistence/Select.php       |  38 +
 .../src/Question/Persistence/SelectQuery.php  | 165 ++++
 .../Question/Persistence/TableNameBuilder.php |  57 ++
 .../Question/Persistence/TableNameSpace.php   |  44 +
 .../Persistence/TableNameSpaceCore.php        |  34 +
 .../src/Question/Persistence/UpdateQuery.php  |  66 ++
 .../src/Question/Persistence/Value.php        |  49 ++
 .../src/Question/Persistence/Where.php        |  52 ++
 .../ILIAS/Questions/src/Question/Question.php |  26 +
 .../src/Question/QuestionImplementation.php   | 255 ++++++
 .../ILIAS/Questions/src/Question/Response.php |  25 +
 .../Questions/src/Question/Views/Edit.php     | 181 ++++
 .../src/Question/Views/Participant.php        |  81 ++
 .../Questions/src/Response/Repository.php     |  28 +
 .../ILIAS/Questions/src/Response/Response.php |  30 +
 .../ILIAS/Questions/src/Setup/Agent.php       |  74 ++
 .../src/Setup/ClozeQuestionTables.php         | 227 +++++
 .../src/Setup/OverarchingQuestionTables.php   | 201 +++++
 .../ILIAS/Questions/src/Units/Category.php    |  79 ++
 .../Questions/src/Units/ConfigurationGUI.php  | 778 ++++++++++++++++++
 .../ILIAS/Questions/src/Units/Repository.php  | 738 +++++++++++++++++
 components/ILIAS/Questions/src/Units/Unit.php | 147 ++++
 .../Units/class.GlobalConfigurationGUI.php    |  68 ++
 .../src/Units/class.LocalConfigurationGUI.php | 178 ++++
 66 files changed, 6796 insertions(+), 1 deletion(-)
 create mode 100755 components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestions.php
 create mode 100755 components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsAccess.php
 create mode 100755 components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
 create mode 100755 components/ILIAS/Questions/Legacy/LocalDIC.php
 create mode 100644 components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
 create mode 100644 components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPageConfig.php
 create mode 100644 components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
 create mode 100644 components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
 create mode 100644 components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
 create mode 100644 components/ILIAS/Questions/Questions.php
 create mode 100644 components/ILIAS/Questions/README.md
 create mode 100644 components/ILIAS/Questions/maintenance.json
 create mode 100644 components/ILIAS/Questions/service.xml
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Feedback.php
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Form.php
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Marking.php
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Persistence.php
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Type.php
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Views/Participant.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Marking.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Factory.php
 create mode 100644 components/ILIAS/Questions/src/Collector.php
 create mode 100644 components/ILIAS/Questions/src/Presentation/Edit.php
 create mode 100644 components/ILIAS/Questions/src/Presentation/Editability.php
 create mode 100755 components/ILIAS/Questions/src/Presentation/LayoutProvider.php
 create mode 100644 components/ILIAS/Questions/src/Presentation/QuestionsTable.php
 create mode 100644 components/ILIAS/Questions/src/PublicInterface.php
 create mode 100644 components/ILIAS/Questions/src/Question/Lifecycle.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Column.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Join.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/JoinType.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Junctor.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Operator.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Order.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/OrderDirection.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Repository.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Select.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/SelectQuery.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/TableNameSpaceCore.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/UpdateQuery.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Value.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Where.php
 create mode 100644 components/ILIAS/Questions/src/Question/Question.php
 create mode 100644 components/ILIAS/Questions/src/Question/QuestionImplementation.php
 create mode 100644 components/ILIAS/Questions/src/Question/Response.php
 create mode 100644 components/ILIAS/Questions/src/Question/Views/Edit.php
 create mode 100644 components/ILIAS/Questions/src/Question/Views/Participant.php
 create mode 100644 components/ILIAS/Questions/src/Response/Repository.php
 create mode 100644 components/ILIAS/Questions/src/Response/Response.php
 create mode 100644 components/ILIAS/Questions/src/Setup/Agent.php
 create mode 100644 components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
 create mode 100644 components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
 create mode 100755 components/ILIAS/Questions/src/Units/Category.php
 create mode 100755 components/ILIAS/Questions/src/Units/ConfigurationGUI.php
 create mode 100755 components/ILIAS/Questions/src/Units/Repository.php
 create mode 100755 components/ILIAS/Questions/src/Units/Unit.php
 create mode 100755 components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php
 create mode 100755 components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php

diff --git a/components/ILIAS/Administration/GlobalScreen/classes/AdministrationMainBarProvider.php b/components/ILIAS/Administration/GlobalScreen/classes/AdministrationMainBarProvider.php
index 3f9baaa54ae2..660af1b3f27f 100755
--- a/components/ILIAS/Administration/GlobalScreen/classes/AdministrationMainBarProvider.php
+++ b/components/ILIAS/Administration/GlobalScreen/classes/AdministrationMainBarProvider.php
@@ -225,7 +225,7 @@ private function getGroups(): array
         // admin menu layout
         $layout = array(
             "maintenance" =>
-                array("adma", "serv", "cron", "bnmk", "lngf", "hlps", "wfe", 'fils', 'logs', 'sysc', "recf", "root"),
+                array("adma", "serv", "cron", "bnmk", "lngf", "hlps", "wfe", 'fils', 'qsts', 'logs', 'sysc', "recf", "root"),
             "layout_and_navigation" =>
                 array("mme", "gsfo", "dshs", "stys", "adve", "stus"),
             "repository_and_objects" =>
diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestions.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestions.php
new file mode 100755
index 000000000000..cb2e27c8333f
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestions.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+class ilObjQuestions extends ilObject
+{
+    public function __construct(int $id = 0, bool $referenced = true)
+    {
+        $this->type = 'qsts';
+        parent::__construct($id, $referenced);
+    }
+}
diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsAccess.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsAccess.php
new file mode 100755
index 000000000000..4ea07f76b5d0
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsAccess.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+/**
+ * @author Helmut Schottmüller <helmut.schottmueller@mac.com>
+ * @ingroup components\ILIASTest
+ */
+class ilObjQuestionsAccess extends ilObjectAccess
+{
+}
diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
new file mode 100755
index 000000000000..d1f7d376fb60
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+use ILIAS\Questions\Legacy\LocalDIC;
+use ILIAS\Questions\Presentation\Edit;
+use ILIAS\Questions\Units\GlobalConfigurationGUI;
+use ILIAS\Data\Factory as DataFactory;
+use ILIAS\Data\URI;
+
+/**
+ * @ilCtrl_isCalledBy ilObjQuestionsGUI: ilAdministrationGUI
+ * @ilCtrl_Calls ilObjQuestionsGUI: ilPermissionGUI, ILIAS\Questions\Units\GlobalConfigurationGUI
+ * @ilCtrl_Calls ilObjQuestionsGUI: QstsQuestionPageGUI
+ */
+class ilObjQuestionsGUI extends ilObjectGUI
+{
+    private Edit $edit_view;
+
+    private DataFactory $data_factory;
+
+    public function __construct(
+        $a_data,
+        int $a_id = 0,
+        bool $a_call_by_reference = true,
+        bool $a_prepare_output = true
+    ) {
+        global $DIC;
+        $rbacsystem = $DIC['rbacsystem'];
+        $this->data_factory = new DataFactory();
+
+        $this->edit_view = LocalDIC::dic()[Edit::class];
+
+        $this->type = 'qsts';
+
+        parent::__construct($a_data, $a_id, $a_call_by_reference, false);
+
+        $this->lng->loadLanguageModule('assessment');
+
+        if (!$rbacsystem->checkAccess('read', $this->object->getRefId())) {
+            $this->ilias->raiseError($this->lng->txt("msg_no_perm_read_assf"), $this->ilias->error_obj->WARNING);
+        }
+    }
+
+    public function executeCommand(): void
+    {
+        $next_class = $this->ctrl->getNextClass($this);
+        $cmd = $this->ctrl->getCmd();
+        $this->prepareOutput();
+
+        switch ($next_class) {
+            case strtolower(ilPermissionGUI::class):
+                $this->tabs_gui->activateTab('perm_settings');
+                $this->ctrl->forwardCommand(new \ilPermissionGUI($this));
+                break;
+
+            case strtolower(QstsQuestionPageGUI::class):
+                $this->edit_view->forwardPageCmds(
+                    $this->tpl,
+                    $this->buildEditQuestionsBaseUri()
+                );
+                break;
+
+            default:
+                if ($cmd === null || $cmd === '' || $cmd === 'view') {
+                    $cmd = 'viewQuestions';
+                }
+                $cmd .= 'Object';
+                $this->$cmd();
+                break;
+        }
+    }
+
+    public function viewQuestionsObject(): void
+    {
+        $this->tabs_gui->activateTab('questions');
+
+        $this->tpl->setContent(
+            $this->ui_renderer->render(
+                $this->edit_view->view(
+                    $this->toolbar,
+                    $this->buildEditQuestionsBaseUri()
+                )
+            )
+        );
+    }
+
+    public function getAdminTabs(): void
+    {
+        $this->getTabs();
+    }
+
+    protected function getTabs(): void
+    {
+        if ($this->rbac_system->checkAccess('visible,read', $this->object->getRefId())) {
+            $this->tabs_gui->addTab(
+                'questions',
+                $this->lng->txt('questions'),
+                $this->ctrl->getLinkTargetByClass(self::class, 'viewQuestions')
+            );
+
+            $this->tabs_gui->addTarget(
+                'units',
+                $this->ctrl->getLinkTargetByClass(GlobalConfigurationGUI::class, ''),
+                '',
+                'globalconfigurationgui'
+            );
+        }
+
+        if ($this->rbac_system->checkAccess('edit_permission', $this->object->getRefId())) {
+            $this->tabs_gui->addTarget(
+                'perm_settings',
+                $this->ctrl->getLinkTargetByClass([self::class, ilPermissionGUI::class], 'perm'),
+                ['perm', 'info', 'owner'],
+                'ilpermissiongui'
+            );
+        }
+    }
+
+    private function buildEditQuestionsBaseUri(): URI
+    {
+        return $this->data_factory->uri(
+            ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'viewQuestions')
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
new file mode 100755
index 000000000000..f90375918d70
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Legacy;
+
+use ILIAS\Questions\Question\Persistence\Repository as QuestionsRepository;
+use ILIAS\Questions\AnswerFormTypes\Cloze;
+use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
+use ILIAS\Questions\AnswerFormTypes\Factory as AnswerFormTypesFactory;
+use ILIAS\Questions\Presentation\Edit;
+use ILIAS\Data\Factory as DataFactory;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\DI\Container as ILIASContainer;
+use Pimple\Container as PimpleContainer;
+
+class LocalDIC extends PimpleContainer
+{
+    protected static ?self $dic = null;
+
+    public static function dic(): self
+    {
+        if (!self::$dic) {
+            global $DIC;
+            self::$dic = self::buildDIC($DIC);
+        }
+        return self::$dic;
+    }
+
+    protected static function buildDIC(ILIASContainer $DIC): self
+    {
+        $dic = new self();
+        $dic[Edit::class] = static fn($c): Edit =>
+            new Edit(
+                $DIC['lng'],
+                $DIC['ilUser'],
+                $DIC['refinery'],
+                $DIC['ui.factory'],
+                $DIC['ui.renderer'],
+                $DIC['global_screen'],
+                $DIC['ilCtrl'],
+                $DIC['http'],
+                $DIC->uiService(),
+                new DataFactory(),
+                new QuestionsRepository(
+                    $DIC['ilDB'],
+                    new UuidFactory(),
+                    new AnswerFormTypesFactory([
+                        new Cloze\Type(
+                            new Cloze\Persistence(
+                                new TableNameSpaceCore('cloze')
+                            ),
+                            new Cloze\Marking(),
+                            new Cloze\Views\Edit(
+                                $DIC['lng'],
+                                $DIC['ui.factory'],
+                                $DIC['refinery'],
+                                $DIC['http']->request(),
+                                new DataFactory()
+                            ),
+                            new Cloze\Views\Participant()
+                        )
+                    ])
+                )
+            );
+
+        return $dic;
+    }
+}
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
new file mode 100644
index 000000000000..23644751d771
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+class QstsQuestionPage extends ilPageObject
+{
+    public function getParentType(): string
+    {
+        return 'qsts';
+    }
+}
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPageConfig.php b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPageConfig.php
new file mode 100644
index 000000000000..0f811288baa8
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPageConfig.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+class QstsQuestionPageConfig extends ilPageConfig
+{
+    public function init(): void
+    {
+        $this->setEnablePCType('Tabs', true);
+        $this->setEnablePCType('AnswerForm', true);
+        $this->setEnableInternalLinks(false);
+        $this->setEnablePageToc(true);
+    }
+}
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
new file mode 100644
index 000000000000..ae44c63ecae1
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+use ILIAS\Data\URI;
+
+/**
+ *
+ * @ilCtrl_Calls QstsQuestionPageGUI: ilPageEditorGUI, ilEditClipboardGUI
+ * @ilCtrl_Calls QstsQuestionPageGUI: ilPublicUserProfileGUI, ilCommentGUI
+ */
+class QstsQuestionPageGUI extends ilPageObjectGUI
+{
+    public function __construct(
+        private readonly URI $return_uri,
+        int $id = 0
+    ) {
+        parent::__construct('qsts', $id);
+        $this->setEnabledPageFocus(false);
+    }
+
+    public function finishEditing(): void
+    {
+        $this->ctrl->redirectToURL($this->return_uri->__toString());
+    }
+}
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
new file mode 100644
index 000000000000..86f8961dad6e
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
@@ -0,0 +1,460 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+class ilPCAnswerForm extends ilPageContent
+{
+    public function init(): void
+    {
+        $this->setType('answf');
+    }
+
+    public function setQuestionReference(string $a_questionreference): void
+    {
+        if (is_object($this->getChildNode())) {
+            $this->getChildNode()->setAttribute("QRef", $a_questionreference);
+        }
+    }
+
+    public function getQuestionReference(): ?string
+    {
+        if (is_object($this->getChildNode())) {
+            return $this->getChildNode()->getAttribute("QRef");
+        }
+        return null;
+    }
+
+    public function create(
+        ilPageObject $a_pg_obj,
+        string $a_hier_id,
+        string $a_pc_id = ""
+    ): void {
+        $this->createInitialChildNode(
+            $a_hier_id,
+            $a_pc_id,
+            "Question",
+            ["QRef" => ""]
+        );
+    }
+
+    /**
+     * Copy question from pool into page
+     */
+    public function copyPoolQuestionIntoPage(
+        string $a_q_id,
+        string $a_hier_id
+    ): void {
+        $question = assQuestion::instantiateQuestion($a_q_id);
+        $duplicate_id = $question->copyObject(0, $question->getTitle());
+        $duplicate = assQuestion::instantiateQuestion($duplicate_id);
+        $duplicate->setObjId(0);
+
+        ilAssSelfAssessmentQuestionFormatter::prepareQuestionForLearningModule($duplicate);
+
+        $this->getChildNode()->setAttribute("QRef", "il__qst_" . $duplicate_id);
+    }
+
+    public static function getLangVars(): array
+    {
+        return ['ed_insert_pcqst', 'empty_question', 'pc_qst'];
+    }
+
+    /**
+     * After page has been updated (or created)
+     */
+    public static function afterPageUpdate(
+        ilPageObject $a_page,
+        DOMDocument $a_domdoc,
+        string $a_xml,
+        bool $a_creation
+    ): void {
+        global $DIC;
+
+        $ilDB = $DIC->database();
+
+        $ilDB->manipulateF(
+            "DELETE FROM page_question WHERE page_parent_type = %s " .
+            " AND page_id = %s AND page_lang = %s",
+            array("text", "integer", "text"),
+            array($a_page->getParentType(), $a_page->getId(), $a_page->getLanguage())
+        );
+
+        $xpath = new DOMXPath($a_domdoc);
+        $nodes = $xpath->query('//Question');
+        $q_ids = array();
+        foreach ($nodes as $node) {
+            $q_ref = $node->getAttribute("QRef");
+
+            $inst_id = ilInternalLink::_extractInstOfTarget($q_ref);
+            if (!($inst_id > 0)) {
+                $q_id = ilInternalLink::_extractObjIdOfTarget($q_ref);
+                if ($q_id > 0) {
+                    $q_ids[$q_id] = $q_id;
+                }
+            }
+        }
+        foreach ($q_ids as $qid) {
+            $ilDB->replace(
+                "page_question",
+                [
+                "page_parent_type" => ["text", $a_page->getParentType()],
+                "page_id" => ["integer", $a_page->getId()],
+                "page_lang" => ["text", $a_page->getLanguage()],
+                "question_id" => ["integer", $qid]
+            ],
+                []
+            );
+        }
+    }
+
+    public static function beforePageDelete(
+        ilPageObject $a_page
+    ): void {
+        global $DIC;
+
+        $ilDB = $DIC->database();
+
+        $ilDB->manipulateF(
+            "DELETE FROM page_question WHERE page_parent_type = %s " .
+            " AND page_id = %s AND page_lang = %s",
+            array("text", "integer", "text"),
+            array($a_page->getParentType(), $a_page->getId(), $a_page->getLanguage())
+        );
+    }
+
+    public static function _getQuestionIdsForPage(
+        string $a_parent_type,
+        int $a_page_id,
+        string $a_lang = "-"
+    ): array {
+        global $DIC;
+
+        $ilDB = $DIC->database();
+
+        $parent_type_array = explode(':', $a_parent_type);
+
+        $res = $ilDB->queryF(
+            "SELECT * FROM page_question WHERE page_parent_type = %s " .
+            " AND page_id = %s AND page_lang = %s",
+            array("text", "integer", "text"),
+            array($parent_type_array[0], $a_page_id, $a_lang)
+        );
+        $q_ids = array();
+        while ($rec = $ilDB->fetchAssoc($res)) {
+            $q_ids[] = $rec["question_id"];
+        }
+
+        return $q_ids;
+    }
+
+    public static function _getPageForQuestionId(
+        int $a_q_id,
+        string $a_parent_type = ""
+    ): ?array {
+        global $DIC;
+
+        $ilDB = $DIC->database();
+
+        $set = $ilDB->query(
+            "SELECT * FROM page_question " .
+            " WHERE question_id = " . $ilDB->quote($a_q_id, "integer")
+        );
+        while ($rec = $ilDB->fetchAssoc($set)) {
+            if ($a_parent_type == "" || $rec["page_parent_type"] == $a_parent_type) {
+                return array("page_id" => $rec["page_id"], "parent_type" => $rec["page_parent_type"]);
+            }
+        }
+        return null;
+    }
+
+    public function modifyPageContentPostXsl(
+        string $a_output,
+        string $a_mode,
+        bool $a_abstract_only = false
+    ): string {
+        $qhtml = "";
+
+        if ($this->getPage()->getPageConfig()->getEnableSelfAssessment()) {
+            // #14154
+            $q_ids = $this->getQuestionIds();
+            if (count($q_ids)) {
+                foreach ($q_ids as $q_id) {
+                    $q_gui = assQuestionGUI::_getQuestionGUI("", $q_id);
+                    // object check due to #16557
+                    if (is_object($q_gui->getObject()) && !$q_gui->getObject()->isComplete()) {
+                        $a_output = str_replace(
+                            "{{{{{Question;il__qst_" . $q_id . "}}}}}",
+                            "<i>" . $lng->txt("cont_empty_question") . "</i>",
+                            $a_output
+                        );
+                    }
+                }
+
+                // this exports the questions which is needed below
+                $qhtml = $this->getQuestionJsOfPage($a_mode == "edit", $a_mode);
+
+                $a_output = "<script>" . ilQuestionExporter::questionsJS($q_ids) . "</script>" . $a_output;
+                if (!self::$initial_done) {
+                    $a_output = "<script>var ScormApi=null; var questions = new Array();</script>" . $a_output;
+                    self::$initial_done = true;
+                }
+            }
+        } else {
+            // set by T&A components
+            $qhtml = $this->getPage()->getPageConfig()->getQuestionHTML();
+
+            // address #19788
+            if (!is_array($qhtml) || count($qhtml) == 0) {
+                // #14154
+                $q_ids = $this->getQuestionIds();
+                if (count($q_ids)) {
+                    foreach ($q_ids as $k) {
+                        $a_output = str_replace("{{{{{Question;il__qst_$k" . "}}}}}", " " . $lng->txt("copg_questions_not_supported_here"), $a_output);
+                    }
+                }
+            }
+        }
+
+        if (is_array($qhtml)) {
+            foreach ($qhtml as $k => $h) {
+                $a_output = str_replace("{{{{{Question;il__qst_$k" . "}}}}}", " " . $h, $a_output);
+            }
+        }
+
+        return $a_output;
+    }
+
+    /**
+     * Reset initial state (for exports)
+     */
+    public static function resetInitialState(): void
+    {
+        self::$initial_done = false;
+    }
+
+    public function getJavascriptFiles(string $a_mode): array
+    {
+        $js_files = array();
+
+        if ($this->getPage()->getPageConfig()->getEnableSelfAssessment()) {
+            $js_files[] = 'assets/js/pure_rendering.js';
+            $js_files[] = 'assets/js/question_handling.js';
+            $js_files[] = 'assets/js/matchinginput.js';
+            $js_files[] = 'assets/js/orderinghorizontal.js';
+            $js_files[] = 'assets/js/orderingvertical.js';
+            $js_files[] = 'assets/js/matching.js';
+
+            foreach ($this->getQuestionIds() as $qId) {
+                $qstGui = assQuestionGUI::_getQuestionGUI('', $qId);
+                $js_files = array_merge($js_files, $qstGui->getPresentationJavascripts());
+            }
+        }
+
+        if (!$this->getPage()->getPageConfig()->getEnableSelfAssessmentScorm() && $a_mode != ilPageObjectGUI::PREVIEW
+            && $a_mode != "offline") {
+            $js_files[] = "./components/ILIAS/COPage/js/ilCOPageQuestionHandler.js";
+        }
+
+        return $js_files;
+    }
+
+    public function getCssFiles(string $a_mode): array
+    {
+        if ($this->getPage()->getPageConfig()->getEnableSelfAssessment()) {
+            return array("./components/ILIAS/TestQuestionPool/resources/js/dist/question_handling.css",
+                "components/ILIAS/TestQuestionPool/templates/default/test_javascript.css");
+        }
+        return array();
+    }
+
+    public function getOnloadCode(string $a_mode): array
+    {
+        $code = array();
+
+        if ($this->getPage()->getPageConfig()->getEnableSelfAssessment()) {
+            if (!$this->getPage()->getPageConfig()->getEnableSelfAssessmentScorm() && $a_mode != ilPageObjectGUI::PREVIEW
+                && $a_mode != "offline" && $a_mode !== "edit") {
+                $ilCtrl->setParameterByClass(strtolower(get_class($this->getPage())) . "gui", "page_id", $this->getPage()->getId());
+                $url = $ilCtrl->getLinkTargetByClass(strtolower(get_class($this->getPage())) . "gui", "processAnswer", "", true, false);
+                $code[] = "ilCOPageQuestionHandler.initCallback('" . $url . "');";
+            }
+
+            if ($this->getPage()->getPageConfig()->getDisableDefaultQuestionFeedback()) {
+                $code[] = "ilias.questions.default_feedback = false;";
+            }
+
+            $code[] = self::getJSTextInitCode($this->getPage()->getPageConfig()->getLocalizationLanguage()) . ' il.COPagePres.updateQuestionOverviews();';
+        }
+
+        $q_ids = $this->getQuestionIds();
+
+        // call renderers
+        foreach ($q_ids as $q_id) {
+            $code[] = "if (typeof renderILQuestion$q_id === 'function') {renderILQuestion$q_id();}";
+        }
+
+        // init answer status
+        $get_stored_tries = $this->getPage()->getPageConfig()->getUseStoredQuestionTries();
+        if ($get_stored_tries) {
+            if (count($q_ids) > 0) {
+                foreach ($q_ids as $q_id) {
+                    $as = ilPageQuestionProcessor::getAnswerStatus($q_id, $ilUser->getId());
+                    $code[] = "ilias.questions.initAnswer(" . $q_id . ", " . (int) ($as["try"] ?? 0) . ", " . ($as["passed"] ? "true" : "null") . ");";
+                }
+            }
+        }
+        return $code;
+    }
+
+    /**
+     * Get js txt init code
+     */
+    public static function getJSTextInitCode(string $a_lang): string
+    {
+        global $DIC;
+
+        $lng = $DIC->language();
+        $ilUser = $DIC->user();
+
+        if ($a_lang == "") {
+            $a_lang = $ilUser->getLanguage();
+        }
+
+        return
+            '
+			ilias.questions.txt.wrong_answers = "' . $lng->txtlng("content", "cont_wrong_answers", $a_lang) . '";
+			ilias.questions.txt.wrong_answers_single = "' . $lng->txtlng("content", "cont_wrong_answers_single", $a_lang) . '";
+			ilias.questions.txt.tries_remaining = "' . $lng->txtlng("content", "cont_tries_remaining", $a_lang) . '";
+			ilias.questions.txt.please_try_again = "' . $lng->txtlng("content", "cont_please_try_again", $a_lang) . '";
+			ilias.questions.txt.all_answers_correct = "' . $lng->txtlng("content", "cont_all_answers_correct", $a_lang) . '";
+			ilias.questions.txt.enough_answers_correct = "' . $lng->txtlng("content", "cont_enough_answers_correct", $a_lang) . '";
+			ilias.questions.txt.nr_of_tries_exceeded = "' . $lng->txtlng("content", "cont_nr_of_tries_exceeded", $a_lang) . '";
+			ilias.questions.txt.correct_answers_separator = "' . $lng->txtlng("assessment", "or", $a_lang) . '";
+			ilias.questions.txt.correct_answers_shown = "' . $lng->txtlng("content", "cont_correct_answers_shown", $a_lang) . '";
+			ilias.questions.txt.correct_answers_also = "' . $lng->txtlng("content", "cont_correct_answers_also", $a_lang) . '";
+			ilias.questions.txt.correct_answer_also = "' . $lng->txtlng("content", "cont_correct_answer_also", $a_lang) . '";
+			ilias.questions.txt.ov_all_correct = "' . $lng->txtlng("content", "cont_ov_all_correct", $a_lang) . '";
+			ilias.questions.txt.ov_some_correct = "' . $lng->txtlng("content", "cont_ov_some_correct", $a_lang) . '";
+			ilias.questions.txt.ov_wrong_answered = "' . $lng->txtlng("content", "cont_ov_wrong_answered", $a_lang) . '";
+			ilias.questions.txt.please_select = "' . $lng->txtlng("content", "cont_please_select", $a_lang) . '";
+			ilias.questions.txt.ov_preview = "' . $lng->txtlng("content", "cont_ov_preview", $a_lang) . '";
+			ilias.questions.txt.submit_answers = "' . $lng->txtlng("content", "cont_submit_answers", $a_lang) . '";
+			ilias.questions.refresh_lang();
+			';
+    }
+
+    public function getQuestionJsOfPage(
+        bool $a_no_interaction,
+        string $a_mode
+    ): array {
+        $q_ids = $this->getQuestionIds();
+        $js = array();
+        if (count($q_ids) > 0) {
+            foreach ($q_ids as $q_id) {
+                $q_exporter = new ilQuestionExporter($a_no_interaction);
+                $image_path = "";
+                if ($a_mode == "offline") {
+                    if ($this->getPage()->getParentType() == "sahs") {
+                        $image_path = "./objects/";
+                    }
+                    if ($this->getPage()->getParentType() == "lm") {
+                        $image_path = "./assessment/0/" . $q_id . "/images/";
+                    }
+                }
+                $js[$q_id] = $q_exporter->exportQuestion($q_id, $image_path, $a_mode);
+            }
+        }
+        return $js;
+    }
+
+    protected function getQuestionIds(): array
+    {
+        $dom = $this->getPage()->getDomDoc();
+        $q_ids = [];
+        $nodes = $this->dom_util->path($dom, "//Question");
+        foreach ($nodes as $node) {
+            $qref = $node->getAttribute("QRef");
+            $inst_id = ilInternalLink::_extractInstOfTarget($qref);
+            $obj_id = ilInternalLink::_extractObjIdOfTarget($qref);
+
+            if (!($inst_id > 0)) {
+                if ($obj_id > 0) {
+                    $q_ids[] = $obj_id;
+                }
+            }
+        }
+        return $q_ids;
+    }
+
+    public static function handleCopiedContent(
+        DOMDocument $a_domdoc,
+        bool $a_self_ass = true,
+        bool $a_clone_mobs = false,
+        int $new_parent_id = 0,
+        int $obj_copy_id = 0
+    ): void {
+        global $DIC;
+
+        $dom_util = $DIC->copage()->internal()->domain()->domUtil();
+
+        // handle question elements
+        if ($a_self_ass) {
+            // copy questions
+            $path = "//Question";
+            $nodes = $dom_util->path($a_domdoc, $path);
+            foreach ($nodes as $node) {
+                $qref = $node->getAttribute("QRef");
+
+                $inst_id = ilInternalLink::_extractInstOfTarget($qref);
+                $q_id = ilInternalLink::_extractObjIdOfTarget($qref);
+
+                if (!($inst_id > 0)) {
+                    if ($q_id > 0) {
+                        $question = null;
+                        try {
+                            $question = assQuestion::instantiateQuestion($q_id);
+                        } catch (Exception $e) {
+                        }
+                        // check due to #16557
+                        if (is_object($question) && $question->isComplete()) {
+                            // check if page for question exists
+                            // due to a bug in early 4.2.x version this is possible
+                            if (!ilPageObject::_exists("qpl", $q_id)) {
+                                $question->createPageObject();
+                            }
+
+                            // now copy this question and change reference to
+                            // new question id
+                            $duplicate_id = $question->duplicate(false);
+                            $node->setAttribute("QRef", "il__qst_" . $duplicate_id);
+                        }
+                    }
+                }
+            }
+        } else {
+            // remove question
+            $path = "//Question";
+            $nodes = $dom_util->path($a_domdoc, $path);
+            foreach ($nodes as $node) {
+                $parent = $node->parentNode;
+                $parent->parentNode->removeChild($parent);
+            }
+        }
+    }
+}
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
new file mode 100644
index 000000000000..e97a2c11526d
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+use ILIAS\Questions\Legacy\LocalDIC;
+use ILIAS\Questions\Presentation\Edit;
+use ILIAS\Data\Factory as DataFactory;
+use ILIAS\UI\Renderer as UIRenderer;
+
+/**
+ * @ilCtrl_isCalledBy ilPCAnswerFormGUI: ilPageEditorGUI
+ */
+class ilPCAnswerFormGUI extends ilPageContentGUI
+{
+    private readonly ilTabsGUI $tabs;
+    private readonly UIRenderer $ui_renderer;
+    private readonly DataFactory $data_factory;
+    private readonly Edit $edit_view;
+
+    public function __construct(
+        ilPageObject $a_pg_obj,
+        ?ilPageContent $a_content_obj,
+        string $a_hier_id,
+        string $a_pc_id = ""
+    ) {
+        global $DIC;
+        $this->tabs = $DIC['ilTabs'];
+        $this->ui_renderer = $DIC['ui.renderer'];
+        $this->data_factory = new DataFactory();
+        $this->edit_view = LocalDIC::dic()[Edit::class];
+
+        parent::__construct($a_pg_obj, $a_content_obj, $a_hier_id, $a_pc_id);
+    }
+
+    public function executeCommand()
+    {
+        $cmd = $this->ctrl->getCmd() . 'Cmd';
+        $this->$cmd();
+    }
+
+    public function insertCmd(): void
+    {
+        $this->setInsertTabs();
+        $this->tpl->setContent(
+            $this->ui_renderer->render(
+                $this->edit_view->createAnswerForm(
+                    $this->data_factory->uri(
+                        ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'insert')
+                    )
+                )
+            )
+        );
+    }
+
+    public function editCmd(): void
+    {
+        $this->setInsertTabs();
+        $this->tpl->setContent(
+            $this->ui_renderer->render(
+                $this->edit_view->editAnswerForm(
+                    $this->data_factory->uri(
+                        ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'insert')
+                    )
+                )
+            )
+        );
+    }
+
+    private function setInsertTabs(): void
+    {
+        $this->tabs->setBackTarget(
+            $this->lng->txt('cancel'),
+            $this->ctrl->getLinkTargetByClass(\QstsQuestionPageGUI::class, 'edit')
+        );
+    }
+
+    public function setEditTabs(): void
+    {
+    }
+}
diff --git a/components/ILIAS/Questions/Questions.php b/components/ILIAS/Questions/Questions.php
new file mode 100644
index 000000000000..edc40c9542b5
--- /dev/null
+++ b/components/ILIAS/Questions/Questions.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS;
+
+use ILIAS\Questions\AnswerForm\Type as AnswerFormType;
+use ILIAS\Questions\AnswerFormTypes\Cloze;
+use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
+use ILIAS\Questions\Setup\Agent;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Setup\Agent as AgentInterface;
+
+class Questions implements Component\Component
+{
+    public function init(
+        array | \ArrayAccess &$define,
+        array | \ArrayAccess &$implement,
+        array | \ArrayAccess &$use,
+        array | \ArrayAccess &$contribute,
+        array | \ArrayAccess &$seek,
+        array | \ArrayAccess &$provide,
+        array | \ArrayAccess &$pull,
+        array | \ArrayAccess &$internal,
+    ): void {
+        $define[] = AnswerFormType::class;
+        $contribute[AgentInterface::class] = static fn() =>
+            new Agent(
+                $pull[Refinery::class]
+            );
+        /*        $contribute[AnswerFormType::class] = fn() => new Cloze\Type(
+                    new Cloze\Persistence(
+                        new TableNameSpaceCore('cloze')
+                    ),
+                    new Cloze\Marking(),
+                    new Cloze\Views\Edit(),
+                    new Cloze\Views\ParticipantView()
+                ); */
+    }
+}
diff --git a/components/ILIAS/Questions/README.md b/components/ILIAS/Questions/README.md
new file mode 100644
index 000000000000..6b2a3b9fda2b
--- /dev/null
+++ b/components/ILIAS/Questions/README.md
@@ -0,0 +1 @@
+# Questions
diff --git a/components/ILIAS/Questions/maintenance.json b/components/ILIAS/Questions/maintenance.json
new file mode 100644
index 000000000000..462ad3856cc3
--- /dev/null
+++ b/components/ILIAS/Questions/maintenance.json
@@ -0,0 +1,14 @@
+{
+    "maintenance_model": "Classic",
+    "first_maintainer": "dstrassner(48931)",
+    "second_maintainer": "mbecker(27266)",
+    "implicit_maintainers": [],
+    "coordinator": [
+        ""
+    ],
+    "tester": "SIG EA",
+    "testcase_writer": "Fabian(27631)",
+    "path": "Modules/Test",
+    "belong_to_component": "Test & Assessment",
+    "used_in_components": []
+}
\ No newline at end of file
diff --git a/components/ILIAS/Questions/service.xml b/components/ILIAS/Questions/service.xml
new file mode 100644
index 000000000000..4f310194a537
--- /dev/null
+++ b/components/ILIAS/Questions/service.xml
@@ -0,0 +1,20 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<service xmlns="http://www.w3.org" version="$Id$" id="qsts">
+    <objects>
+		<object id="qsts" class_name="Questions" dir="Legacy/Administration"
+			checkbox="0" inherit="0" translate="sys" rbac="1" system="1" administration="1">
+			<parent id="adm" max="1">adm</parent>
+		</object>
+	</objects>
+    <copage>
+        <pagecontent pc_type="answf" name="AnswerForm" directory="PageEditor" int_links="0" style_classes="1" xsl="0" def_enabled="0" top_item="1" order_nr="0" />
+        <pageobject parent_type="qsts" class_name="QstsQuestionPage" directory="Legacy/PageEditor" />
+    </copage>
+    <logging />
+    <crons>
+        <cron id="copg_history_cleanup" class="ilCleanCOPageHistoryCronjob" path="Services/COPage/Cron" />
+    </crons>
+    <events>
+        <event type="listen" id="components/ILIAS/Skill" />
+    </events>
+</service>
diff --git a/components/ILIAS/Questions/src/AnswerForm/Feedback.php b/components/ILIAS/Questions/src/AnswerForm/Feedback.php
new file mode 100644
index 000000000000..5b204f87767b
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Feedback.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm;
+
+interface Feedback
+{
+    public function getGeneralFeedback(Result $result): array;
+    public function getSpecificFeedback(Result $result, string $answer_id): array;
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Form.php b/components/ILIAS/Questions/src/AnswerForm/Form.php
new file mode 100644
index 000000000000..140fb0f12589
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Form.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm;
+
+use ILIAS\Data\UUID\Uuid;
+
+class Form
+{
+    public function __construct(
+        private readonly Type $type,
+        private readonly Uuid $question_id,
+        private ?Uuid $id = null,
+        private ?Skills $skills = null
+    ) {
+    }
+
+    public function getType(): Type
+    {
+        return $this->type;
+    }
+
+    public function getQuestionId(): Uuid
+    {
+        return $this->question_id;
+    }
+
+    public function getId(): ?Uuid
+    {
+        return $this->id;
+    }
+
+    public function withId(Uuid $id): self
+    {
+        $clone = clone $this;
+        $clone->id = $id;
+        return $clone;
+    }
+
+    public function getSkills(): Skills
+    {
+        return $this->skills;
+    }
+
+    public function withSkills(Skills $skills): self
+    {
+        $clone = clone $this;
+        $clone->skills = $skills;
+        return $clone;
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Marking.php b/components/ILIAS/Questions/src/AnswerForm/Marking.php
new file mode 100644
index 000000000000..10e5b9ee363a
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Marking.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm;
+
+use ILIAS\Questions\Response\Response;
+
+interface Marking
+{
+    public function addAchievedPointsToResult(Response $response): Response;
+    public function getBestResponse(): Response;
+    public function getFeedback(): Feedback;
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Persistence.php b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
new file mode 100644
index 000000000000..9b046e733725
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm;
+
+use ILIAS\Questions\Question\Persistence\Column;
+use ILIAS\Questions\Question\Persistence\SelectQuery;
+use ILIAS\Questions\Question\Persistence\TableNameBuilder;
+use ILIAS\Questions\Question\Persistence\TableNameSpace;
+
+interface Persistence
+{
+    public function getPublicNameSpace(): TableNameSpace;
+    public function completeSelectQuery(
+        TableNameBuilder $table_name_builder,
+        SelectQuery $select_query,
+        Column $base_table_id_column,
+    ): SelectQuery;
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Type.php b/components/ILIAS/Questions/src/AnswerForm/Type.php
new file mode 100644
index 000000000000..de0c0c341bd4
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Type.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm;
+
+use ILIAS\Questions\AnswerForm\Views\Edit;
+use ILIAS\Questions\AnswerForm\Views\Participant;
+use ILIAS\Language\Language;
+
+interface Type
+{
+    public function withData(
+        string $id,
+        ?float $available_points,
+        ?int $image_size,
+        ?bool $shuffle_answer_options,
+        string $additional_text,
+        string $additional_text_legacy,
+        ?array $data
+    ): static;
+
+    public function getLabel(Language $lng): string;
+
+    public function getPersistence(): Persistence;
+    public function isMarkable(): bool;
+    public function getMarking(): ?Marking;
+    public function getEditView(): Edit;
+    public function getParticipantView(): Participant;
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
new file mode 100644
index 000000000000..b5552ac55283
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm\Views;
+
+use ILIAS\Questions\Question\Persistence\UpdateQuery;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
+
+interface Edit
+{
+    public function create(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        string $step
+    ): array|UpdateQuery;
+
+    public function edit(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        string $step
+    ): array|UpdateQuery;
+
+    public function other(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        string $cmd
+    ): array|UpdateQuery;
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php b/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php
new file mode 100644
index 000000000000..9bd7e2c1d7bc
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm\Views;
+
+use ILIAS\Questions\Response\Response;
+
+interface Participant
+{
+    public function isAsyncPresentationAvailable(): bool;
+    public function get(
+        ?Response $response
+    ): array;
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Marking.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Marking.php
new file mode 100644
index 000000000000..1be7f166cbba
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Marking.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze;
+
+use ILIAS\Questions\AnswerForm\Marking as MarkingInterface;
+use ILIAS\Questions\Response\Response;
+use ILIAS\Questions\AnswerForm\Feedback;
+
+class Marking implements MarkingInterface
+{
+    public function addAchievedPointsToResult(Response $response): Response
+    {
+
+    }
+
+    public function getBestResponse(): Response
+    {
+
+    }
+
+    public function getFeedback(): Feedback
+    {
+
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
new file mode 100644
index 000000000000..80f03cba1607
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze;
+
+use ILIAS\Questions\AnswerForm\Persistence as PersistenceInterface;
+use ILIAS\Questions\Question\Persistence\SelectQuery;
+use ILIAS\Questions\Question\Persistence\Join;
+use ILIAS\Questions\Question\Persistence\Column;
+use ILIAS\Questions\Question\Persistence\JoinType;
+use ILIAS\Questions\Question\Persistence\Select;
+use ILIAS\Questions\Question\Persistence\TableNameBuilder;
+use ILIAS\Questions\Question\Persistence\TableNameSpace;
+use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
+
+class Persistence implements PersistenceInterface
+{
+    private const string ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
+    private const array ANSWER_FORM_TABLE_COLUMNS = [
+        'case_sensitive',
+        'identical_responses_valid',
+        'max_chars',
+        'min_auto_complete'
+    ];
+
+    private const string ANSWER_INPUTS_TABLE_ID_COLUMN = 'id';
+    private const string ANSWER_INPUTS_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
+    private const array ANSWER_INPUTS_TABLE_COLUMNS = [
+        'id AS answer_input_id',
+        'gap_type',
+        'max_chars'
+    ];
+
+    private const string ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN = 'answer_input_id';
+    private const array ANSWER_OPTIONS_TABLE_COLUMNS = [
+        'id AS answer_option_id',
+        'position',
+        'value',
+        'points'
+    ];
+
+    private const string COMBINATIONS_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
+    private const array COMBINATIONS_TABLE_COLUMNS = [
+        'id AS combination_id',
+        'answer_options',
+        'points'
+    ];
+
+    public function __construct(
+        private readonly TableNameSpaceCore $table_namespace
+    ) {
+    }
+
+    public function getPublicNameSpace(): TableNameSpace
+    {
+        return $this->table_namespace;
+    }
+
+    public function completeSelectQuery(
+        TableNameBuilder $table_name_builder,
+        SelectQuery $select_query,
+        Column $base_table_id_column
+    ): SelectQuery {
+        return $select_query->withAdditionalJoin(
+            new Join(
+                $base_table_id_column,
+                new Column(
+                    $table_name_builder->getTypeSpecificAnswerFormsTableName(),
+                    self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
+                )
+            )
+        )->withAdditionalSelect(
+            new Select(
+                $table_name_builder->getTypeSpecificAnswerFormsTableName(),
+                self::ANSWER_FORM_TABLE_COLUMNS
+            )
+        )->withAdditionalJoin(
+            new Join(
+                $base_table_id_column,
+                new Column(
+                    $table_name_builder->getAnswerInputsTableName(),
+                    self::ANSWER_INPUTS_TABLE_FOREIGN_KEY_COLUMN
+                ),
+                JoinType::Left
+            )
+        )->withAdditionalSelect(
+            new Select(
+                $table_name_builder->getAnswerInputsTableName(),
+                self::ANSWER_INPUTS_TABLE_COLUMNS
+            )
+        )->withAdditionalJoin(
+            new Join(
+                new Column(
+                    $table_name_builder->getAnswerInputsTableName(),
+                    self::ANSWER_INPUTS_TABLE_ID_COLUMN
+                ),
+                new Column(
+                    $table_name_builder->getAnswerOptionsTableName(),
+                    self::ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN
+                ),
+                JoinType::Left
+            )
+        )->withAdditionalSelect(
+            new Select(
+                $table_name_builder->getAnswerOptionsTableName(),
+                self::ANSWER_OPTIONS_TABLE_COLUMNS
+            )
+        )->withAdditionalJoin(
+            new Join(
+                $base_table_id_column,
+                new Column(
+                    $table_name_builder->getAdditionalTableName('combinations'),
+                    self::COMBINATIONS_TABLE_FOREIGN_KEY_COLUMN
+                ),
+                JoinType::Left
+            )
+        )->withAdditionalSelect(
+            new Select(
+                $table_name_builder->getAdditionalTableName('combinations'),
+                self::COMBINATIONS_TABLE_COLUMNS
+            )
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
new file mode 100644
index 000000000000..614870c6c2ce
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze;
+
+use ILIAS\Questions\AnswerForm\Type as TypeInterface;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Edit;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Participant;
+use ILIAS\Language\Language;
+
+class Type implements TypeInterface
+{
+    private string $id;
+    private float $available_points = 0.0;
+    private string $cloze_text = '';
+    private string $cloze_text_legacy = '';
+    private bool $case_sensitive = false;
+    private bool $identical_responses_valid = true;
+    private ?int $max_chars = null;
+    private int $min_autocomplete = 3;
+
+    /**
+     *
+     * @var array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Gap>
+     */
+    private array $gaps = [];
+
+    public function __construct(
+        private readonly Persistence $persistence,
+        private readonly Marking $marking,
+        private readonly Edit $edit_view,
+        private readonly Participant $participant_view
+    ) {
+    }
+
+    public function withData(
+        string $id,
+        ?float $available_points,
+        ?int $image_size,
+        ?bool $shuffle_answer_options,
+        string $additional_text,
+        string $additional_text_legacy,
+        ?array $data
+    ): static {
+        $this->id = $id;
+        if ($available_points !== null) {
+            $this->available_points = $available_points;
+        }
+
+        $this->cloze_text = $additional_text;
+        $this->cloze_text_legacy = $additional_text_legacy;
+    }
+
+    public function getLabel(Language $lng): string
+    {
+        return $lng->txt('assClozeTest');
+    }
+
+    public function getPersistence(): Persistence
+    {
+        return $this->persistence;
+    }
+
+    public function isMarkable(): bool
+    {
+        return true;
+    }
+
+    public function getMarking(): ?Marking
+    {
+        return $this->marking->withAnswerForm($this);
+    }
+
+    public function getEditView(): Edit
+    {
+        return $this->edit_view->withAnswerForm($this);
+    }
+
+    public function getParticipantView(): Participant
+    {
+        return $this->participant_view->withAnswerForm($this);
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
new file mode 100644
index 000000000000..aee9ea68c4dd
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
+
+use ILIAS\Questions\AnswerForm\Views\Edit as EditViewInterface;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Type;
+use ILIAS\Questions\Question\Persistence\UpdateQuery;
+use ILIAS\Data\Factory as DataFactory;
+use ILIAS\Language\Language;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
+use ILIAS\Refinery\Factory as Refinery;
+use Psr\Http\Message\RequestInterface;
+
+class Edit implements EditViewInterface
+{
+    private const string SET_GAP_TYPES = 'sgt';
+
+    private ?Type $type = null;
+
+    public function __construct(
+        private readonly Language $lng,
+        private readonly UIFactory $ui_factory,
+        private readonly Refinery $refinery,
+        private readonly RequestInterface $request,
+        private readonly DataFactory $data_factory
+    ) {
+    }
+
+    public function create(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        string $step
+    ): array|UpdateQuery {
+        return match($step) {
+            self::SET_GAP_TYPES => $this->setGapTypes($url_builder, $step_token),
+            default => [$this->buildBasicEditingForm($url_builder, $step_token)]
+        };
+    }
+
+    public function edit(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        string $step
+    ): array|UpdateQuery {
+
+    }
+
+    public function other(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        string $step
+    ): array|UpdateQuery {
+
+    }
+
+    public function withAnswerForm(Type $type): self
+    {
+        $clone = clone $this;
+        $clone->type = $type;
+        return $clone;
+    }
+
+    private function buildBasicEditingForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): StandardForm {
+
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
new file mode 100644
index 000000000000..19f82ace8cb1
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
+
+use ILIAS\Questions\AnswerForm\Views\Participant as ParticipantViewInterface;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Type;
+use ILIAS\Questions\Response\Response;
+
+class Participant implements ParticipantViewInterface
+{
+    private ?Type $type = null;
+
+    public function isAsyncPresentationAvailable(): bool
+    {
+        return true;
+    }
+
+    public function get(
+        ?Response $response
+    ): array {
+
+    }
+
+    public function withAnswerForm(Type $type): self
+    {
+        $clone = clone $this;
+        $clone->type = $type;
+        return $clone;
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Factory.php
new file mode 100644
index 000000000000..5cf60fd2de56
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Factory.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes;
+
+use ILIAS\Questions\AnswerForm\Type;
+
+class Factory
+{
+    /**
+     * @var array<string, \ILIAS\Questions\AnswerForm\Type> $available_answer_form_types
+     */
+    private readonly array $available_answer_form_types;
+
+    /**
+     * @param array<\ILIAS\Questions\AnswerForm\Type> $available_answer_form_types
+     */
+    public function __construct(
+        array $available_answer_form_types
+    ) {
+        $this->available_answer_form_types = array_reduce(
+            $available_answer_form_types,
+            static function (array $c, Type $v) {
+                $c[$v::class] = $v;
+                return $c;
+            },
+            []
+        );
+    }
+
+    /**
+     * @return array<string, \ILIAS\Questions\AnswerForm\Type>
+     */
+    public function getAvailableAnswerTypes(): array
+    {
+        return $this->available_answer_form_types;
+    }
+
+    public function getAnswerFormTypeByClass(string $class): ?Type
+    {
+        return $this->available_answer_form_types[$class] ?? null;
+    }
+}
diff --git a/components/ILIAS/Questions/src/Collector.php b/components/ILIAS/Questions/src/Collector.php
new file mode 100644
index 000000000000..77c0be20da04
--- /dev/null
+++ b/components/ILIAS/Questions/src/Collector.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions;
+
+use ILIAS\Questions\AnswerForm\Type as AnswerFormType;
+use ILIAS\Questions\Question\Persistence\Repository;
+use ILIAS\Questions\Question\Question;
+
+class Collector
+{
+    private array $required_capabilities = [];
+
+    public function __construct(
+        private readonly Repository $repository
+    ) {
+    }
+
+    public function having(string $property_class_name): self
+    {
+        if (in_array($property_class_name, $this->required_capabilities)) {
+            return $this;
+        }
+
+        $clone = clone $this;
+        $clone->required_capabilities[] = $property_class_name;
+        $clone->available_answer_form_types = array_filter(
+            $clone->available_answer_form_types,
+            static fn(AnswerFormType $v): bool => $v->isGradable()
+        );
+
+        return $clone;
+    }
+
+    /**
+     * @return array<string, \ILIAS\Questions\AnswerForm\Type>
+     */
+    public function getAvailableAnswerTypes(): array
+    {
+        return $this->repository->getAvailableAnswerTypes();
+    }
+
+    public function getQuestionsForId(int $id): Question|null
+    {
+        return $this->repository->getForQuestionId($id);
+    }
+
+    /**
+     *
+     * @param array<int> $ids
+     * @return \Generator<ILIAS\Questions\Question\Question>
+     */
+    public function getQuestionsForIds(array $ids): \Generator
+    {
+        yield from $this->repository->getForQuestionIds($ids);
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Edit.php b/components/ILIAS/Questions/src/Presentation/Edit.php
new file mode 100644
index 000000000000..cbd487d01784
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Edit.php
@@ -0,0 +1,440 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation;
+
+use ILIAS\Questions\AnswerForm\Type;
+use ILIAS\Questions\Question\Persistence\Repository;
+use ILIAS\Questions\Question\Views\Edit as QuestionEdit;
+use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Data\Factory as DataFactory;
+use ILIAS\Data\URI;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
+use ILIAS\HTTP\Services as HTTP;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Renderer as UIRenderer;
+use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
+use ILIAS\UI\Component\Item\Standard as StandardItem;
+use ILIAS\UI\Component\Item\Group as ItemGroup;
+use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
+use ILIAS\GlobalScreen\Services as GlobalScreen;
+
+class Edit
+{
+    private const array QUERY_PARAMETER_NAME_SPACE = ['q'];
+    private const string ACTION_TOKEN_STRING = 'a';
+    private const string STEP_TOKEN_STRING = 's';
+    private const string ROW_ID_TOKEN_STRING = 'r';
+    private const string CMD_CREATE_QUESTION = 'create';
+    private const string CMD_EDIT_QUESTION = 'edit';
+    private const string CMD_CREATE_ACTION_FORM = 'create_af';
+    private const string CMD_EDIT_ACTION_FORM = 'edit_af';
+
+    private Editability $editability = Editability::Full;
+
+    public function __construct(
+        private readonly Language $lng,
+        private readonly \ilObjUser $current_user,
+        private readonly Refinery $refinery,
+        private readonly UIFactory $ui_factory,
+        private readonly UIRenderer $ui_renderer,
+        private readonly GlobalScreen $global_screen,
+        private readonly \ilCtrl $ctrl,
+        private readonly HTTP $http,
+        private readonly \ilUIService $ui_services,
+        private readonly DataFactory $data_factory,
+        private readonly Repository $questions_repository
+    ) {
+
+    }
+
+    public function withEditable(Editability $editability): self
+    {
+        $clone = clone $this;
+        $clone->editability = $editability;
+        return $clone;
+    }
+
+    public function view(
+        \ilToolbarGUI $toolbar,
+        URI $base_uri
+    ): array {
+        [$url_builder, $action_token, $step_token, $row_id_token] = (new URLBuilder($base_uri))
+            ->acquireParameters(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::ACTION_TOKEN_STRING,
+                self::STEP_TOKEN_STRING,
+                self::ROW_ID_TOKEN_STRING
+            );
+
+        return match($this->retrieveAction($action_token)) {
+            self::CMD_CREATE_QUESTION => $this->createQuestion($url_builder, $action_token, $step_token, $row_id_token),
+            self::CMD_EDIT_QUESTION => $this->editQuestion($url_builder, $action_token, $step_token, $row_id_token),
+            default => $this->showTable($toolbar, $url_builder, $action_token, $row_id_token)
+        };
+    }
+
+    public function forwardPageCmds(
+        \ilGlobalTemplateInterface $tpl,
+        URI $base_uri,
+    ): void {
+        [$url_builder, $action_token, $row_id_token] = (new URLBuilder($base_uri))
+            ->acquireParameters(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::ACTION_TOKEN_STRING,
+                self::ROW_ID_TOKEN_STRING
+            );
+
+        $this->initializeEditMode($url_builder, $action_token, $row_id_token);
+
+        $question_id = $this->http->wrapper()->query()->retrieve(
+            $row_id_token->getName(),
+            $this->refinery->kindlyTo()->string()
+        );
+
+        $page_id = $this->http->wrapper()->query()->retrieve(
+            QuestionEdit::PAGE_ID_PARAM_FOR_EDITOR,
+            $this->refinery->kindlyTo()->int()
+        );
+
+        $this->setParametersForQuestionCmds($row_id_token, $question_id, $page_id);
+
+        $tpl->setContent(
+            $this->ctrl->forwardCommand(
+                new \QstsQuestionPageGUI(
+                    $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION)
+                        ->withParameter($row_id_token, $question_id)
+                        ->buildURI(),
+                    $page_id
+                )
+            )
+        );
+    }
+
+    public function createAnswerForm(
+        URI $base_uri
+    ): array {
+        [$url_builder, $action_token] = (new URLBuilder($base_uri))
+            ->acquireParameters(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::ACTION_TOKEN_STRING
+            );
+        return match($this->retrieveAction($action_token)) {
+            self::CMD_CREATE_ACTION_FORM => $this->processCreateAnswerForm($url_builder, $action_token),
+            default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
+        };
+    }
+
+    public function editAnswerForm(
+        URI $base_uri
+    ): array {
+        [$url_builder, $action_token] = (new URLBuilder($base_uri))
+            ->acquireParameters(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::ACTION_TOKEN_STRING
+            );
+        return match($this->retrieveAction($action_token)) {
+            self::CMD_CREATE_ACTION_FORM => [$this->retrieve($url_builder, $action_token)],
+            default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
+        };
+    }
+
+    private function createQuestion(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $row_id_token
+    ): array {
+        $this->initializeEditMode($url_builder, $action_token, $row_id_token);
+
+        $create = (new QuestionImplementation())->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->create(
+            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION),
+            $step_token,
+            $this->retrieveAction($action_token)
+        );
+
+        if (is_array($create)) {
+            return $create;
+        }
+
+        $this->questions_repository->store($create);
+        return $this->buildEditStartView(
+            $url_builder->withParameter($row_id_token, $create->getId()),
+            $step_token,
+            $create
+        );
+
+    }
+
+    private function editQuestion(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $row_id_token
+    ): array {
+        $this->initializeEditMode($url_builder, $action_token, $row_id_token);
+
+        $question_id = $this->http->wrapper()->query()->retrieve(
+            $row_id_token->getName(),
+            $this->refinery->kindlyTo()->string()
+        );
+
+        $url_builder_with_row_id = $url_builder->withParameter($row_id_token, $question_id);
+
+        $edit = $this->questions_repository->getForQuestionId($question_id)->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->edit(
+            $url_builder_with_row_id->withParameter($action_token, self::CMD_EDIT_QUESTION),
+            $step_token,
+            $this->retrieveAction($action_token)
+        );
+
+        if (is_array($edit)) {
+            return $edit;
+        }
+
+        $this->questions_repository->store($edit);
+        return $this->buildEditStartView(
+            $url_builder_with_row_id,
+            $step_token,
+            $edit
+        );
+    }
+
+    private function showTable(
+        \ilToolbarGUI $toolbar,
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $row_id_token
+    ): array {
+        $toolbar->addComponent(
+            $this->ui_factory->button()->standard(
+                $this->lng->txt('create'),
+                $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()->__toString()
+            )
+        );
+
+        $table = new QuestionsTable(
+            $this->ui_factory,
+            $this->ui_services,
+            $this->lng,
+            $this->questions_repository,
+            $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
+            $action_token,
+            $row_id_token
+        );
+        return [
+            $table->getFilter($url_builder->buildURI()->__toString()),
+            $table->getTable()->withRequest($this->http->request())
+
+        ];
+    }
+
+    private function processCreateAnswerForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token
+    ): array {
+        $form = $this->buildCreateAnswerForm($url_builder, $action_token)
+            ->withRequest($this->http->request());
+        $data = $form->getData();
+        if ($data === null || $data['form_type'] === null) {
+            return [$form];
+        }
+        return $data['form_type']->getEditView()->create();
+    }
+
+    private function retrieveAction(
+        URLBuilderToken $action_token
+    ): string {
+        return $this->http->wrapper()->query()->retrieve(
+            $action_token->getName(),
+            $this->buildActionTrafo()
+        );
+    }
+
+    private function buildActionTrafo(): Transformation
+    {
+        return $this->refinery->byTrying([
+            $this->refinery->kindlyTo()->string(),
+            $this->refinery->always('')
+        ]);
+    }
+
+    private function initializeEditMode(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $row_id_token
+    ): void {
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::MODE_ENABLED,
+            true
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::QUESTIONLIST_ENTRY,
+            $this->buildQuestionListSlate($url_builder, $action_token, $row_id_token)
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::URL_CLOSE_MODE_INFO,
+            $url_builder->buildURI()
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::URL_CREATE_QUESTION,
+            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()
+        );
+    }
+
+    private function setParametersForQuestionCmds(
+        URLBuilderToken $row_id_token,
+        string $question_id,
+        int $page_id
+    ): void {
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            $row_id_token->getName(),
+            $question_id
+        );
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            QuestionEdit::PAGE_ID_PARAM_FOR_EDITOR,
+            $page_id
+        );
+        $this->ctrl->setParameterByClass(
+            $this->ctrl->getCmdClass(),
+            $row_id_token->getName(),
+            $question_id
+        );
+        $this->ctrl->setParameterByClass(
+            $this->ctrl->getCmdClass(),
+            QuestionEdit::PAGE_ID_PARAM_FOR_EDITOR,
+            $page_id
+        );
+    }
+
+    private function buildQuestionListSlate(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $row_id_token
+    ): LegacySlate {
+        return $this->ui_factory->mainControls()->slate()->legacy(
+            $this->lng->txt('mainbar_button_label_questionlist'),
+            $this->ui_factory->symbol()->icon()->standard('', '')->withAbbreviation('QL'),
+            $this->ui_factory->legacy()->content(
+                $this->ui_renderer->render(
+                    $this->ui_factory->panel()->secondary()->listing(
+                        $this->lng->txt('mainbar_button_label_questionlist'),
+                        [
+                            $this->buildItemGroupForQuestionListSlate($url_builder, $action_token, $row_id_token)
+                        ]
+                    )
+                )
+            )
+        );
+    }
+
+    private function buildItemGroupForQuestionListSlate(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $row_id_token
+    ): ItemGroup {
+        return $this->ui_factory->item()->group(
+            '',
+            array_map(
+                fn(QuestionImplementation $v): StandardItem => $this->ui_factory->item()->standard(
+                    $v->toEditLink(
+                        $this->ui_factory->link(),
+                        $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
+                        $row_id_token
+                    )
+                ),
+                iterator_to_array($this->questions_repository->getAllQuestions())
+            )
+        );
+    }
+
+    private function buildEditStartView(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        QuestionImplementation $question
+    ): array {
+        return $question->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->edit(
+            $url_builder,
+            $step_token,
+            ''
+        );
+    }
+
+    private function buildCreateAnswerForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token
+    ): StandardForm {
+        $if = $this->ui_factory->input();
+        return $if->container()->form()->standard(
+            $url_builder->withParameter($action_token, self::CMD_CREATE_ACTION_FORM)->buildURI()->__toString(),
+            [
+                'form_type' => $if->field()->section(
+                    [
+                        $if->field()->select(
+                            $this->lng->txt('select_answer_form'),
+                            array_reduce(
+                                $this->questions_repository->getAvailableAnswerTypes(),
+                                function (array $c, Type $v): array {
+                                    $c[$v::class] = $v->getLabel($this->lng);
+                                    return $c;
+                                },
+                                []
+                            )
+                        )->withRequired(true)
+                    ],
+                    $this->lng->txt('create_answer_form')
+                )->withAdditionalTransformation(
+                    $this->refinery->custom()->transformation(
+                        fn(array $vs): ?Type => $this->questions_repository->getAvailableAnswerTypeByClass($vs[0])
+                    )
+                )
+            ]
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Editability.php b/components/ILIAS/Questions/src/Presentation/Editability.php
new file mode 100644
index 000000000000..b8e8ce6a99d8
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Editability.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation;
+
+enum Editability
+{
+    case ReadOnly;
+    case Limited;
+    case Full;
+}
diff --git a/components/ILIAS/Questions/src/Presentation/LayoutProvider.php b/components/ILIAS/Questions/src/Presentation/LayoutProvider.php
new file mode 100755
index 000000000000..6c48a4496a59
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/LayoutProvider.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation;
+
+use ILIAS\GlobalScreen\Scope\Layout\Factory\BreadCrumbsModification;
+use ILIAS\GlobalScreen\Scope\Layout\Factory\MainBarModification;
+use ILIAS\GlobalScreen\Scope\Layout\Factory\MetaBarModification;
+use ILIAS\GlobalScreen\Scope\Layout\Factory\PageBuilderModification;
+use ILIAS\GlobalScreen\Scope\Layout\Builder\StandardPageBuilder;
+use ILIAS\GlobalScreen\Scope\Layout\Provider\AbstractModificationProvider;
+use ILIAS\GlobalScreen\Scope\Layout\Provider\PagePart\PagePartProvider;
+use ILIAS\GlobalScreen\ScreenContext\Stack\CalledContexts;
+use ILIAS\GlobalScreen\ScreenContext\Stack\ContextCollection;
+use ILIAS\UI\Component\Breadcrumbs\Breadcrumbs;
+use ILIAS\UI\Component\Layout\Page\Page;
+use ILIAS\UI\Component\MainControls\MetaBar;
+use ILIAS\UI\Component\MainControls\MainBar;
+
+class LayoutProvider extends AbstractModificationProvider
+{
+    public const MODE_ENABLED = 'question_edit_mode_enabled';
+    public const QUESTIONLIST_ENTRY = 'question_questionlist_entry';
+    public const URL_CLOSE_MODE_INFO = 'question_close_mode_info';
+    public const URL_CREATE_QUESTION = 'question_create_question_url';
+
+    private const MODIFICATION_PRIORITY = 5; //slightly above "low"
+
+    public function isInterestedInContexts(): ContextCollection
+    {
+        return $this->context_collection->main();
+    }
+
+    protected function isModeEnabled(CalledContexts $called_contexts): bool
+    {
+        return $called_contexts->current()->getAdditionalData()
+            ->is(self::MODE_ENABLED, true);
+    }
+
+    public function getBreadCrumbsModification(CalledContexts $called_contexts): ?BreadCrumbsModification
+    {
+        if (!$this->isModeEnabled($called_contexts)) {
+            return null;
+        }
+
+        return $this->globalScreen()->layout()->factory()->breadcrumbs()
+            ->withModification(
+                function (?Breadcrumbs $current): ?Breadcrumbs {
+                    return null;
+                }
+            )->withPriority(self::MODIFICATION_PRIORITY);
+    }
+
+    public function getMainBarModification(CalledContexts $called_contexts): ?MainBarModification
+    {
+        $mainbar = $this->globalScreen()->layout()->factory()->mainbar();
+
+        if (!$this->isModeEnabled($called_contexts)) {
+            return null;
+        }
+
+        return $mainbar
+            ->withModification(
+                $this->buildMainBarModification($called_contexts)
+            )->withPriority(self::MODIFICATION_PRIORITY);
+    }
+
+    public function getMetaBarModification(CalledContexts $called_contexts): ?MetaBarModification
+    {
+        if (!$this->isModeEnabled($called_contexts)) {
+            return null;
+        }
+
+        return $this->globalScreen()->layout()->factory()->metabar()
+            ->withModification(
+                function (?MetaBar $current): ?MetaBar {
+                    return null;
+                }
+            )->withPriority(self::MODIFICATION_PRIORITY);
+    }
+
+    public function getPageBuilderDecorator(CalledContexts $called_contexts): ?PageBuilderModification
+    {
+        if (!$this->isModeEnabled($called_contexts)) {
+            return null;
+        }
+
+        $mode_info = $this->dic['ui.factory']->mainControls()->modeInfo(
+            $this->dic->language()->txt('edit_questions'),
+            $called_contexts->current()->getAdditionalData()->get(self::URL_CLOSE_MODE_INFO)
+        );
+
+        return $this->factory->page()
+            ->withLowPriority()
+            ->withModification(
+                static function (PagePartProvider $parts) use ($mode_info): Page {
+                    $p = new StandardPageBuilder();
+                    $page = $p->build($parts);
+                    return $page->withModeInfo($mode_info);
+                }
+            );
+    }
+
+    private function buildMainbarModification(CalledContexts $called_contexts): \Closure
+    {
+        return function (?MainBar $mainbar) use ($called_contexts): ?MainBar {
+            if ($mainbar === null) {
+                return null;
+            }
+
+            $tools = $mainbar->getToolEntries();
+            $new_mainbar = array_reduce(
+                array_keys($tools),
+                static fn(MainBar $c, string $v): MainBar => $c->withAdditionalToolEntry($v, $tools[$v]),
+                $mainbar
+                    ->withClearedEntries()
+                    ->withAdditionalEntry(
+                        'create_question',
+                        $this->dic['ui.factory']->button()->bulky(
+                            $this->dic['ui.factory']->symbol()->icon()->standard('', '')->withAbbreviation('CQ'),
+                            $this->dic['lng']->txt('create_question'),
+                            $called_contexts->current()->getAdditionalData()->get(self::URL_CREATE_QUESTION)->__toString()
+                        )
+                    )
+            );
+
+            if ($called_contexts->current()->getAdditionalData()->exists(self::QUESTIONLIST_ENTRY)) {
+                return $new_mainbar->withAdditionalEntry(
+                    'question_list',
+                    $called_contexts->current()->getAdditionalData()->get(self::QUESTIONLIST_ENTRY)
+                );
+            }
+
+            return $new_mainbar;
+        };
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/QuestionsTable.php
new file mode 100644
index 000000000000..46d8da3e0f40
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/QuestionsTable.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation;
+
+use ILIAS\Questions\Question\Persistence\Repository;
+use ILIAS\Data\Range;
+use ILIAS\Data\Order;
+use ILIAS\UI\Component\Table;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Input\Container\Filter\Standard as Filter;
+
+class QuestionsTable implements Table\DataRetrieval
+{
+    public function __construct(
+        private readonly UIFactory $ui_factory,
+        private readonly \ilUIService $ui_service,
+        private readonly \ilLanguage $lng,
+        private readonly Repository $questions_repository,
+        private readonly URLBuilder $url_builder,
+        private readonly URLBuilderToken $action_token,
+        private readonly URLBuilderToken $row_id_token
+    ) {
+        $lng->loadLanguageModule('qpl');
+    }
+
+    public function getTable(): Table\Data
+    {
+        return $this->ui_factory->table()->data(
+            $this,
+            $this->lng->txt('questions'),
+            $this->getColums(),
+        );
+    }
+
+    public function getFilter(string $action): Filter
+    {
+        $question_type_options = [
+            '' => $this->lng->txt('filter_all_question_types')
+        ];
+
+        foreach ($this->questions_repository->getAvailableAnswerTypes() as $class => $type) {
+            $question_type_options[$class] = $type->getLabel($this->lng);
+        }
+
+        $field_factory = $this->ui_factory->input()->field();
+        $filter_inputs = [
+            'title' => $field_factory->text($this->lng->txt('title')),
+            'contains_type' => $field_factory->select($this->lng->txt('contains_type'), $question_type_options),
+        ];
+
+        $active = array_fill(0, count($filter_inputs), true);
+
+        $filter = $this->ui_service->filter()->standard(
+            'question_table_filter_id',
+            $action,
+            $filter_inputs,
+            $active,
+            true,
+            true
+        );
+        return $filter;
+    }
+
+
+    public function getColums(): array
+    {
+        $f = $this->ui_factory->table()->column();
+
+        return [
+            'title' => $f->link($this->lng->txt('title')),
+            'type' => $f->text($this->lng->txt('question_type'))->withIsOptional(true, true),
+        ];
+    }
+
+    public function getRows(
+        Table\DataRowBuilder $row_builder,
+        array $visible_column_ids,
+        Range $range,
+        Order $order,
+        ?array $filter_data,
+        ?array $additional_parameters
+    ): \Generator {
+        foreach ($this->questions_repository->getAllQuestions() as $question) {
+            yield $question->toTableRow(
+                $row_builder,
+                $this->ui_factory,
+                $this->url_builder,
+                $this->row_id_token
+            );
+        }
+    }
+
+    public function getTotalRowCount(
+        ?array $filter_data,
+        ?array $additional_parameters
+    ): ?int {
+        return 0;
+    }
+}
diff --git a/components/ILIAS/Questions/src/PublicInterface.php b/components/ILIAS/Questions/src/PublicInterface.php
new file mode 100644
index 000000000000..6b089127b8ff
--- /dev/null
+++ b/components/ILIAS/Questions/src/PublicInterface.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions;
+
+use ILIAS\Questions\Presentation\Edit;
+
+class PublicInterface
+{
+    public function __construct(
+        private readonly Collector $collector,
+        private readonly Edit $edit_presentation
+    ) {
+
+    }
+
+    public function getCollector(): Collector
+    {
+        return $this->collector;
+    }
+
+    public function getEditPresentation(): Edit
+    {
+        return $this->edit_presentation;
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Lifecycle.php b/components/ILIAS/Questions/src/Question/Lifecycle.php
new file mode 100644
index 000000000000..ef6100a67196
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Lifecycle.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question;
+
+enum Lifecycle: string
+{
+    case Draft = 'draft';
+    case Review = 'review';
+    case Rejected = 'rejected';
+    case Final = 'final';
+    case Sharable = 'sharable';
+    case Outdated = 'outdated';
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Column.php b/components/ILIAS/Questions/src/Question/Persistence/Column.php
new file mode 100644
index 000000000000..1565f3f35e82
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Column.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class Column
+{
+    public function __construct(
+        private readonly string $table,
+        private readonly string $column
+    ) {
+    }
+
+    public function getTable(): string
+    {
+        return $this->table;
+    }
+
+    public function toColumnString(): string
+    {
+        return "{$this->table}.{$this->column}";
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Join.php b/components/ILIAS/Questions/src/Question/Persistence/Join.php
new file mode 100644
index 000000000000..e4848d4d5d47
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Join.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class Join
+{
+    public function __construct(
+        private readonly Column $left,
+        private readonly Column $right,
+        private readonly JoinType $type = JoinType::Inner
+    ) {
+    }
+
+    public function toSql(): string
+    {
+        return "{$this->type->value} JOIN {$this->right->getTable()} ON {$this->left->toColumnString()} = {$this->right->toColumnString()}";
+    }
+
+    public function getLeft(): Column
+    {
+        return $this->left;
+    }
+
+    public function getRight(): Column
+    {
+        return $this->right;
+    }
+
+    public function getType(): JoinType
+    {
+        return $this->type;
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/JoinType.php b/components/ILIAS/Questions/src/Question/Persistence/JoinType.php
new file mode 100644
index 000000000000..4e071ddfe573
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/JoinType.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+enum JoinType: string
+{
+    case Inner = 'INNER';
+    case Left = 'left';
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Junctor.php b/components/ILIAS/Questions/src/Question/Persistence/Junctor.php
new file mode 100644
index 000000000000..1d7ab4e22f01
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Junctor.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+enum Junctor: string
+{
+    case Conjunction = 'AND';
+    case Disjunction = 'OR';
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Operator.php b/components/ILIAS/Questions/src/Question/Persistence/Operator.php
new file mode 100644
index 000000000000..70a6124f4a48
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Operator.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+enum Operator: string
+{
+    case Equal = '=';
+    case Unequal = '<>';
+    case Greater = '>';
+    case Less = '>';
+    case GreaterOrEqual = '>=';
+    case LessOrEqual = '<=';
+    case In = 'IN';
+    case Like = 'LIKE';
+    case Between = 'BETWEEN';
+
+    public function toSql(Column $left, int $nr_of_values): string
+    {
+        if ($nr_of_values > 1) {
+            $placeholders = '%s';
+            for ($i = 1; $i < $nr_of_values; $i++) {
+                $placeholders .= ', %s';
+            }
+        }
+
+        return match($this) {
+            self::In => "{$left->toColumnString()} {$this->value} ({$placeholders})",
+            self::Between => "{$left->toColumnString()} {$this->value} %s AND %s",
+            default => "{$left->toColumnString()} {$this->value} %s"
+        };
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Order.php b/components/ILIAS/Questions/src/Question/Persistence/Order.php
new file mode 100644
index 000000000000..c0b4d27d2ea1
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Order.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class Order
+{
+    public function __construct(
+        private readonly Column $column,
+        private readonly OrderDirection $direction = OrderDirection::Asc
+    ) {
+    }
+
+    public function toSql(): string
+    {
+        return "{$this->column->toColumnString()} {$this->direction->value}";
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/OrderDirection.php b/components/ILIAS/Questions/src/Question/Persistence/OrderDirection.php
new file mode 100644
index 000000000000..079dd1279555
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/OrderDirection.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+enum OrderDirection: string
+{
+    case Asc = 'ASC';
+    case Desc = 'DESC';
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Repository.php b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
new file mode 100644
index 000000000000..db5cc4be9e42
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
@@ -0,0 +1,234 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+use ILIAS\Questions\AnswerForm\Type;
+use ILIAS\Questions\AnswerFormTypes\Factory as FormTypesFactory;
+use ILIAS\Questions\Question\Lifecycle;
+use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
+
+class Repository
+{
+    public const string QUESTION_TABLE = 'qsts_questions';
+    public const string QUESTION_TABLE_ID_COLUMN = 'id';
+    public const array QUESTION_TABLE_COLUMNS = [
+        'id',
+        'page_id',
+        'title',
+        'author',
+        'lifecycle',
+        'remarks',
+        'original_id',
+        'last_update',
+        'created'
+    ];
+
+    public const string ANSWER_FORM_TABLE = 'qsts_answer_forms';
+    public const string ANSWER_FORM_TABLE_ID_COLUMN = 'id';
+    public const string ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN = 'question_id';
+    public const array ANSWER_FORM_TABLE_COLUMNS = [
+        'id AS answer_form_id',
+        'type',
+        'available_points',
+        'image_size',
+        'shuffle_answer_options',
+        'additional_text',
+        'additional_text_legacy'
+    ];
+
+    private const string PAGE_EDITOR_TABLE = 'page_object';
+
+    public function __construct(
+        private readonly \ilDBInterface $db,
+        private readonly UuidFactory $uuid_factory,
+        private readonly FormTypesFactory $form_types_factory
+    ) {
+    }
+
+    /**
+     * @return array<string, \ILIAS\Questions\AnswerForm\Type>
+     */
+    public function getAvailableAnswerTypes(): array
+    {
+        return $this->form_types_factory->getAvailableAnswerTypes();
+    }
+
+    public function getAvailableAnswerTypeByClass(string $class): ?Type
+    {
+        return $this->form_types_factory->getAnswerFormTypeByClass($class);
+    }
+
+    /**
+     * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
+     */
+    public function getAllQuestions(): \Generator
+    {
+        yield from $this->getForWhereClause('');
+    }
+
+    public function getForQuestionId(string $question_id): ?QuestionImplementation
+    {
+        if ($question_id < 1) {
+            return new QuestionImplementation();
+        }
+
+        return $this->getForWhereClause("q.id='{$question_id}'")->current();
+    }
+
+    /**
+     *
+     * @param array<\ILIAS\Data\Uuid> $question_ids
+     * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
+     */
+    public function getForQuestionIds(array $question_ids): \Generator
+    {
+        yield from $this->getForWhereClause(
+            $this->db->in(
+                'q.question_id',
+                $question_ids,
+                false,
+                \ilDBConstants::T_INTEGER
+            )
+        );
+    }
+
+    private function buildQuestionFromDBRecords(\stdClass $db_record): QuestionImplementation
+    {
+        return new QuestionImplementation(
+            $this->uuid_factory->fromString($db_record->id),
+            $db_record->page_id,
+            $db_record->title,
+            $db_record->author,
+            Lifecycle::from($db_record->lifecycle),
+            $db_record->remarks,
+            $db_record->original_id === null ? null : $this->uuid_factory->fromString($db_record->original_id),
+            new \DateTimeImmutable('@' . $db_record->last_update, new \DateTimeZone('UTC')),
+            new \DateTimeImmutable('@' . $db_record->created, new \DateTimeZone('UTC'))
+        );
+    }
+
+    /**
+     * @return \Generator<ILIAS\Questions\Question\Question>
+     */
+    private function getForWhereClause(string $where): \Generator
+    {
+        $query_result = $this->db->query(
+            'SELECT q.id, q.page_id, q.title, q.author, q.lifecycle, q.remarks,' . PHP_EOL
+            . 'q.original_id, q.last_update, q.created' . PHP_EOL
+            . 'FROM ' . self::QUESTION_TABLE . ' q' . PHP_EOL
+            . ($where === '' ? '' : 'WHERE ' . $where)
+        );
+
+        while (($db_record = $this->db->fetchObject($query_result)) !== null) {
+            yield $this->buildQuestionFromDBRecords($db_record);
+        }
+    }
+
+    /**
+     *
+     * @param ILIAS\Questions\Question\Question|array<ILIAS\Questions\Question\QuestionImplementation> $questions
+     * @return array<ILIAS\Data\UUID\Uuid>
+     */
+    public function store(
+        QuestionImplementation|array $questions
+    ): array {
+        if ($questions instanceof QuestionImplementation) {
+            return [$this->storeQuestion($questions)];
+        }
+
+        return array_map(
+            fn(QuestionImplementation $v) => $this->storeQuestion($v),
+            $questions
+        );
+    }
+
+    private function storeQuestion(QuestionImplementation $question): Uuid
+    {
+        if ($question->getPageId() === null) {
+            $question = $question->withPageId($this->buildQuestionPage());
+        }
+
+        if ($question->getId() === null) {
+            $question = $question->withQuestionId($this->buildAvailableUuid());
+            $this->db->insert(
+                self::QUESTION_TABLE,
+                $question->toStorage()
+            );
+            return $question->getId();
+        }
+        $this->db->update(
+            self::QUESTION_TABLE,
+            $question->toStorage(),
+            [
+                'id' => [
+                    \ilDBConstants::T_TEXT,
+                    $question->getId()->toString()
+                ]
+            ]
+        );
+    }
+
+    private function buildAvailableUuid(): Uuid
+    {
+        do {
+            $uuid = $this->uuid_factory->uuid4();
+            if ($this->checkAvailabilityOfId($uuid)) {
+                return $uuid;
+            }
+        } while (true);
+    }
+
+    private function checkAvailabilityOfId(Uuid $uuid): bool
+    {
+        return $this->db->fetchObject(
+            $this->db->query(
+                'SELECT COUNT(*) as cnt FROM ' . self::QUESTION_TABLE
+                    . " WHERE id='{$uuid->toString()}'"
+            )
+        )->cnt === 0;
+    }
+
+    private function buildQuestionPage(): int
+    {
+        $page = new \QstsQuestionPage();
+        $page->setId($this->getNextAvailableQuestionPageId());
+        $page->createFromXML();
+        return $page->getId();
+    }
+
+    private function getNextAvailableQuestionPageId(): int
+    {
+
+        $last_id = $this->db->fetchObject(
+            $this->db->query(
+                'SELECT MAX(page_id) AS last FROM ' . self::PAGE_EDITOR_TABLE
+                    . ' WHERE parent_type = "qsts"'
+            )
+        )->last;
+        if ($last_id === null) {
+            return 1;
+        }
+
+        return $last_id + 1;
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Select.php b/components/ILIAS/Questions/src/Question/Persistence/Select.php
new file mode 100644
index 000000000000..ab166ef0201f
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Select.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class Select
+{
+    public function __construct(
+        private readonly string $table,
+        private readonly array $columns
+    ) {
+    }
+
+    public function toColumnsArray(): array
+    {
+        return array_map(
+            fn(string $v): string => "{$this->table}.{$v}",
+            $this->columns
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/SelectQuery.php b/components/ILIAS/Questions/src/Question/Persistence/SelectQuery.php
new file mode 100644
index 000000000000..aad33592fdc7
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/SelectQuery.php
@@ -0,0 +1,165 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class SelectQuery
+{
+    private array $select = [];
+    private array $where = [];
+    private array $joins = [];
+    private array $order = [];
+    private ?int $limit = null;
+
+    private array $binding_types = [];
+    private array $binding_values = [];
+
+    public function __construct(
+        private readonly \ilDBInterface $db,
+        array $answer_form_ids
+    ) {
+        $this->select[] = new Select(
+            Repository::QUESTION_TABLE,
+            Repository::QUESTION_TABLE_COLUMNS
+        );
+
+        $this->select[] = new Select(
+            Repository::ANSWER_FORM_TABLE,
+            Repository::ANSWER_FORM_TABLE_COLUMNS
+        );
+
+        $left = new Column(
+            Repository::QUESTION_TABLE,
+            Repository::QUESTION_TABLE_ID_COLUMN
+        );
+
+        $this->joins[] = new Join(
+            $left,
+            new Column(
+                Repository::ANSWER_FORM_TABLE,
+                Repository::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
+            )
+        );
+
+        $this->where[] = new Where(
+            $left,
+            new Value(
+                \ilDBConstants::T_INTEGER,
+                $answer_form_ids
+            ),
+            Operator::In
+        );
+
+        $this->order[] = new Order(
+            Repository::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
+        );
+
+        $this->order[] = new Order(
+            Repository::ANSWER_FORM_TABLE_ID_COLUMN
+        );
+    }
+
+    public function withAdditionalSelect(Select $select): self
+    {
+        $clone = clone $this;
+        $clone->select[] = $select;
+        return $clone;
+    }
+
+    public function withAdditionalJoin(Join $join): self
+    {
+        $clone = clone $this;
+        $clone->joins[] = $join;
+        return $clone;
+    }
+
+    public function withAdditionalWhere(Where $where): self
+    {
+        $clone = clone $this;
+        $clone->where[] = $where;
+        return $clone;
+    }
+
+    public function withAdditionalOrder(Order $order): self
+    {
+        $clone = clone $this;
+        $clone->order[] = $order;
+        return $clone;
+    }
+
+    public function withLimit(int $limit): self
+    {
+        $clone = clone $this;
+        $clone->limit = $limit;
+        return $clone;
+    }
+
+    public function toSql(): string
+    {
+        return $this->db->queryF(
+            'SELECT ' . implode(
+                ', ',
+                array_reduce(
+                    $this->select,
+                    static fn(array $c, Select $v): array => [...$c, ...$v->toColumnsArray()],
+                    []
+                )
+            ) . ' FROM ' . self::QUESTION_TABLE
+            . array_reduce(
+                $this->joins,
+                static fn(string $c, Join $v): string => $c . PHP_EOL . $v->toSql(),
+                ''
+            ) . PHP_EOL
+            . $this->buildWhereString()
+            . $this->limit !== null ? "LIMIT = {$this->limit}" : '',
+            $this->binding_types,
+            $this->binding_values
+        );
+    }
+
+    private function buildWhereString(): string
+    {
+        return array_reduce(
+            $this->where,
+            function (?string $c, Where $v): string {
+                $this->addValueToBinding($v->getRight());
+                if ($c === null) {
+                    return "WHERE {$v->toSql()}" . PHP_EOL;
+                }
+
+                return "{$c}{$v->getLogicalOperator()} {$v->toSql()}" . PHP_EOL;
+            }
+        );
+    }
+
+    private function addValueToBinding(Value $value): void
+    {
+        if (!is_array($value)) {
+            $this->binding_types[] = $value->getType();
+            $this->binding_values[] = $value->getValue();
+            return;
+        }
+
+        foreach ($value->getValue() as $v) {
+            $this->binding_types[] = $value->getType();
+            $this->binding_values[] = $v;
+        }
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php b/components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php
new file mode 100644
index 000000000000..f65b225418e9
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class TableNameBuilder
+{
+    private string $type_specific_part;
+
+    public function __construct(
+        TableNameSpace $table_name_space
+    ) {
+        $this->type_specific_part = $table_name_space->getTypeSpecificTableNamePart();
+    }
+
+    public function getTypeSpecificAnswerFormsTableName(): string
+    {
+        return "qsts_answer_forms_{$this->type_specific_part}";
+    }
+
+    public function getAnswerInputsTableName(): string
+    {
+        return "qsts_answer_inputs_{$this->type_specific_part}";
+    }
+
+    public function getAnswerOptionsTableName(): string
+    {
+        return "qsts_answer_options_{$this->type_specific_part}";
+    }
+
+    public function getResponsesTableName(): string
+    {
+        return "qsts_responses_{$this->type_specific_part}";
+    }
+
+    public function getAdditionalTableName(string $table_identifier): string
+    {
+        return "qsts_{$this->type_specific_part}_{$table_identifier}";
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php b/components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php
new file mode 100644
index 000000000000..d6779d1692ce
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class TableNameSpace
+{
+    /**
+     * @param string $vendor Maximum four characters used to create the tables for the question type
+     * @param string $answer_form_id Maximum eight characters used to create the tables for the question type
+     */
+    public function __construct(
+        private readonly string $vendor,
+        private readonly string $answer_form_id
+    ) {
+        if (mb_strlen($vendor) > 4 || mb_strlen($answer_form_id) > 8) {
+            throw new \InvalidArgumentException(
+                'Neither $vendor nor $answer_form_id can be longer then 4 characters.'
+            );
+        }
+    }
+
+    public function getTypeSpecificTableNamePart(): string
+    {
+        return "{$this->vendor}_{$this->answer_form_id}";
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/TableNameSpaceCore.php b/components/ILIAS/Questions/src/Question/Persistence/TableNameSpaceCore.php
new file mode 100644
index 000000000000..7d207a4b297b
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/TableNameSpaceCore.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class TableNameSpaceCore extends TableNameSpace
+{
+    public function __construct(
+        private readonly string $answer_form_id
+    ) {
+    }
+
+    public function getTypeSpecificTableNamePart(): string
+    {
+        return $this->answer_form_id;
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/UpdateQuery.php b/components/ILIAS/Questions/src/Question/Persistence/UpdateQuery.php
new file mode 100644
index 000000000000..f77e4956cac4
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/UpdateQuery.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class UpdateQuery
+{
+    private array $tables = [];
+    private array $columns = [];
+    private array $values = [];
+
+    private ?float $available_points = null;
+    private ?int $image_size = null;
+    private ?bool $shuffle_answer_options = null;
+    private string $additional_text = '';
+
+    public function __construct()
+    {
+        ;
+    }
+
+    public function withAvailablePoints(float $available_points): self
+    {
+        $clone = clone $this;
+        $clone->available_points = $available_points;
+        return $clone;
+    }
+
+    public function withImageSize(int $image_size): self
+    {
+        $clone = clone $this;
+        $clone->image_size = $image_size;
+        return $clone;
+    }
+
+    public function withShuffleAnswerOptions(bool $shuffle_answer_options): self
+    {
+        $clone = clone $this;
+        $clone->shuffle_answer_options = $shuffle_answer_options;
+        return $clone;
+    }
+    public function withAddtionalText(string $additional_text): self
+    {
+        $clone = clone $this;
+        $clone->additional_text = $additional_text;
+        return $clone;
+    }
+
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Value.php b/components/ILIAS/Questions/src/Question/Persistence/Value.php
new file mode 100644
index 000000000000..3fca04d0d4f2
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Value.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class Value
+{
+    public function __construct(
+        private readonly string $type,
+        private readonly string|int|array $value
+    ) {
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getValue(): string|int|array
+    {
+        return $this->value;
+    }
+
+    public function getNumberOfElements(): int
+    {
+        if (is_array($this->value)) {
+            return count($this->value);
+        }
+
+        return 1;
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Where.php b/components/ILIAS/Questions/src/Question/Persistence/Where.php
new file mode 100644
index 000000000000..d155b7f96612
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Where.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class Where
+{
+    public function __construct(
+        private readonly Column $left,
+        private readonly Value $right,
+        private readonly Operator $comparison = Operator::Equal,
+        private readonly Junctor $junctor = Junctor::Conjunction,
+        private readonly bool $negate = false
+    ) {
+    }
+
+    public function toSql(): string
+    {
+        return $this->negate ? 'NOT ' : ''
+            . $this->comparison->toSql(
+                $this->left,
+                $this->right->getNumberOfElements()
+            );
+    }
+
+    public function getRight(): int|string
+    {
+        return $this->right;
+    }
+
+    public function getLogicalOperator(): Junctor
+    {
+        return $this->junctor;
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Question.php b/components/ILIAS/Questions/src/Question/Question.php
new file mode 100644
index 000000000000..a57d35e274f6
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Question.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question;
+
+interface Question
+{
+    public function getParticipantView(): Views\Participant;
+}
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
new file mode 100644
index 000000000000..b9f1957a99bc
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -0,0 +1,255 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question;
+
+use ILIAS\Questions\AnswerForm\Form;
+use ILIAS\Questions\Question\Lifecycle;
+use ILIAS\Data\Factory as DataFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Link\Factory as LinkFactory;
+use ILIAS\UI\Component\Link\Standard as StandardLink;
+use ILIAS\UI\Component\Table\DataRowBuilder;
+use ILIAS\UI\Component\Table\DataRow;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
+use ILIAS\Refinery\Factory as Refinery;
+use Psr\Http\Message\RequestInterface;
+
+class QuestionImplementation implements Question
+{
+    /**
+     * @param array{string, \ILIAS\Questions\AnswerForm\Form} $answer_forms
+     */
+    public function __construct(
+        private ?Uuid $id = null,
+        private ?int $page_id = null,
+        private string $title = '',
+        private string $author = '',
+        private Lifecycle $lifecycle = Lifecycle::Draft,
+        private string $remarks = '',
+        private ?Uuid $original_id = null,
+        private ?\DateTimeImmutable $last_update = null,
+        private ?\DateTimeImmutable $created = null,
+        private array $answer_forms = [],
+        private ?Taxonomies $taxonomies = null,
+        private ?ContentForRecapitulation $content_for_recapitulation = null
+    ) {
+    }
+
+    public function getId(): ?Uuid
+    {
+        return $this->id;
+    }
+
+    public function withQuestionId(Uuid $question_id): self
+    {
+        $clone = clone $this;
+        $clone->id = $question_id;
+        return $clone;
+    }
+
+    public function getPageId(): ?int
+    {
+        return $this->page_id;
+    }
+
+    public function withPageId(int $page_id): self
+    {
+        $clone = clone $this;
+        $clone->page_id = $page_id;
+        return $clone;
+    }
+
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    public function withTitle(string $title): self
+    {
+        $clone = clone $this;
+        $clone->title = $title;
+        return $clone;
+    }
+
+    public function getAuthor(): string
+    {
+        return $this->author;
+    }
+
+    public function withAuthor(string $author): self
+    {
+        $clone = clone $this;
+        $clone->author = $author;
+        return $clone;
+    }
+
+    public function getLifecycle(): Lifecycle
+    {
+        return $this->lifecycle;
+    }
+
+    public function withLifecycle(Lifecycle $lifecycle): self
+    {
+        $clone = clone $this;
+        $clone->lifecycle = $lifecycle;
+        return $clone;
+    }
+
+    public function getRemarks(): string
+    {
+        return $this->remarks;
+    }
+
+    public function withRemarks(string $remarks): self
+    {
+        $clone = clone $this;
+        $clone->remarks = $remarks;
+        return $clone;
+    }
+
+    public function getOriginalId(): ?Uuid
+    {
+        return $this->original_id;
+    }
+
+    public function withOriginalId(Uuid $original_id): self
+    {
+        $clone = clone $this;
+        $clone->original_id = $original_id;
+        return $clone;
+    }
+
+    public function getLastUpdate(): ?\DateTimeImmutable
+    {
+        return $this->last_update;
+    }
+
+    public function getCreated(): ?\DateTimeImmutable
+    {
+        return $this->created;
+    }
+
+    public function withCreated(\DateTimeImmutable $created): self
+    {
+        $clone = clone $this;
+        $clone->created = $created;
+        return $clone;
+    }
+
+    public function getAnswerForms(): array
+    {
+        return $this->answer_forms;
+    }
+
+    public function getAnswerForm(Uuid $form_id): ?Form
+    {
+        return $this->answer_forms[$form_id->toString()] ?? null;
+    }
+
+    public function withAnswerForm(Form $answer_form): self
+    {
+        $this->answer_forms[$answer_from->getId()->toString()] = $answer_form;
+    }
+
+    /**
+     * Checks whether the question is a clone of another question or not
+     */
+    public function isClone(): bool
+    {
+        return $this->original_id !== null;
+    }
+
+    public function getEditView(
+        Language $lng,
+        \ilObjUser $current_user,
+        UIFactory $ui_factory,
+        Refinery $refinery,
+        RequestInterface $request,
+        \ilCtrl $ctrl,
+        DataFactory $data_factory
+    ): Views\Edit {
+        return new Views\Edit($lng, $current_user, $ui_factory, $refinery, $request, $ctrl, $data_factory, $this);
+    }
+
+    public function getParticipantView(): Views\Participant
+    {
+        return new Views\Participant(
+            new \QstsQuestionPageGUI($this),
+            $this->answer_forms
+        );
+    }
+
+    public function toEditLink(
+        LinkFactory $link_factory,
+        URLBuilder $url_builder,
+        URLBuilderToken $row_id_token
+    ): StandardLink {
+        return $link_factory->standard(
+            $this->title,
+            $url_builder->withParameter(
+                $row_id_token,
+                $this->id->toString()
+            )->buildURI()->__toString()
+        );
+    }
+
+    public function toTableRow(
+        DataRowBuilder $row_builder,
+        UIFactory $ui_factory,
+        URLBuilder $url_builder,
+        URLBuilderToken $row_id_token
+    ): DataRow {
+        return $row_builder->buildDataRow(
+            $this->id->toString(),
+            [
+                'title' => $ui_factory->link()->standard(
+                    $this->title,
+                    $url_builder->withParameter(
+                        $row_id_token,
+                        $this->id->toString()
+                    )->buildURI()->__toString()
+                )
+            ]
+        );
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function toStorage(): array
+    {
+        return [
+            'id' => [\ilDBConstants::T_TEXT, $this->id->toString()],
+            'page_id' => [\ilDBConstants::T_INTEGER, $this->page_id],
+            'title' => [\ilDBConstants::T_TEXT, $this->title],
+            'author' => [\ilDBConstants::T_TEXT, $this->author],
+            'lifecycle' => [\ilDBConstants::T_TEXT, $this->lifecycle->value],
+            'remarks' => [\ilDBConstants::T_TEXT, $this->remarks],
+            'original_id' => [\ilDBConstants::T_TEXT, $this->original_id?->toString()],
+            'last_update' => [\ilDBConstants::T_INTEGER, time()],
+            'created' => [\ilDBConstants::T_INTEGER, $this->created?->getTimestamp() ?? time()]
+        ];
+    }
+
+}
diff --git a/components/ILIAS/Questions/src/Question/Response.php b/components/ILIAS/Questions/src/Question/Response.php
new file mode 100644
index 000000000000..3bba6d1e8643
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Response.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question;
+
+class Response
+{
+}
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
new file mode 100644
index 000000000000..34a96d6ca774
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Views;
+
+use ILIAS\Questions\Question\Question;
+use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Questions\Question\Lifecycle;
+use ILIAS\Data\Factory as DataFactory;
+use ILIAS\Language\Language;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
+use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
+use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
+use Psr\Http\Message\RequestInterface;
+
+class Edit
+{
+    private const string CMD_SAVE_QUESTION = 'sq';
+
+    public const string PAGE_ID_PARAM_FOR_EDITOR = 'p_id';
+
+    public function __construct(
+        private readonly Language $lng,
+        private readonly \ilObjUser $current_user,
+        private readonly UIFactory $ui_factory,
+        private readonly Refinery $refinery,
+        private readonly RequestInterface $request,
+        private readonly \ilCtrl $ctrl,
+        private readonly DataFactory $data_factory,
+        private readonly QuestionImplementation $question
+    ) {
+
+    }
+
+    public function create(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        string $step
+    ): array|Question {
+        return match ($step) {
+            self::CMD_SAVE_QUESTION => $this->onBasicPropertiesFormSubmission($url_builder, $step_token),
+            default => [$this->buildBasicPropertiesForm($url_builder, $step_token)]
+        };
+    }
+
+    public function edit(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        string $step
+    ): array|Question {
+        return match ($step) {
+            self::CMD_SAVE_QUESTION => $this->onBasicPropertiesFormSubmission($url_builder, $step_token),
+            default => [
+                $this->buildBasicPropertiesForm($url_builder, $step_token),
+                $this->buildPreviewPanel($url_builder, $step_token)
+            ]
+        };
+    }
+
+    private function buildBasicPropertiesForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): StandardForm {
+        return $this->ui_factory->input()->container()->form()->standard(
+            $url_builder->withParameter($step_token, self::CMD_SAVE_QUESTION)
+                ->buildURI()->__toString(),
+            $this->buildBasicPropertiesInputs()
+        );
+    }
+
+    private function onBasicPropertiesFormSubmission(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): array|Question {
+        $form = $this->buildBasicPropertiesForm($url_builder, $step_token)
+            ->withRequest($this->request);
+        $data = $form->getData();
+        if ($data === null) {
+            return [$form];
+        }
+
+        return $data['question'];
+    }
+
+    private function buildBasicPropertiesInputs(): array
+    {
+        $ff = $this->ui_factory->input()->field();
+        $section = $ff->section(
+            [
+                'title' => $ff->text($this->lng->txt('title'))
+                    ->withRequired(true),
+                'author' => $ff->text($this->lng->txt('author'))
+                    ->withValue($this->current_user->getFullname()),
+                'lifecycle' => $ff->select(
+                    $this->lng->txt('lifecycle'),
+                    array_reduce(
+                        Lifecycle::cases(),
+                        function (array $c, Lifecycle $v): array {
+                            $c[$v->value] = $this->lng->txt($v->value);
+                            return $c;
+                        },
+                        []
+                    )
+                )->withRequired(true),
+                'remarks' => $ff->textarea($this->lng->txt('remarks'))
+            ],
+            $this->lng->txt('edit_basic_form_properties')
+        )->withAdditionalTransformation($this->buildAddBasicPropertiesToQuestionTrafo());
+
+        return [
+            'question' => $section->withValue([
+                'title' => $this->question->getTitle(),
+                'author' => $this->question->getAuthor(),
+                'lifecycle' => $this->question->getLifecycle()->value,
+                'remarks' => $this->question->getRemarks()
+            ])
+        ];
+    }
+
+    private function buildAddBasicPropertiesToQuestionTrafo(): Transformation
+    {
+        return $this->refinery->custom()->transformation(
+            static fn(array $vs): QuestionImplementation => new QuestionImplementation(
+                null,
+                null,
+                $vs['title'],
+                $vs['author'],
+                Lifecycle::tryFrom($vs['lifecycle']) ?? Lifecycle::Draft,
+                $vs['remarks']
+            )
+        );
+    }
+
+    private function buildPreviewPanel(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): StandardPanel {
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            self::PAGE_ID_PARAM_FOR_EDITOR,
+            $this->question->getPageId()
+        );
+        return $this->ui_factory->panel()->standard(
+            $this->lng->txt('preview'),
+            $this->ui_factory->legacy()->content($this->question->getTitle())
+        )->withActions(
+            $this->ui_factory->dropdown()->standard([
+                $this->ui_factory->link()->standard(
+                    $this->lng->txt('edit'),
+                    $url_builder
+                        ->withURI(
+                            $this->data_factory->uri(
+                                ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(\QstsQuestionPageGUI::class, 'edit')
+                            )
+                        )->buildURI()->__toString()
+                )
+            ])
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Views/Participant.php b/components/ILIAS/Questions/src/Question/Views/Participant.php
new file mode 100644
index 000000000000..186f8477de0c
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Views/Participant.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Views;
+
+use ILIAS\Questions\Question\Question;
+
+class Participant
+{
+    private bool $async = false;
+    private bool $interactive = true;
+    private bool $show_marks = false;
+    private bool $show_correct_solution = false;
+
+    public function __construct(
+        private readonly Question $question
+    ) {
+    }
+
+    public function withIsAsync(bool $async): self
+    {
+        foreach ($this->question->getAnswerForms() as $form) {
+            if (!$form->getType()->isAsyncPresentationAvailable()) {
+                throw \Exception('This QuestionType has no async presentation.');
+            }
+        }
+        $clone = clone $this;
+        $clone->async = $async;
+        return $clone;
+    }
+
+    public function withIsInteractive(bool $interactive): self
+    {
+        $clone = clone $this;
+        $clone->interactive = $interactive;
+        return $clone;
+    }
+
+    public function withShowMarks(bool $show_marks): self
+    {
+        foreach ($this->question->getAnswerForms() as $form) {
+            if (!$form->getType()->isMarkable()) {
+                throw \Exception('This QuestionType cannot be marked.');
+            }
+        }
+
+        $clone = clone $this;
+        $clone->show_marks = $show_marks;
+        return $clone;
+    }
+
+    public function withShowCorrectSolution(bool $show_correct_solution): self
+    {
+        foreach ($this->question->getAnswerForms() as $form) {
+            if (!$form->getType()->isMarkable()) {
+                throw \Exception('This QuestionType cannot be marked.');
+            }
+        }
+
+        $clone = clone $this;
+        $clone->show_correct_solution = $show_correct_solution;
+        return $clone;
+    }
+}
diff --git a/components/ILIAS/Questions/src/Response/Repository.php b/components/ILIAS/Questions/src/Response/Repository.php
new file mode 100644
index 000000000000..62d40c84fdd4
--- /dev/null
+++ b/components/ILIAS/Questions/src/Response/Repository.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Response;
+
+interface Repository
+{
+    public function getForUser(int $question_id, int $user_id): Result;
+    public function getAllForQuestion(int $question_id): Result;
+    public function storeResult(Result $result): void;
+}
diff --git a/components/ILIAS/Questions/src/Response/Response.php b/components/ILIAS/Questions/src/Response/Response.php
new file mode 100644
index 000000000000..5e5f849c3dc9
--- /dev/null
+++ b/components/ILIAS/Questions/src/Response/Response.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Response;
+
+interface Response
+{
+    public function getCorrespondingQuestionType(): QuestionType;
+    public function getQuestionId(): ?int;
+    public function withQuestionId(int $question_id): self;
+    public function getParticipantId(): ?int;
+    public function withParticipantId(int $participant_id): self;
+}
diff --git a/components/ILIAS/Questions/src/Setup/Agent.php b/components/ILIAS/Questions/src/Setup/Agent.php
new file mode 100644
index 000000000000..e8e6b59f4224
--- /dev/null
+++ b/components/ILIAS/Questions/src/Setup/Agent.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Setup;
+
+use ILIAS\Questions\Question\Persistence\TableNameBuilder;
+use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
+use ILIAS\Setup\Agent\NullAgent;
+use ILIAS\Setup\Objective;
+use ILIAS\Setup\ObjectiveCollection;
+use ILIAS\Setup\Metrics\Storage;
+use ILIAS\Setup\Config;
+
+class Agent extends NullAgent
+{
+    public function getUpdateObjective(?Config $config = null): Objective
+    {
+        return new ObjectiveCollection(
+            'Database is updated for ILIAS\Questions',
+            false,
+            new \ilDatabaseUpdateStepsExecutedObjective(
+                new OverarchingQuestionTables()
+            ),
+            new \ilDatabaseUpdateStepsExecutedObjective(
+                new ClozeQuestionTables(
+                    new TableNameBuilder(
+                        new TableNameSpaceCore('cloze')
+                    )
+                )
+            ),
+            new \ilTreeAdminNodeAddedObjective(
+                'qsts',
+                'Questions'
+            )
+        );
+    }
+
+    public function getStatusObjective(Storage $storage): Objective
+    {
+        return new ObjectiveCollection(
+            'ILIAS\Questions',
+            true,
+            new \ilDatabaseUpdateStepsMetricsCollectedObjective(
+                $storage,
+                new OverarchingQuestionTables()
+            ),
+            new \ilDatabaseUpdateStepsMetricsCollectedObjective(
+                $storage,
+                new ClozeQuestionTables(
+                    new TableNameBuilder(
+                        new TableNameSpaceCore('cloze')
+                    )
+                )
+            )
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
new file mode 100644
index 000000000000..188fa167e16b
--- /dev/null
+++ b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
@@ -0,0 +1,227 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Setup;
+
+use ILIAS\Questions\Question\Persistence\TableNameBuilder;
+
+class ClozeQuestionTables implements \ilDatabaseUpdateSteps
+{
+    protected \ilDBInterface $db;
+
+    public function __construct(
+        private readonly TableNameBuilder $table_name_builder
+    ) {
+    }
+
+    public function prepare(\ilDBInterface $db): void
+    {
+        $this->db = $db;
+    }
+
+    public function step_1(): void
+    {
+        $table_name = $this->table_name_builder->getTypeSpecificAnswerFormsTableName();
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
+                'answer_form_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                 'case_sensitive' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 1,
+                    'notnull' => true
+                ],
+                 'identical_responses_valid' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 1,
+                    'notnull' => true
+                ],
+                 'max_chars' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 2,
+                    'notnull' => false
+                ],
+                 'min_autocomplete' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 1,
+                    'notnull' => false
+                ]
+            ]);
+        }
+
+        if (!$this->db->primaryExistsByFields($table_name, ['answer_form_id'])) {
+            $this->db->addPrimaryKey($table_name, ['answer_form_id']);
+        }
+    }
+
+    public function step_2(): void
+    {
+        $table_name = $this->table_name_builder->getAnswerInputsTableName();
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
+                'id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'answer_form_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'gap_type' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 32,
+                    'notnull' => true
+                ],
+                 'max_chars' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 2,
+                    'notnull' => false
+                ]
+            ]);
+        }
+
+        if (!$this->db->primaryExistsByFields($table_name, ['id'])) {
+            $this->db->addPrimaryKey($table_name, ['id']);
+        }
+
+        if (!$this->db->indexExistsByFields($table_name, ['answer_form_id'])) {
+            $this->db->addIndex($table_name, ['answer_form_id'], 'af');
+        }
+    }
+
+    public function step_3(): void
+    {
+        $table_name = $this->table_name_builder->getAnswerOptionsTableName();
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
+                'id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'answer_input_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'position' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 2,
+                    'notnull' => true
+                ],
+                 'value' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 4000,
+                    'notnull' => true
+                ],
+                'points' => [
+                    'type' => \ilDBConstants::T_FLOAT,
+                    'notnull' => false
+                ]
+            ]);
+        }
+
+        if (!$this->db->primaryExistsByFields($table_name, ['id'])) {
+            $this->db->addPrimaryKey($table_name, ['id']);
+        }
+
+        if (!$this->db->indexExistsByFields($table_name, ['answer_input_id'])) {
+            $this->db->addIndex($table_name, ['answer_input_id'], 'ai');
+        }
+    }
+
+    public function step_4(): void
+    {
+        $table_name = $this->table_name_builder->getAdditionalTableName('combinations');
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
+                'id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'answer_form_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'answer_options' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 4000,
+                    'notnull' => true
+                ],
+                'points' => [
+                    'type' => \ilDBConstants::T_FLOAT,
+                    'notnull' => false
+                ]
+            ]);
+        }
+
+        if (!$this->db->primaryExistsByFields($table_name, ['id'])) {
+            $this->db->addPrimaryKey($table_name, ['id']);
+        }
+
+        if (!$this->db->indexExistsByFields($table_name, ['answer_form_id'])) {
+            $this->db->addIndex($table_name, ['answer_form_id'], 'ai');
+        }
+    }
+
+    public function step_5(): void
+    {
+        $table_name = $this->table_name_builder->getResponsesTableName();
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
+                'id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'answer_input_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'selected_answer_option' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => false
+                ],
+                'text' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 4000,
+                    'notnull' => true
+                ]
+            ]);
+        }
+
+        if (!$this->db->primaryExistsByFields($table_name, ['id'])) {
+            $this->db->addPrimaryKey($table_name, ['id']);
+        }
+
+        if (!$this->db->indexExistsByFields($table_name, ['answer_input_id'])) {
+            $this->db->addIndex($table_name, ['answer_input_id'], 'ai');
+        }
+    }
+}
diff --git a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
new file mode 100644
index 000000000000..db1c6e716368
--- /dev/null
+++ b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
@@ -0,0 +1,201 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Setup;
+
+class OverarchingQuestionTables implements \ilDatabaseUpdateSteps
+{
+    protected \ilDBInterface $db;
+
+    public function prepare(\ilDBInterface $db): void
+    {
+        $this->db = $db;
+    }
+
+    public function step_1(): void
+    {
+        $table_name = 'qsts_questions';
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
+                'id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'page_id' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 4,
+                    'notnull' => true
+                ],
+                'title' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 512,
+                    'notnull' => true
+                ],
+                'author' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 512,
+                    'notnull' => false
+                ],
+                'lifecycle' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 16,
+                    'notnull' => true
+                ],
+                'remarks' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 4000,
+                    'notnull' => false
+                ],
+                'original_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => false
+                ],
+                'last_update' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 8,
+                    'notnull' => true
+                ],
+                'created' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 8,
+                    'notnull' => true
+                ],
+            ]);
+        }
+
+        if (!$this->db->primaryExistsByFields($table_name, ['id'])) {
+            $this->db->addPrimaryKey($table_name, ['id']);
+        }
+    }
+
+    public function step_2(): void
+    {
+        $table_name = 'qsts_answer_forms';
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
+                'id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'type' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 4000,
+                    'notnull' => true
+                ],
+                'question_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'available_points' => [
+                    'type' => \ilDBConstants::T_FLOAT,
+                    'notnull' => false
+                ],
+                'image_size' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 2,
+                    'notnull' => false
+                ],
+                'shuffle_answer_options' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 1,
+                    'notnull' => true
+                ],
+                'additional_text' => [
+                    'type' => \ilDBConstants::T_CLOB,
+                    'notnull' => true
+                ],
+                'additional_text_legacy' => [
+                    'type' => \ilDBConstants::T_CLOB,
+                    'notnull' => false
+                ]
+            ]);
+        }
+
+        if (!$this->db->primaryExistsByFields($table_name, ['id'])) {
+            $this->db->addPrimaryKey($table_name, ['id']);
+        }
+
+        if (!$this->db->indexExistsByFields($table_name, ['question_id'])) {
+            $this->db->addIndex($table_name, ['question_id'], 'q');
+        }
+    }
+
+    public function step_3(): void
+    {
+        $table_name = 'qsts_responses';
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
+                'id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'question_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'reached_points' => [
+                    'type' => \ilDBConstants::T_FLOAT,
+                    'notnull' => false
+                ]
+            ]);
+        }
+
+        if (!$this->db->primaryExistsByFields($table_name, ['id'])) {
+            $this->db->addPrimaryKey($table_name, ['id']);
+        }
+
+        if (!$this->db->indexExistsByFields($table_name, ['question_id'])) {
+            $this->db->addIndex($table_name, ['question_id'], 'q');
+        }
+    }
+
+    public function step_4(): void
+    {
+        $table_name = 'qsts_linking';
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
+                'question_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'obj_id' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 4,
+                    'notnull' => true
+                ]
+            ]);
+        }
+
+        if (!$this->db->primaryExistsByFields($table_name, ['question_id'])) {
+            $this->db->addPrimaryKey($table_name, ['question_id']);
+        }
+
+        if (!$this->db->indexExistsByFields($table_name, ['obj_id'])) {
+            $this->db->addIndex($table_name, ['obj_id'], 'o');
+        }
+    }
+}
diff --git a/components/ILIAS/Questions/src/Units/Category.php b/components/ILIAS/Questions/src/Units/Category.php
new file mode 100755
index 000000000000..64f98755ac7c
--- /dev/null
+++ b/components/ILIAS/Questions/src/Units/Category.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Units;
+
+class Category
+{
+    private int $id = 0;
+    private string $category = '';
+    private int $question_fi = 0;
+
+    public function initFormArray(array $data): void
+    {
+        $this->id = (int) $data['category_id'];
+        $this->category = $data['category'];
+        $this->question_fi = (int) $data['question_fi'];
+    }
+
+    public function setId(int $id): void
+    {
+        $this->id = $id;
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function setCategory(string $category): void
+    {
+        $this->category = $category;
+    }
+
+    public function getCategory(): string
+    {
+        return $this->category;
+    }
+
+    public function setQuestionFi(int $question_fi): void
+    {
+        $this->question_fi = $question_fi;
+    }
+
+    public function getQuestionFi(): int
+    {
+        return $this->question_fi;
+    }
+
+    public function getDisplayString(): string
+    {
+        global $DIC;
+
+        $lng = $DIC->language();
+
+        $category = $this->getCategory();
+        if (strcmp('-qpl_qst_formulaquestion_' . $category . '-', $lng->txt('qpl_qst_formulaquestion_' . $category)) !== 0) {
+            $category = $lng->txt('qpl_qst_formulaquestion_' . $category);
+        }
+
+        return $category;
+    }
+}
diff --git a/components/ILIAS/Questions/src/Units/ConfigurationGUI.php b/components/ILIAS/Questions/src/Units/ConfigurationGUI.php
new file mode 100755
index 000000000000..dab88a5933cd
--- /dev/null
+++ b/components/ILIAS/Questions/src/Units/ConfigurationGUI.php
@@ -0,0 +1,778 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Units;
+
+use ILIAS\TestQuestionPool\QuestionPoolDIC;
+use ILIAS\TestQuestionPool\RequestDataCollector;
+
+abstract class ConfigurationGUI
+{
+    protected RequestDataCollector $request;
+    protected ?\ilPropertyFormGUI $unit_cat_form = null;
+    protected ?\ilPropertyFormGUI $unit_form = null;
+    protected \ilGlobalTemplateInterface $tpl;
+    protected \ilLanguage $lng;
+    protected \ilCtrlInterface $ctrl;
+
+    public function __construct(
+        protected Repository $repository
+    ) {
+        global $DIC;
+        $this->lng = $DIC->language();
+        $this->ctrl = $DIC->ctrl();
+        $this->tpl = $DIC->ui()->mainTemplate();
+
+        $local_dic = QuestionPoolDIC::dic();
+        $this->request = $local_dic['request_data_collector'];
+
+        $this->lng->loadLanguageModule('assessment');
+    }
+
+    abstract protected function getDefaultCommand(): string;
+
+    abstract public function getUnitCategoryOverviewCommand(): string;
+
+    abstract public function isCRUDContext(): bool;
+
+    abstract public function getUniqueId(): string;
+
+    abstract protected function showUnitCategories(array $categories): void;
+
+    protected function getCategoryById(int $id, bool $for_CRUD = true): Category
+    {
+        $category = $this->repository->getUnitCategoryById($id);
+        if ($for_CRUD && $category->getQuestionFi() !== $this->repository->getConsumerId()) {
+            $this->tpl->setOnScreenMessage('failure', $this->lng->txt('change_adm_categories_not_allowed'), true);
+            $this->ctrl->redirect($this, $this->getDefaultCommand());
+        }
+
+        return $category;
+    }
+
+    protected function handleSubtabs(): void
+    {
+    }
+
+    protected function checkPermissions(string $cmd): void
+    {
+    }
+
+    public function executeCommand(): void
+    {
+        $cmd = $this->ctrl->getCmd($this->getDefaultCommand());
+        $this->checkPermissions($cmd);
+        switch ($cmd) {
+            case 'confirmImportGlobalCategories':
+                $category_ids = $this->request->raw('category_ids');
+                $this->$cmd($category_ids);
+                break;
+            default:
+                $this->$cmd();
+                break;
+        }
+
+        $this->handleSubtabs();
+    }
+
+    protected function confirmDeleteUnit(): void
+    {
+        if (!$this->request->isset('unit_id')) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $this->confirmDeleteUnits([$this->request->int('unit_id')]);
+    }
+
+    protected function confirmDeleteUnits(?array $unit_ids = null): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $unit_ids = $unit_ids ?? $this->request->getUnitIds();
+        if (count($unit_ids) === 0) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $this->ctrl->setParameter($this, 'category_id', $this->request->int('category_id'));
+        $confirmation = new ilConfirmationGUI();
+        $confirmation->setFormAction($this->ctrl->getFormAction($this, 'deleteUnits'));
+        $confirmation->setConfirm($this->lng->txt('confirm'), 'deleteUnits');
+        $confirmation->setCancel($this->lng->txt('cancel'), 'showUnitsOfCategory');
+
+        $errors = [];
+        $num_to_confirm = 0;
+        foreach ($unit_ids as $unit_id) {
+            try {
+                $unit = $this->repository->getUnit((int) $unit_id);
+                if (!$unit) {
+                    continue;
+                }
+
+                if ($check_result = $this->repository->checkDeleteUnit($unit->getId())) {
+                    $errors[] = $unit->getDisplayString() . ' - ' . $check_result;
+                    continue;
+                }
+
+                $confirmation->addItem('unit_ids[]', (string) $unit->getId(), $unit->getDisplayString());
+                ++$num_to_confirm;
+            } catch (ilException $e) {
+                continue;
+            }
+        }
+
+        if ($errors) {
+            $num_errors = count($errors);
+
+            $error_message = array_map(static function (string $message): string {
+                return '<li>' . $message . '</li>';
+            }, $errors);
+            if ($num_errors === 1) {
+                $this->tpl->setOnScreenMessage(
+                    'failure',
+                    $this->lng->txt('un_unit_deletion_errors_f_s') . '<ul>' . implode('', $error_message) . '<ul>'
+                );
+            } else {
+                $this->tpl->setOnScreenMessage(
+                    'failure',
+                    $this->lng->txt('un_unit_deletion_errors_f') . '<ul>' . implode('', $error_message) . '<ul>'
+                );
+            }
+        }
+
+        if ($num_to_confirm) {
+            if ($num_to_confirm === 1) {
+                $confirmation->setHeaderText($this->lng->txt('un_sure_delete_units_s'));
+            } else {
+                $confirmation->setHeaderText($this->lng->txt('un_sure_delete_units'));
+            }
+
+            $this->tpl->setContent($confirmation->getHTML());
+        } else {
+            $this->showUnitsOfCategory();
+        }
+    }
+
+    public function deleteUnits(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $unit_ids = $this->request->getUnitIds();
+        if (count($unit_ids) === 0) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $errors = [];
+        $num_deleted = 0;
+        foreach ($unit_ids as $unit_id) {
+            try {
+                $unit = $this->repository->getUnit($unit_id);
+                if (!$unit) {
+                    continue;
+                }
+
+                $check_result = $this->repository->deleteUnit($unit->getId());
+                if (!is_null($check_result)) {
+                    $errors[] = $unit->getDisplayString() . ' - ' . $check_result;
+                    continue;
+                }
+
+                ++$num_deleted;
+            } catch (ilException $e) {
+                continue;
+            }
+        }
+
+        if ($errors) {
+            $num_errors = count($errors);
+
+            $error_message = array_map(static function (string $message): string {
+                return '<li>' . $message . '</li>';
+            }, $errors);
+            if ($num_errors === 1) {
+                $this->tpl->setOnScreenMessage(
+                    'failure',
+                    $this->lng->txt('un_unit_deletion_errors_p_s') . '<ul>' . implode('', $error_message) . '<ul>'
+                );
+            } else {
+                $this->tpl->setOnScreenMessage(
+                    'failure',
+                    $this->lng->txt('un_unit_deletion_errors_p') . '<ul>' . implode('', $error_message) . '<ul>'
+                );
+            }
+        }
+
+        if ($num_deleted) {
+            if ($num_deleted === 1) {
+                $this->tpl->setOnScreenMessage('success', $this->lng->txt('un_deleted_units_s'));
+            } else {
+                $this->tpl->setOnScreenMessage('success', $this->lng->txt('un_deleted_units'));
+            }
+        }
+
+        $this->showUnitsOfCategory();
+    }
+
+    protected function saveOrder(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        if (!$this->request->isset('sequence') || !is_array($this->request->raw('sequence'))) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $sequences = $this->request->raw('sequence');
+        foreach ($sequences as $id => $sequence) {
+            $sorting_value = str_replace(',', '.', $sequence);
+            $sorting_value = (int) $sorting_value * 100;
+            $this->repository->saveUnitOrder((int) $id, $sorting_value);
+        }
+
+        $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
+        $this->showUnitsOfCategory();
+    }
+
+    protected function saveUnit(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $category = $this->getCategoryById($this->request->int('category_id'));
+        $unit = $this->repository->getUnit($this->request->int('unit_id'));
+
+        if ($this->repository->isUnitInUse($unit->getId())) {
+            $this->showUnitModificationForm();
+            return;
+        }
+
+        $this->initUnitForm($category, $unit);
+        if ($this->unit_form->checkInput()) {
+            $unit->setUnit($this->unit_form->getInput('unit_title'));
+            $unit->setFactor((float) $this->unit_form->getInput('factor'));
+            $unit->setBaseUnit((int) $this->unit_form->getInput('base_unit') !== $unit->getId() ? (int) $this->unit_form->getInput('base_unit') : 0);
+            $unit->setCategory($category->getId());
+            $this->repository->saveUnit($unit);
+
+            $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $this->unit_form->setValuesByPost();
+
+        $this->tpl->setContent($this->unit_form->getHtml());
+    }
+
+    protected function showUnitModificationForm(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $category = $this->getCategoryById($this->request->int('category_id'));
+        $unit = $this->repository->getUnit($this->request->int('unit_id'));
+
+        $this->initUnitForm($category, $unit);
+        $this->unit_form->setValuesByArray([
+            'factor' => $unit->getFactor(),
+            'unit_title' => $unit->getUnit(),
+            'base_unit' => $unit->getBaseUnit() !== $unit->getId() ? $unit->getBaseUnit() : 0
+        ]);
+
+        $this->tpl->setContent($this->unit_form->getHtml());
+    }
+
+    protected function addUnit(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $category = $this->getCategoryById($this->request->int('category_id'));
+
+        $this->initUnitForm($category);
+        if ($this->unit_form->checkInput()) {
+            $unit = new assFormulaQuestionUnit();
+            $unit->setUnit($this->unit_form->getInput('unit_title'));
+            $unit->setCategory($category->getId());
+
+            $this->repository->createNewUnit($unit);
+
+            $unit->setBaseUnit((int) $this->unit_form->getInput('base_unit'));
+            $unit->setFactor((float) $this->unit_form->getInput('factor'));
+
+            $this->repository->saveUnit($unit);
+
+            $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $this->unit_form->setValuesByPost();
+
+        $this->tpl->setContent($this->unit_form->getHtml());
+    }
+
+    protected function showUnitCreationForm(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->showUnitsOfCategory();
+            return;
+        }
+
+        $category = $this->getCategoryById($this->request->int('category_id'));
+
+        $this->initUnitForm($category);
+        $this->unit_form->setValuesByArray([
+            'factor' => 1,
+            'unit_title' => $this->lng->txt('unit_placeholder')
+        ]);
+
+        $this->tpl->setContent($this->unit_form->getHtml());
+    }
+
+    protected function initUnitForm(
+        ?assFormulaQuestionUnitCategory $category = null,
+        ?assFormulaQuestionUnit $unit = null
+    ): ilPropertyFormGUI {
+        if ($this->unit_form instanceof ilPropertyFormGUI) {
+            return $this->unit_form;
+        }
+
+        $unit_in_use = false;
+        if ($unit instanceof assFormulaQuestionUnit && $this->repository->isUnitInUse($unit->getId())) {
+            $unit_in_use = true;
+        }
+
+        $this->unit_form = new ilPropertyFormGUI();
+
+        $title = new ilTextInputGUI($this->lng->txt('unit'), 'unit_title');
+        $title->setDisabled($unit_in_use);
+        $title->setRequired(true);
+        $this->unit_form->addItem($title);
+
+        $baseunit = new ilSelectInputGUI($this->lng->txt('baseunit'), 'base_unit');
+        $items = $this->repository->getCategorizedUnits();
+        $options = [];
+        $category_name = '';
+        $new_category = false;
+        foreach ($items as $item) {
+            if (
+                $unit instanceof assFormulaQuestionUnit &&
+                $unit->getId() === $item->getId()
+            ) {
+                continue;
+            }
+
+            if ($item instanceof assFormulaQuestionUnitCategory) {
+                if ($category_name !== $item->getDisplayString()) {
+                    $new_category = true;
+                    $category_name = $item->getDisplayString();
+                }
+                continue;
+            }
+
+            $options[$item->getId()] = $item->getDisplayString() . ($new_category ? ' (' . $category_name . ')' : '');
+            $new_category = false;
+        }
+        $baseunit->setDisabled($unit_in_use);
+        $baseunit->setOptions([0 => $this->lng->txt('no_selection')] + $options);
+        $this->unit_form->addItem($baseunit);
+
+        $factor = new ilNumberInputGUI($this->lng->txt('factor'), 'factor');
+        $factor->setRequired(true);
+        $factor->setSize(3);
+        $factor->setMinValue(0);
+        $factor->allowDecimals(true);
+        $factor->setDisabled($unit_in_use);
+        $this->unit_form->addItem($factor);
+
+        $this->ctrl->setParameterByClass(get_class($this), 'category_id', $this->request->int('category_id'));
+        if (null === $unit) {
+            $this->unit_form->setTitle($this->lng->txt('new_unit'));
+            $this->unit_form->setFormAction($this->ctrl->getFormAction($this, 'addUnit'));
+            $this->unit_form->addCommandButton('addUnit', $this->lng->txt('save'));
+        } else {
+            $this->ctrl->setParameter($this, 'unit_id', $unit->getId());
+            if ($unit_in_use) {
+                $this->unit_form->setFormAction($this->ctrl->getFormAction($this, 'showUnitsOfCategory'));
+            } else {
+                $this->unit_form->addCommandButton('saveUnit', $this->lng->txt('save'));
+                $this->unit_form->setFormAction($this->ctrl->getFormAction($this, 'saveUnit'));
+            }
+            $this->unit_form->setTitle(sprintf(
+                $this->lng->txt('un_sel_cat_sel_unit'),
+                $category->getDisplayString(),
+                $unit->getDisplayString()
+            ));
+        }
+        $this->ctrl->clearParameterByClass(get_class($this), 'category_id');
+
+        $this->unit_form->addCommandButton('showUnitsOfCategory', $this->lng->txt('cancel'));
+        return $this->unit_form;
+    }
+
+    protected function showUnitsOfCategory(): void
+    {
+        global $DIC;
+
+        $ilToolbar = $DIC->toolbar();
+
+        $category = $this->getCategoryById($this->request->int('category_id'), false);
+
+        $this->tpl->addJavaScript("assets/js/Basic.js");
+        $this->tpl->addJavaScript("assets/js/Form.js");
+        $this->lng->loadLanguageModule('form');
+
+        $ilToolbar->addButton(
+            $this->lng->txt('back'),
+            $this->ctrl->getLinkTarget($this, $this->getUnitCategoryOverviewCommand())
+        );
+        if ($this->isCRUDContext()) {
+            $this->ctrl->setParameterByClass(get_class($this), 'category_id', $category->getId());
+            $ilToolbar->addButton(
+                $this->lng->txt('un_add_unit'),
+                $this->ctrl->getLinkTarget($this, 'showUnitCreationForm')
+            );
+            $this->ctrl->clearParameterByClass(get_class($this), 'category_id');
+        }
+        $table = new ilUnitTableGUI($this, 'showUnitsOfCategory', $category);
+        $units = $this->repository->loadUnitsForCategory($category->getId());
+        $data = [];
+        foreach ($units as $unit) {
+            /** @var assFormulaQuestionUnit $unit */
+            $data[] = [
+                'unit_id' => $unit->getId(),
+                'unit' => $unit->getUnit(),
+                'baseunit' => $unit->getBaseunitTitle(),
+                'baseunit_id' => $unit->getBaseUnit(),
+                'factor' => $unit->getFactor(),
+                'sequence' => $unit->getSequence(),
+            ];
+        }
+        $table->setData($data);
+
+        $this->tpl->setContent($table->getHTML());
+    }
+
+    protected function showGlobalUnitCategories(): void
+    {
+        $categories = array_filter(
+            $this->repository->getAllUnitCategories(),
+            static function (assFormulaQuestionUnitCategory $category): bool {
+                return !$category->getQuestionFi() ? true : false;
+            }
+        );
+        $data = [];
+        foreach ($categories as $category) {
+            /** @var assFormulaQuestionUnitCategory $category */
+            $data[] = [
+                'category_id' => $category->getId(),
+                'category' => $category->getDisplayString()
+            ];
+        }
+
+        $this->showUnitCategories($data);
+    }
+
+    protected function confirmDeleteCategory(): void
+    {
+        if (!$this->request->isset('category_id')) {
+            $this->{$this->getUnitCategoryOverviewCommand()}();
+            return;
+        }
+
+        $this->confirmDeleteCategories([$this->request->int('category_id')]);
+    }
+
+    /**
+     * @param int[]|null $category_ids
+     * @return void
+     * @throws ilCtrlException
+     */
+    protected function confirmDeleteCategories(?array $category_ids = null): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->{$this->getDefaultCommand()}();
+            return;
+        }
+
+        $category_ids = $category_ids ?? $this->request->getUnitCategoryIds();
+        if (count($category_ids) === 0) {
+            $this->{$this->getUnitCategoryOverviewCommand()}();
+            return;
+        }
+
+        $confirmation = new ilConfirmationGUI();
+        $confirmation->setFormAction($this->ctrl->getFormAction($this, 'deleteCategories'));
+        $confirmation->setConfirm($this->lng->txt('confirm'), 'deleteCategories');
+        $confirmation->setCancel($this->lng->txt('cancel'), $this->getUnitCategoryOverviewCommand());
+
+        $errors = [];
+        $num_to_confirm = 0;
+        foreach ($category_ids as $category_id) {
+            try {
+                $category = $this->repository->getUnitCategoryById($category_id);
+            } catch (ilException $e) {
+                continue;
+            }
+
+            if (!$this->repository->isCRUDAllowed($category_id)) {
+                $errors[] = $category->getDisplayString() . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
+                continue;
+            }
+
+            $possible_error = $this->repository->checkDeleteCategory($category_id);
+            if (is_string($possible_error) && $possible_error !== '') {
+                $errors[] = $category->getDisplayString() . ' - ' . $possible_error;
+                continue;
+            }
+
+            $confirmation->addItem('category_ids[]', (string) $category->getId(), $category->getDisplayString());
+            ++$num_to_confirm;
+        }
+
+        if ($errors) {
+            $num_errors = count($errors);
+
+            $error_message = array_map(static function (string $message): string {
+                return '<li>' . $message . '</li>';
+            }, $errors);
+            if ($num_errors === 1) {
+                $this->tpl->setOnScreenMessage(
+                    'failure',
+                    $this->lng->txt('un_cat_deletion_errors_f_s') . '<ul>' . implode('', $error_message) . '<ul>'
+                );
+            } else {
+                $this->tpl->setOnScreenMessage(
+                    'failure',
+                    $this->lng->txt('un_cat_deletion_errors_f') . '<ul>' . implode('', $error_message) . '<ul>'
+                );
+            }
+        }
+
+        if ($num_to_confirm) {
+            if ($num_to_confirm === 1) {
+                $confirmation->setHeaderText($this->lng->txt('un_sure_delete_categories_s'));
+            } else {
+                $confirmation->setHeaderText($this->lng->txt('un_sure_delete_categories'));
+            }
+
+            $this->tpl->setContent($confirmation->getHTML());
+        } else {
+            $this->{$this->getUnitCategoryOverviewCommand()}();
+        }
+    }
+
+    protected function deleteCategories(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->{$this->getDefaultCommand()}();
+            return;
+        }
+
+        $category_ids = $this->request->getUnitCategoryIds();
+        if (count($category_ids) === 0) {
+            $this->{$this->getUnitCategoryOverviewCommand()}();
+            return;
+        }
+
+        $errors = [];
+        $num_deleted = 0;
+        foreach ($category_ids as $category_id) {
+            try {
+                $category = $this->repository->getUnitCategoryById($category_id);
+            } catch (ilException $e) {
+                continue;
+            }
+
+            if (!$this->repository->isCRUDAllowed($category_id)) {
+                $errors[] = $category->getDisplayString() . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
+                continue;
+            }
+
+            $possible_error = $this->repository->deleteCategory($category_id);
+            if (is_string($possible_error) && $possible_error !== '') {
+                $errors[] = $category->getDisplayString() . ' - ' . $possible_error;
+                continue;
+            }
+
+            ++$num_deleted;
+        }
+
+        if ($errors) {
+            $num_errors = count($errors);
+
+            $error_message = array_map(static function (string $message): string {
+                return '<li>' . $message . '</li>';
+            }, $errors);
+            if ($num_errors === 1) {
+                $this->tpl->setOnScreenMessage(
+                    'failure',
+                    $this->lng->txt('un_cat_deletion_errors_p_s') . '<ul>' . implode('', $error_message) . '<ul>'
+                );
+            } else {
+                $this->tpl->setOnScreenMessage(
+                    'failure',
+                    $this->lng->txt('un_cat_deletion_errors_p') . '<ul>' . implode('', $error_message) . '<ul>'
+                );
+            }
+        }
+
+        if ($num_deleted) {
+            if ($num_deleted === 1) {
+                $this->tpl->setOnScreenMessage('success', $this->lng->txt('un_deleted_categories_s'));
+            } else {
+                $this->tpl->setOnScreenMessage('success', $this->lng->txt('un_deleted_categories'));
+            }
+        }
+
+        $this->{$this->getUnitCategoryOverviewCommand()}();
+    }
+
+    protected function initUnitCategoryForm(?assFormulaQuestionUnitCategory $cat = null): ilPropertyFormGUI
+    {
+        if ($this->unit_cat_form instanceof ilPropertyFormGUI) {
+            return $this->unit_cat_form;
+        }
+
+        $this->unit_cat_form = new ilPropertyFormGUI();
+
+        $title = new ilTextInputGUI($this->lng->txt('title'), 'category_name');
+        $title->setRequired(true);
+        $this->unit_cat_form->addItem($title);
+
+        if (null === $cat) {
+            $this->unit_cat_form->setTitle($this->lng->txt('new_category'));
+            $this->unit_cat_form->setFormAction($this->ctrl->getFormAction($this, 'addCategory'));
+            $this->unit_cat_form->addCommandButton('addCategory', $this->lng->txt('save'));
+        } else {
+            $this->ctrl->setParameter($this, 'category_id', $cat->getId());
+            $this->unit_cat_form->addCommandButton('saveCategory', $this->lng->txt('save'));
+            $this->unit_cat_form->setFormAction($this->ctrl->getFormAction($this, 'saveCategory'));
+            $this->unit_cat_form->setTitle(sprintf($this->lng->txt('selected_category'), $cat->getDisplayString()));
+        }
+
+        $this->unit_cat_form->addCommandButton($this->getUnitCategoryOverviewCommand(), $this->lng->txt('cancel'));
+        return $this->unit_cat_form;
+    }
+
+    protected function addCategory(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->{$this->getDefaultCommand()}();
+            return;
+        }
+
+        $this->initUnitCategoryForm();
+        if ($this->unit_cat_form->checkInput()) {
+            try {
+                $category = new assFormulaQuestionUnitCategory();
+                $category->setCategory($this->unit_cat_form->getInput('category_name'));
+                $this->repository->saveNewUnitCategory($category);
+                $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
+
+                $this->{$this->getUnitCategoryOverviewCommand()}();
+                return;
+            } catch (ilException $e) {
+                $this->unit_cat_form->getItemByPostVar('category_name')->setAlert($this->lng->txt($e->getMessage()));
+                $this->tpl->setOnScreenMessage('failure', $this->lng->txt('form_input_not_valid'));
+            }
+        }
+
+        $this->unit_cat_form->setValuesByPost();
+
+        $this->tpl->setContent($this->unit_cat_form->getHtml());
+    }
+
+    protected function showUnitCategoryCreationForm(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->{$this->getDefaultCommand()}();
+            return;
+        }
+
+        $this->initUnitCategoryForm();
+
+        $this->tpl->setContent($this->unit_cat_form->getHtml());
+    }
+
+    protected function saveCategory(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->{$this->getDefaultCommand()}();
+            return;
+        }
+
+        $category = $this->getCategoryById($this->request->int('category_id'));
+
+        $this->initUnitCategoryForm($category);
+        if ($this->unit_cat_form->checkInput()) {
+            try {
+                $category->setCategory($this->unit_cat_form->getInput('category_name'));
+                $this->repository->saveCategory($category);
+                $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
+
+                $this->{$this->getUnitCategoryOverviewCommand()}();
+                return;
+            } catch (ilException $e) {
+                $this->unit_cat_form->getItemByPostVar('category_name')->setAlert($this->lng->txt($e->getMessage()));
+                $this->tpl->setOnScreenMessage('failure', $this->lng->txt('form_input_not_valid'));
+            }
+        }
+
+        $this->unit_cat_form->setValuesByPost();
+
+        $this->tpl->setContent($this->unit_cat_form->getHtml());
+    }
+
+    protected function showUnitCategoryModificationForm(): void
+    {
+        if (!$this->isCRUDContext()) {
+            $this->{$this->getDefaultCommand()}();
+            return;
+        }
+
+        $category = $this->getCategoryById($this->request->int('category_id'));
+
+        $this->initUnitCategoryForm($category);
+        $this->unit_cat_form->setValuesByArray([
+            'category_name' => $category->getCategory()
+        ]);
+
+        $this->tpl->setContent($this->unit_cat_form->getHtml());
+    }
+}
diff --git a/components/ILIAS/Questions/src/Units/Repository.php b/components/ILIAS/Questions/src/Units/Repository.php
new file mode 100755
index 000000000000..20e9d391eb71
--- /dev/null
+++ b/components/ILIAS/Questions/src/Units/Repository.php
@@ -0,0 +1,738 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Units;
+
+class Repository
+{
+    protected int $consumer_id = 0;
+    protected \ilLanguage $lng;
+    protected \ilDBInterface $db;
+    /** @var assFormulaQuestionUnit[] */
+    private array $units = [];
+    /** @var assFormulaQuestionUnit[]|assFormulaQuestionUnitCategory[]  */
+    private array $categorizedUnits = [];
+
+    public function __construct(int $consumer_id)
+    {
+        global $DIC;
+
+        $lng = $DIC->language();
+
+        $this->db = $DIC->database();
+        $this->consumer_id = $consumer_id;
+        $this->lng = $lng;
+    }
+
+    public function setConsumerId(int $consumer_id): void
+    {
+        $this->consumer_id = $consumer_id;
+    }
+
+    public function getConsumerId(): int
+    {
+        return $this->consumer_id;
+    }
+
+    public function isCRUDAllowed(int $category_id): bool
+    {
+        $res = $this->db->queryF(
+            'SELECT * FROM il_qpl_qst_fq_ucat WHERE category_id = %s',
+            ['integer'],
+            [$category_id]
+        );
+        $row = $this->db->fetchAssoc($res);
+        return isset($row['question_fi']) && (int) $row['question_fi'] === $this->getConsumerId();
+    }
+
+    public function copyCategory(int $category_id, int $question_fi, ?string $category_name = null): int
+    {
+        $res = $this->db->queryF(
+            'SELECT category FROM il_qpl_qst_fq_ucat WHERE category_id = %s',
+            ['integer'],
+            [$category_id]
+        );
+        $row = $this->db->fetchAssoc($res);
+
+        if (null === $category_name) {
+            $category_name = $row['category'];
+        }
+
+        $next_id = $this->db->nextId('il_qpl_qst_fq_ucat');
+        $this->db->insert(
+            'il_qpl_qst_fq_ucat',
+            [
+                'category_id' => ['integer', $next_id],
+                'category' => ['text', $category_name],
+                'question_fi' => ['integer', (int) $question_fi]
+            ]
+        );
+
+        return $next_id;
+    }
+
+    public function copyUnitsByCategories(int $from_category_id, int $to_category_id, int $qustion_fi): void
+    {
+        $res = $this->db->queryF(
+            'SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
+            ['integer'],
+            [$from_category_id]
+        );
+        $i = 0;
+        $units = [];
+        while ($row = $this->db->fetchAssoc($res)) {
+            $next_id = $this->db->nextId('il_qpl_qst_fq_unit');
+
+            $units[$i]['old_unit_id'] = $row['unit_id'];
+            $units[$i]['new_unit_id'] = $next_id;
+
+            $this->db->insert(
+                'il_qpl_qst_fq_unit',
+                [
+                    'unit_id' => ['integer', $next_id],
+                    'unit' => ['text', $row['unit']],
+                    'factor' => ['float', $row['factor']],
+                    'baseunit_fi' => ['integer', (int) $row['baseunit_fi']],
+                    'category_fi' => ['integer', (int) $to_category_id],
+                    'sequence' => ['integer', (int) $row['sequence']],
+                    'question_fi' => ['integer', (int) $qustion_fi]
+                ]
+            );
+            $i++;
+        }
+
+        foreach ($units as $unit) {
+            //update unit : baseunit_fi
+            $this->db->update(
+                'il_qpl_qst_fq_unit',
+                ['baseunit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                [
+                    'baseunit_fi' => ['integer', $unit['old_unit_id']],
+                    'category_fi' => ['integer', $to_category_id]
+                ]
+            );
+
+            //update var : unit_fi
+            $this->db->update(
+                'il_qpl_qst_fq_var',
+                ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                [
+                    'unit_fi' => ['integer', $unit['old_unit_id']],
+                    'question_fi' => ['integer', $qustion_fi]
+                ]
+            );
+
+            //update res : unit_fi
+            $this->db->update(
+                'il_qpl_qst_fq_res',
+                ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                [
+                    'unit_fi' => ['integer', $unit['old_unit_id']],
+                    'question_fi' => ['integer', $qustion_fi]
+                ]
+            );
+
+            //update res_unit : unit_fi
+            $this->db->update(
+                'il_qpl_qst_fq_res_unit',
+                ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                [
+                    'unit_fi' => ['integer', $unit['old_unit_id']],
+                    'question_fi' => ['integer', $qustion_fi]
+                ]
+            );
+        }
+    }
+
+    public function getCategoryUnitCount(int $id): int
+    {
+        $result = $this->db->queryF(
+            "SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s",
+            ['integer'],
+            [$id]
+        );
+
+        return $this->db->numRows($result);
+    }
+
+    public function isUnitInUse(int $id): bool
+    {
+        $result_1 = $this->db->queryF(
+            "SELECT unit_fi FROM il_qpl_qst_fq_res_unit WHERE unit_fi = %s",
+            ['integer'],
+            [$id]
+        );
+
+        $result_2 = $this->db->queryF(
+            "SELECT unit_fi FROM il_qpl_qst_fq_var WHERE unit_fi = %s",
+            ['integer'],
+            [$id]
+        );
+        $result_3 = $this->db->queryF(
+            "SELECT unit_fi FROM il_qpl_qst_fq_res WHERE unit_fi = %s",
+            ['integer'],
+            [$id]
+        );
+
+        $cnt_1 = $this->db->numRows($result_1);
+        $cnt_2 = $this->db->numRows($result_2);
+        $cnt_3 = $this->db->numRows($result_3);
+
+        return $cnt_1 > 0 || $cnt_2 > 0 || $cnt_3 > 0;
+    }
+
+    public function checkDeleteCategory(int $id): ?string
+    {
+        $res = $this->db->queryF(
+            'SELECT unit_id FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
+            ['integer'],
+            [$id]
+        );
+
+        if ($this->db->numRows($res)) {
+            while ($row = $this->db->fetchAssoc($res)) {
+                $unit_res = $this->checkDeleteUnit((int) $row['unit_id'], $id);
+                if (!is_null($unit_res)) {
+                    return $unit_res;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public function deleteUnit(int $id): ?string
+    {
+        $res = $this->checkDeleteUnit($id);
+        if (!is_null($res)) {
+            return $res;
+        }
+
+        $affectedRows = $this->db->manipulateF(
+            "DELETE FROM il_qpl_qst_fq_unit WHERE unit_id = %s",
+            ['integer'],
+            [$id]
+        );
+
+        if ($affectedRows > 0) {
+            $this->clearUnits();
+        }
+
+        return null;
+    }
+
+    protected function loadUnits(): void
+    {
+        $result = $this->db->query(
+            "
+			SELECT units.*, il_qpl_qst_fq_ucat.category, baseunits.unit baseunit_title
+			FROM il_qpl_qst_fq_unit units
+			INNER JOIN il_qpl_qst_fq_ucat ON il_qpl_qst_fq_ucat.category_id = units.category_fi
+			LEFT JOIN il_qpl_qst_fq_unit baseunits ON baseunits.unit_id = units.baseunit_fi
+			ORDER BY il_qpl_qst_fq_ucat.category, units.sequence"
+        );
+
+        if ($this->db->numRows($result)) {
+            while ($row = $this->db->fetchAssoc($result)) {
+                $unit = new assFormulaQuestionUnit();
+                $unit->initFormArray($row);
+                $this->addUnit($unit);
+            }
+        }
+    }
+
+    /**
+     * @return assFormulaQuestionUnit[]|assFormulaQuestionUnitCategory[]
+     */
+    public function getCategorizedUnits(): array
+    {
+        if (count($this->categorizedUnits) === 0) {
+            $result = $this->db->queryF(
+                "
+				SELECT	units.*, il_qpl_qst_fq_ucat.category, il_qpl_qst_fq_ucat.question_fi, baseunits.unit baseunit_title
+				FROM	il_qpl_qst_fq_unit units
+				INNER JOIN il_qpl_qst_fq_ucat ON il_qpl_qst_fq_ucat.category_id = units.category_fi
+				LEFT JOIN il_qpl_qst_fq_unit baseunits ON baseunits.unit_id = units.baseunit_fi
+				WHERE	units.question_fi = %s
+				ORDER BY il_qpl_qst_fq_ucat.category, units.sequence",
+                ['integer'],
+                [$this->getConsumerId()]
+            );
+
+            if ($this->db->numRows($result) > 0) {
+                $category = 0;
+                while ($row = $this->db->fetchAssoc($result)) {
+                    $unit = new assFormulaQuestionUnit();
+                    $unit->initFormArray($row);
+
+                    if ($category !== $unit->getCategory()) {
+                        $cat = new assFormulaQuestionUnitCategory();
+                        $cat->initFormArray([
+                            'category_id' => (int) $row['category_fi'],
+                            'category' => $row['category'],
+                            'question_fi' => (int) $row['question_fi'],
+                        ]);
+                        $this->categorizedUnits[] = $cat;
+                        $category = $unit->getCategory();
+                    }
+
+                    $this->categorizedUnits[] = $unit;
+                }
+            }
+        }
+
+        return $this->categorizedUnits;
+    }
+
+    protected function clearUnits(): void
+    {
+        $this->units = [];
+    }
+
+    protected function addUnit(assFormulaQuestionUnit $unit): void
+    {
+        $this->units[$unit->getId()] = $unit;
+    }
+
+    /**
+     * @return assFormulaQuestionUnit[]
+     */
+    public function getUnits(): array
+    {
+        if (count($this->units) === 0) {
+            $this->loadUnits();
+        }
+        return $this->units;
+    }
+
+    /**
+     * @param int $category
+     * @return assFormulaQuestionUnit[]
+     */
+    public function loadUnitsForCategory(int $category): array
+    {
+        global $DIC;
+        $ilDB = $DIC['ilDB'];
+
+        $units = [];
+        $result = $ilDB->queryF(
+            "SELECT units.*, baseunits.unit baseunit_title, il_qpl_qst_fq_ucat.category
+			FROM il_qpl_qst_fq_unit units
+			INNER JOIN il_qpl_qst_fq_ucat ON il_qpl_qst_fq_ucat.category_id = units.category_fi
+			LEFT JOIN il_qpl_qst_fq_unit baseunits ON baseunits.unit_id = units.baseunit_fi
+			WHERE il_qpl_qst_fq_ucat.category_id = %s
+			ORDER BY units.sequence",
+            ['integer'],
+            [$category]
+        );
+
+        if ($result->numRows() > 0) {
+            while ($row = $ilDB->fetchAssoc($result)) {
+                $unit = new assFormulaQuestionUnit();
+                $unit->initFormArray($row);
+                $units[] = $unit;
+            }
+        }
+
+        return $units;
+    }
+
+    /**
+     * @param int $id
+     * @return assFormulaQuestionUnit|null
+     */
+    public function getUnit(int $id): ?assFormulaQuestionUnit
+    {
+        if (count($this->units) === 0) {
+            $this->loadUnits();
+        }
+
+        if (array_key_exists($id, $this->units)) {
+            return $this->units[$id];
+        }
+
+        // Maybe this is a new unit, reload $this->units
+
+        $this->loadUnits();
+
+        return $this->units[$id] ?? null;
+    }
+
+    /**
+     * @return array<int, array{value: int, text: string, qst_id: int}>
+     */
+    public function getUnitCategories(): array
+    {
+        $categories = [];
+        $result = $this->db->queryF(
+            "SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi > %s ORDER BY category",
+            ['integer'],
+            [0]
+        );
+
+        if ($this->db->numRows($result)) {
+            while ($row = $this->db->fetchAssoc($result)) {
+                $value = strcmp('-qpl_qst_formulaquestion_' . $row['category'] . '-', $this->lng->txt($row['category'])) === 0
+                    ? $row['category']
+                    : $this->lng->txt($row['category']);
+
+                if (trim($row['category']) !== '') {
+                    $cat = [
+                        'value' => (int) $row['category_id'],
+                        'text' => $value,
+                        'qst_id' => (int) $row['question_fi']
+                    ];
+                    $categories[(int) $row['category_id']] = $cat;
+                }
+            }
+        }
+
+        return $categories;
+    }
+
+    /**
+     * @return array<int, array{value: int, text: string, qst_id: int}>
+     */
+    public function getAdminUnitCategories(): array
+    {
+        $categories = [];
+
+        $result = $this->db->queryF(
+            "SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi = %s  ORDER BY category",
+            ['integer'],
+            [0]
+        );
+
+        if ($result = $this->db->numRows($result)) {
+            while ($row = $this->db->fetchAssoc($result)) {
+                $value = strcmp('-qpl_qst_formulaquestion_' . $row['category'] . '-', $this->lng->txt($row['category'])) === 0
+                    ? $row['category']
+                    : $this->lng->txt($row['category']);
+
+                if (trim($row['category']) !== '') {
+                    $cat = [
+                        'value' => (int) $row['category_id'],
+                        'text' => $value,
+                        'qst_id' => (int) $row['question_fi']
+                    ];
+                    $categories[(int) $row['category_id']] = $cat;
+                }
+            }
+        }
+
+        return $categories;
+    }
+
+    public function saveUnitOrder(int $unit_id, int $sequence): void
+    {
+        $this->db->manipulateF(
+            'UPDATE il_qpl_qst_fq_unit SET sequence = %s WHERE unit_id = %s AND question_fi = %s',
+            ['integer', 'integer', 'integer'],
+            [$sequence, $unit_id, $this->getConsumerId()]
+        );
+    }
+
+    public function checkDeleteUnit(int $id, ?int $category_id = null): ?string
+    {
+        $result = $this->db->queryF(
+            "SELECT * FROM il_qpl_qst_fq_var WHERE unit_fi = %s",
+            ['integer'],
+            [$id]
+        );
+        if ($this->db->numRows($result) > 0) {
+            return $this->lng->txt("err_unit_in_variables");
+        }
+
+        $result = $this->db->queryF(
+            "SELECT * FROM il_qpl_qst_fq_res WHERE unit_fi = %s",
+            ['integer'],
+            [$id]
+        );
+        if ($this->db->numRows($result) > 0) {
+            return $this->lng->txt("err_unit_in_results");
+        }
+
+        if (!is_null($category_id)) {
+            $result = $this->db->queryF(
+                "SELECT * FROM il_qpl_qst_fq_unit WHERE baseunit_fi = %s AND category_fi != %s",
+                ['integer', 'integer', 'integer'],
+                [$id, $id, $category_id]
+            );
+        } else {
+            $result = $this->db->queryF(
+                "SELECT * FROM il_qpl_qst_fq_unit WHERE baseunit_fi = %s AND unit_id != %s",
+                ['integer', 'integer'],
+                [$id, $id]
+            );
+        }
+
+        if ($this->db->numRows($result) > 0) {
+            return $this->lng->txt("err_unit_is_baseunit");
+        }
+
+        return null;
+    }
+
+    public function getUnitCategoryById(int $id): assFormulaQuestionUnitCategory
+    {
+        $query = 'SELECT * FROM il_qpl_qst_fq_ucat WHERE category_id = ' . $this->db->quote($id, 'integer');
+        $res = $this->db->query($query);
+        if (!$this->db->numRows($res)) {
+            throw new ilException('un_category_not_exist');
+        }
+
+        $row = $this->db->fetchAssoc($res);
+        $category = new assFormulaQuestionUnitCategory();
+        $category->initFormArray($row);
+        return $category;
+    }
+
+    public function saveCategory(assFormulaQuestionUnitCategory $category): void
+    {
+        $res = $this->db->queryF(
+            'SELECT * FROM il_qpl_qst_fq_ucat WHERE category = %s AND question_fi = %s AND category_id != %s',
+            ['text', 'integer', 'integer'],
+            [$category->getCategory(), $this->getConsumerId(), $category->getId()]
+        );
+        if ($this->db->numRows($res)) {
+            throw new ilException('err_wrong_categoryname');
+        }
+
+        $this->db->manipulateF(
+            'UPDATE il_qpl_qst_fq_ucat SET category = %s WHERE question_fi = %s AND category_id = %s',
+            ['text', 'integer', 'integer'],
+            [$category->getCategory(), $this->getConsumerId(), $category->getId()]
+        );
+    }
+
+    public function saveNewUnitCategory(assFormulaQuestionUnitCategory $category): void
+    {
+        $res = $this->db->queryF(
+            'SELECT category FROM il_qpl_qst_fq_ucat WHERE category = %s AND question_fi = %s',
+            ['text', 'integer'],
+            [$category->getCategory(), $this->getConsumerId()]
+        );
+        if ($this->db->numRows($res)) {
+            throw new ilException('err_wrong_categoryname');
+        }
+
+        $next_id = $this->db->nextId('il_qpl_qst_fq_ucat');
+        $this->db->manipulateF(
+            "INSERT INTO il_qpl_qst_fq_ucat (category_id, category, question_fi) VALUES (%s, %s, %s)",
+            ['integer', 'text', 'integer'],
+            [
+                $next_id,
+                $category->getCategory(),
+                $this->getConsumerId()
+            ]
+        );
+        $category->setId($next_id);
+    }
+
+    /**
+     * @return assFormulaQuestionUnitCategory[]
+     */
+    public function getAllUnitCategories(): array
+    {
+        $categories = [];
+        $result = $this->db->queryF(
+            "SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi = %s OR question_fi = %s ORDER BY category",
+            ['integer', 'integer'],
+            [$this->getConsumerId(), 0]
+        );
+
+        if ($result->numRows() > 0) {
+            while ($row = $this->db->fetchAssoc($result)) {
+                $category = new assFormulaQuestionUnitCategory();
+                $category->initFormArray($row);
+                $categories[] = $category;
+            }
+        }
+        return $categories;
+    }
+
+    public function deleteCategory(int $id): ?string
+    {
+        $res = $this->checkDeleteCategory($id);
+        if (!is_null($res)) {
+            return $this->lng->txt('err_category_in_use');
+        }
+
+        $res = $this->db->queryF(
+            'SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
+            ['integer'],
+            [$id]
+        );
+        while ($row = $this->db->fetchAssoc($res)) {
+            $this->deleteUnit((int) $row['unit_id']);
+        }
+
+        $ar = $this->db->manipulateF(
+            'DELETE FROM il_qpl_qst_fq_ucat WHERE category_id = %s',
+            ['integer'],
+            [$id]
+        );
+
+        if ($ar > 0) {
+            $this->clearUnits();
+        }
+
+        return null;
+    }
+
+    public function createNewUnit(assFormulaQuestionUnit $unit): void
+    {
+        $next_id = $this->db->nextId('il_qpl_qst_fq_unit');
+        $this->db->manipulateF(
+            'INSERT INTO il_qpl_qst_fq_unit (unit_id, unit, factor, baseunit_fi, category_fi, sequence, question_fi) VALUES (%s, %s, %s, %s, %s, %s, %s)',
+            ['integer', 'text', 'float', 'integer', 'integer', 'integer', 'integer'],
+            [
+                $next_id,
+                $unit->getUnit(),
+                1,
+                0,
+                $unit->getCategory(),
+                0,
+                $this->getConsumerId()
+            ]
+        );
+        $unit->setId($next_id);
+        $unit->setFactor(1.0);
+        $unit->setBaseUnit(0);
+        $unit->setSequence(0);
+
+        $this->clearUnits();
+    }
+
+    public function saveUnit(assFormulaQuestionUnit $unit): void
+    {
+        $res = $this->db->queryF(
+            'SELECT unit_id FROM il_qpl_qst_fq_unit WHERE unit_id = %s',
+            ['integer'],
+            [$unit->getId()]
+        );
+        if ($this->db->numRows($res)) {
+            $row = $this->db->fetchAssoc($res);
+
+            if ($unit->getBaseUnit() === 0 || $unit->getBaseUnit() === $unit->getId()) {
+                $unit->setFactor(1);
+            }
+
+            $ar = $this->db->manipulateF(
+                'UPDATE il_qpl_qst_fq_unit SET unit = %s, factor = %s, baseunit_fi = %s, category_fi = %s, sequence = %s WHERE unit_id = %s AND question_fi = %s',
+                ['text', 'float', 'integer', 'integer', 'integer', 'integer', 'integer'],
+                [
+                    $unit->getUnit(), $unit->getFactor(), (int) $unit->getBaseUnit(),
+                    $unit->getCategory(),
+                    $unit->getSequence(),
+                    $unit->getId(),
+                    $this->getConsumerId()
+                ]
+            );
+            if ($ar > 0) {
+                $this->clearUnits();
+            }
+        }
+    }
+
+    public function cloneUnits(int $from_consumer_id, int $to_consumer_id): void
+    {
+        $category_mapping = [];
+
+        $res = $this->db->queryF("SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi = %s", ['integer'], [$from_consumer_id]);
+        while ($row = $this->db->fetchAssoc($res)) {
+            $new_category_id = $this->copyCategory((int) $row['category_id'], $to_consumer_id);
+            $category_mapping[$row['category_id']] = $new_category_id;
+        }
+
+        foreach ($category_mapping as $old_category_id => $new_category_id) {
+            $res = $this->db->queryF(
+                'SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
+                ['integer'],
+                [$old_category_id]
+            );
+
+            $i = 0;
+            $units = [];
+            while ($row = $this->db->fetchAssoc($res)) {
+                $next_id = $this->db->nextId('il_qpl_qst_fq_unit');
+
+                $units[$i]['old_unit_id'] = $row['unit_id'];
+                $units[$i]['new_unit_id'] = $next_id;
+
+                $this->db->insert(
+                    'il_qpl_qst_fq_unit',
+                    [
+                        'unit_id' => ['integer', $next_id],
+                        'unit' => ['text', $row['unit']],
+                        'factor' => ['float', $row['factor']],
+                        'baseunit_fi' => ['integer', (int) $row['baseunit_fi']],
+                        'category_fi' => ['integer', (int) $new_category_id],
+                        'sequence' => ['integer', (int) $row['sequence']],
+                        'question_fi' => ['integer', $to_consumer_id]
+                    ]
+                );
+                $i++;
+            }
+
+            foreach ($units as $unit) {
+                //update unit : baseunit_fi
+                $this->db->update(
+                    'il_qpl_qst_fq_unit',
+                    ['baseunit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                    [
+                        'baseunit_fi' => ['integer', (int) $unit['old_unit_id']],
+                        'question_fi' => ['integer', $to_consumer_id]
+                    ]
+                );
+
+                //update var : unit_fi
+                $this->db->update(
+                    'il_qpl_qst_fq_var',
+                    ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                    [
+                        'unit_fi' => ['integer', (int) $unit['old_unit_id']],
+                        'question_fi' => ['integer', $to_consumer_id]
+                    ]
+                );
+
+                //update res : unit_fi
+                $this->db->update(
+                    'il_qpl_qst_fq_res',
+                    ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                    [
+                        'unit_fi' => ['integer', (int) $unit['old_unit_id']],
+                        'question_fi' => ['integer', $to_consumer_id]
+                    ]
+                );
+
+                //update res_unit : unit_fi
+                $this->db->update(
+                    'il_qpl_qst_fq_res_unit',
+                    ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                    [
+                        'unit_fi' => ['integer', (int) $unit['old_unit_id']],
+                        'question_fi' => ['integer', $to_consumer_id]
+                    ]
+                );
+            }
+        }
+    }
+}
diff --git a/components/ILIAS/Questions/src/Units/Unit.php b/components/ILIAS/Questions/src/Units/Unit.php
new file mode 100755
index 000000000000..9db6dc04a842
--- /dev/null
+++ b/components/ILIAS/Questions/src/Units/Unit.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+use ILIAS\Questions\Units;
+
+class Unit
+{
+    private int $id = 0;
+    private string $unit = '';
+    private float $factor = 0.0;
+    private int $category = 0;
+    private int $sequence = 0;
+    private int $baseunit = 0;
+    private ?string $baseunit_title = null;
+
+    public function initFormArray(array $data): void
+    {
+        $this->id = (int) $data['unit_id'];
+        $this->unit = $data['unit'];
+        $this->factor = (float) $data['factor'];
+        $this->baseunit = (int) $data['baseunit_fi'];
+        $this->baseunit_title = $data['baseunit_title'] ?? null;
+        $this->category = (int) $data['category'];
+        $this->sequence = (int) $data['sequence'];
+    }
+
+    public function setId(int $id): void
+    {
+        $this->id = $id;
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function setUnit(string $unit): void
+    {
+        $this->unit = $unit;
+    }
+
+    public function getUnit(): string
+    {
+        return $this->unit;
+    }
+
+    public function setSequence(int $sequence): void
+    {
+        $this->sequence = $sequence;
+    }
+
+    public function getSequence(): int
+    {
+        return $this->sequence;
+    }
+
+    public function setFactor(float $factor): void
+    {
+        $this->factor = $factor;
+    }
+
+    public function getFactor(): float
+    {
+        return $this->factor;
+    }
+
+    public function setBaseUnit(int $baseunit): void
+    {
+        $this->baseunit = $baseunit;
+    }
+
+    public function getBaseUnit(): int
+    {
+        if ($this->baseunit > 0) {
+            return $this->baseunit;
+        }
+
+        return $this->id;
+    }
+
+    public function setBaseunitTitle(?string $baseunit_title): void
+    {
+        $this->baseunit_title = $baseunit_title;
+    }
+
+    public function getBaseunitTitle(): ?string
+    {
+        return $this->baseunit_title;
+    }
+
+    public function setCategory(int $category): void
+    {
+        $this->category = $category;
+    }
+
+    public function getCategory(): int
+    {
+        return $this->category;
+    }
+
+    public function getDisplayString(): string
+    {
+        global $DIC;
+
+        $lng = $DIC->language();
+
+        $unit = $this->getUnit();
+        if (strcmp('-qpl_qst_formulaquestion_' . $unit . '-', $lng->txt('qpl_qst_formulaquestion_' . $unit)) !== 0) {
+            $unit = $lng->txt('qpl_qst_formulaquestion_' . $unit);
+        }
+
+        return $unit;
+    }
+
+    public static function lookupUnitFactor(int $a_unit_id): float
+    {
+        global $DIC;
+        $ilDB = $DIC['ilDB'];
+
+        $res = $ilDB->queryF(
+            'SELECT factor FROM il_qpl_qst_fq_unit WHERE unit_id = %s',
+            ['integer'],
+            [$a_unit_id]
+        );
+
+        $row = $ilDB->fetchAssoc($res);
+
+        return (float) $row['factor'];
+    }
+}
diff --git a/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php b/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php
new file mode 100755
index 000000000000..c0eb01b8acf0
--- /dev/null
+++ b/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Units;
+
+class GlobalConfigurationGUI extends ConfigurationGUI
+{
+    public const REQUEST_PARAM_SUB_CONTEXT = 'context';
+
+    protected function getDefaultCommand(): string
+    {
+        return 'showGlobalUnitCategories';
+    }
+
+    public function getUnitCategoryOverviewCommand(): string
+    {
+        return 'showGlobalUnitCategories';
+    }
+
+    public function isCRUDContext(): bool
+    {
+        return true;
+    }
+
+    public function getUniqueId(): string
+    {
+        return $this->repository->getConsumerId() . '_global';
+    }
+
+    protected function showGlobalUnitCategories(): void
+    {
+        global $DIC;
+
+        $ilToolbar = $DIC->toolbar();
+        $rbacsystem = $DIC->rbac()->system();
+
+        if ($rbacsystem->checkAccess('write', $this->request->getRefId())) {
+            $ilToolbar->addButton($this->lng->txt('un_add_category'), $this->ctrl->getLinkTargetByClass(self::class, 'showUnitCategoryCreationForm'));
+        }
+
+        parent::showGlobalUnitCategories();
+    }
+
+    protected function showUnitCategories(array $categories): void
+    {
+        $table = new \ilGlobalUnitCategoryTableGUI(this, $this->getUnitCategoryOverviewCommand());
+        $table->setData($categories);
+
+        $this->tpl->setContent($table->getHTML());
+    }
+}
diff --git a/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php b/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php
new file mode 100755
index 000000000000..56f0182c1c13
--- /dev/null
+++ b/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Units;
+
+class LocalConfigurationGUI extends ConfigurationGUI
+{
+    private const REQUEST_PARAM_SUB_CONTEXT_ID = 'question_fi';
+
+    protected function getDefaultCommand(): string
+    {
+        return 'showLocalUnitCategories';
+    }
+
+    public function getUnitCategoryOverviewCommand(): string
+    {
+        if ($this->isCRUDContext()) {
+            return 'showLocalUnitCategories';
+        }
+
+        return 'showGlobalUnitCategories';
+    }
+
+    public function isCRUDContext(): bool
+    {
+        if (!$this->request->isset(self::REQUEST_PARAM_SUB_CONTEXT_ID) ||
+            $this->request->raw(self::REQUEST_PARAM_SUB_CONTEXT_ID) == $this->repository->getConsumerId()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function getUniqueId(): string
+    {
+        $id = $this->repository->getConsumerId();
+        if ($this->isCRUDContext()) {
+            $id .= '_local';
+        } else {
+            $id .= '_global';
+        }
+
+        return $id;
+    }
+
+    public function executeCommand(): void
+    {
+        global $DIC;
+
+        /** @var ilHelpGUI $ilHelp */
+        $ilHelp = $DIC['ilHelp'];
+
+        $this->ctrl->saveParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID);
+
+        $ilHelp->setScreenIdComponent('qpl');
+        parent::executeCommand();
+    }
+
+    protected function handleSubtabs(): void
+    {
+        global $DIC;
+
+        $ilTabs = $DIC->tabs();
+
+        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, $this->repository->getConsumerId());
+        $ilTabs->addSubTab('view_unit_ctx_local', $this->lng->txt('un_local_units'), $this->ctrl->getLinkTarget($this, 'showLocalUnitCategories'));
+        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, 0);
+        $ilTabs->addSubTab('view_unit_ctx_global', $this->lng->txt('un_global_units'), $this->ctrl->getLinkTarget($this, 'showGlobalUnitCategories'));
+        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, '');
+
+        if ($this->isCRUDContext()) {
+            $ilTabs->activateSubTab('view_unit_ctx_local');
+        } else {
+            $ilTabs->activateSubTab('view_unit_ctx_global');
+        }
+    }
+
+    protected function showLocalUnitCategories(): void
+    {
+        global $DIC;
+
+        $ilToolbar = $DIC->toolbar();
+
+        $ilToolbar->addButton($this->lng->txt('un_add_category'), $this->ctrl->getLinkTarget($this, 'showUnitCategoryCreationForm'));
+
+        $repo = $this->repository;
+        $categories = array_filter(
+            $this->repository->getAllUnitCategories(),
+            static function (assFormulaQuestionUnitCategory $category) use ($repo): bool {
+                return $category->getQuestionFi() === $repo->getConsumerId();
+            }
+        );
+        $data = [];
+        foreach ($categories as $category) {
+            /** @var assFormulaQuestionUnitCategory $category */
+            $data[] = [
+                'category_id' => $category->getId(),
+                'category' => $category->getDisplayString()
+            ];
+        }
+
+        $this->showUnitCategories($data);
+    }
+
+    /**
+     * @param array $categories
+     */
+    protected function showUnitCategories(array $categories): void
+    {
+        $table = new ilLocalUnitCategoryTableGUI($this, $this->getUnitCategoryOverviewCommand());
+        $table->setData($categories);
+
+        $this->tpl->setContent($table->getHTML());
+    }
+
+    protected function confirmImportGlobalCategory(): void
+    {
+        if (!$this->request->isset('category_id')) {
+            $this->showGlobalUnitCategories();
+            return;
+        }
+        $this->confirmImportGlobalCategories([$this->request->raw('category_id')]);
+    }
+
+    protected function confirmImportGlobalCategories(array $category_ids): void
+    {
+        // @todo: Confirmation Currently not implemented, so forward to import
+        $this->importGlobalCategories($category_ids);
+    }
+
+    protected function importGlobalCategories(array $category_ids): void
+    {
+        if ($this->isCRUDContext()) {
+            $this->{$this->getDefaultCommand()}();
+            return;
+        }
+
+        $i = 0;
+        foreach ($category_ids as $category_id) {
+            try {
+                $category = $this->repository->getUnitCategoryById((int) $category_id);
+            } catch (ilException $e) {
+                continue;
+            }
+
+            // Copy admin-category to custom-category (with question_fi)
+            $new_cat_id = $this->repository->copyCategory($category->getId(), $this->repository->getConsumerId());
+
+            // Copy units to custom_category
+            $this->repository->copyUnitsByCategories($category->getId(), $new_cat_id, $this->repository->getConsumerId());
+            ++$i;
+        }
+
+        if ($i) {
+            $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'), true);
+        }
+
+        $this->ctrl->setParameter($this, 'question_fi', 0);
+        $this->ctrl->redirect($this, 'showLocalUnitCategories');
+    }
+}

From 622d60296530c3fff7a73ba012334f75e25f4f0a Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 8 Sep 2025 14:57:08 +0200
Subject: [PATCH 079/141] Questions: Create Capabilities

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  2 +-
 .../Capability.php}                           |  7 ++--
 .../src/AnswerForm/Capabilities/Feedback.php  | 29 +++++++++++++
 .../AnswerForm/{ => Capabilities}/Marking.php |  7 ++--
 .../ILIAS/Questions/src/AnswerForm/Type.php   |  3 ++
 .../Cloze/Capabilities/Feedback.php           | 42 +++++++++++++++++++
 .../Cloze/{ => Capabilities}/Marking.php      | 13 +++---
 .../src/AnswerFormTypes/Cloze/Type.php        |  7 ++++
 .../ILIAS/Questions/src/Presentation/Edit.php | 27 ++++++++++++
 .../src/Setup/OverarchingQuestionTables.php   |  5 +++
 10 files changed, 126 insertions(+), 16 deletions(-)
 rename components/ILIAS/Questions/src/AnswerForm/{Feedback.php => Capabilities/Capability.php} (73%)
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Capabilities/Feedback.php
 rename components/ILIAS/Questions/src/AnswerForm/{ => Capabilities}/Marking.php (78%)
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/{ => Capabilities}/Marking.php (72%)

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index f90375918d70..624bbfa24d00 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -66,7 +66,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
                             new Cloze\Persistence(
                                 new TableNameSpaceCore('cloze')
                             ),
-                            new Cloze\Marking(),
+                            new Cloze\Capabilities\Marking(),
                             new Cloze\Views\Edit(
                                 $DIC['lng'],
                                 $DIC['ui.factory'],
diff --git a/components/ILIAS/Questions/src/AnswerForm/Feedback.php b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php
similarity index 73%
rename from components/ILIAS/Questions/src/AnswerForm/Feedback.php
rename to components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php
index 5b204f87767b..18f055fc1589 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Feedback.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php
@@ -18,10 +18,9 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerForm;
+namespace ILIAS\Questions\AnswerForm\Capabilities;
 
-interface Feedback
+interface Capability
 {
-    public function getGeneralFeedback(Result $result): array;
-    public function getSpecificFeedback(Result $result, string $answer_id): array;
+    public function isConfigured(): bool;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Feedback.php b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Feedback.php
new file mode 100644
index 000000000000..b2268af3f4ae
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Feedback.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm\Capabilities;
+
+use ILIAS\Questions\Question\Response;
+
+interface Feedback extends Capability
+{
+    public function getGeneralFeedback(Response $response): array;
+    public function getSpecificFeedback(Response $response, string $answer_id): array;
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Marking.php b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Marking.php
similarity index 78%
rename from components/ILIAS/Questions/src/AnswerForm/Marking.php
rename to components/ILIAS/Questions/src/AnswerForm/Capabilities/Marking.php
index 10e5b9ee363a..c01031fce58a 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Marking.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Marking.php
@@ -18,13 +18,12 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerForm;
+namespace ILIAS\Questions\AnswerForm\Capabilities;
 
 use ILIAS\Questions\Response\Response;
 
-interface Marking
+interface Marking extends Capability
 {
-    public function addAchievedPointsToResult(Response $response): Response;
+    public function addAchievedPointsToResponse(Response $response): Response;
     public function getBestResponse(): Response;
-    public function getFeedback(): Feedback;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Type.php b/components/ILIAS/Questions/src/AnswerForm/Type.php
index de0c0c341bd4..fc971b99c8a1 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Type.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Type.php
@@ -20,6 +20,8 @@
 
 namespace ILIAS\Questions\AnswerForm;
 
+use ILIAS\Questions\AnswerForm\Capabilities\Feedback;
+use ILIAS\Questions\AnswerForm\Capabilities\Marking;
 use ILIAS\Questions\AnswerForm\Views\Edit;
 use ILIAS\Questions\AnswerForm\Views\Participant;
 use ILIAS\Language\Language;
@@ -41,6 +43,7 @@ public function getLabel(Language $lng): string;
     public function getPersistence(): Persistence;
     public function isMarkable(): bool;
     public function getMarking(): ?Marking;
+    public function getFeedback(): ?Feedback;
     public function getEditView(): Edit;
     public function getParticipantView(): Participant;
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
new file mode 100644
index 000000000000..f7e6c9176f32
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Capabilities;
+
+use ILIAS\Questions\AnswerForm\Capabilities\Feedback as FeedbackInterface;
+use ILIAS\Questions\Question\Response;
+
+class Feedback implements FeedbackInterface
+{
+    public function isConfigured(): bool
+    {
+        return false;
+    }
+
+    public function getGeneralFeedback(Response $response): array
+    {
+
+    }
+
+    public function getSpecificFeedback(Response $response, string $answer_id): array
+    {
+
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Marking.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
similarity index 72%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Marking.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
index 1be7f166cbba..256b4328e7c6 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Marking.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
@@ -18,25 +18,24 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Capabilities;
 
-use ILIAS\Questions\AnswerForm\Marking as MarkingInterface;
+use ILIAS\Questions\AnswerForm\Capabilities\Marking as MarkingInterface;
 use ILIAS\Questions\Response\Response;
-use ILIAS\Questions\AnswerForm\Feedback;
 
 class Marking implements MarkingInterface
 {
-    public function addAchievedPointsToResult(Response $response): Response
+    public function isConfigured(): bool
     {
-
+        return false;
     }
 
-    public function getBestResponse(): Response
+    public function addAchievedPointsToResponse(Response $response): Response
     {
 
     }
 
-    public function getFeedback(): Feedback
+    public function getBestResponse(): Response
     {
 
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
index 614870c6c2ce..816a6198b345 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
@@ -21,6 +21,8 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze;
 
 use ILIAS\Questions\AnswerForm\Type as TypeInterface;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Capabilities\Feedback;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Capabilities\Marking;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Edit;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Participant;
 use ILIAS\Language\Language;
@@ -88,6 +90,11 @@ public function getMarking(): ?Marking
         return $this->marking->withAnswerForm($this);
     }
 
+    public function getFeedback(): ?Feedback
+    {
+
+    }
+
     public function getEditView(): Edit
     {
         return $this->edit_view->withAnswerForm($this);
diff --git a/components/ILIAS/Questions/src/Presentation/Edit.php b/components/ILIAS/Questions/src/Presentation/Edit.php
index cbd487d01784..04c5581e97b2 100644
--- a/components/ILIAS/Questions/src/Presentation/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Edit.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\Presentation;
 
+use ILIAS\Questions\AnswerForm\Capabilities\Capability;
 use ILIAS\Questions\AnswerForm\Type;
 use ILIAS\Questions\Question\Persistence\Repository;
 use ILIAS\Questions\Question\Views\Edit as QuestionEdit;
@@ -51,7 +52,9 @@ class Edit
     private const string CMD_CREATE_ACTION_FORM = 'create_af';
     private const string CMD_EDIT_ACTION_FORM = 'edit_af';
 
+    private array $required_capabilities = [];
     private Editability $editability = Editability::Full;
+    private bool $ordering_enabled = false;
 
     public function __construct(
         private readonly Language $lng,
@@ -69,6 +72,14 @@ public function __construct(
 
     }
 
+    public function withRequiredCapabilities(array $capabilities): self
+    {
+        $this->checkCapabilities($capabilities);
+        $clone = clone $this;
+        $clone->required_capabilities = $capabilities;
+        return $clone;
+    }
+
     public function withEditable(Editability $editability): self
     {
         $clone = clone $this;
@@ -76,6 +87,13 @@ public function withEditable(Editability $editability): self
         return $clone;
     }
 
+    public function withOrderingEnabled(bool $enable): self
+    {
+        $clone = clone $this;
+        $clone->ordering_enabled = $enable;
+        return $clone;
+    }
+
     public function view(
         \ilToolbarGUI $toolbar,
         URI $base_uri
@@ -437,4 +455,13 @@ function (array $c, Type $v): array {
             ]
         );
     }
+
+    private function checkCapabilities(array $capabilities): void
+    {
+        foreach ($capabilities as $capability) {
+            if (!($capability instanceof Capability)) {
+                throw new \InvalidArgumentException('All provided capabilities must implement ILIAS\Questions\AnswerForm\Capabilities\Capability.');
+            }
+        }
+    }
 }
diff --git a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
index db1c6e716368..b4d007a48138 100644
--- a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
@@ -186,6 +186,11 @@ public function step_4(): void
                     'type' => \ilDBConstants::T_INTEGER,
                     'length' => 4,
                     'notnull' => true
+                ],
+                'position' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 2,
+                    'notnull' => true
                 ]
             ]);
         }

From 91eb1bf617c4375f87bab5b0fab21b2be6e36420 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Tue, 9 Sep 2025 11:05:45 +0200
Subject: [PATCH 080/141] Questions: Some Restructuring

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       |   7 +-
 .../AnswerForm/Capabilities/Capability.php    |   3 +
 .../src/AnswerForm/Capabilities/Skills.php    |  28 +++
 .../ILIAS/Questions/src/AnswerForm/Type.php   |   8 +-
 .../Cloze/Capabilities/Feedback.php           |  10 +
 .../Cloze/Capabilities/Marking.php            |  10 +
 .../Cloze/Capabilities/Skills.php             |  47 ++++
 .../Cloze/Definitions/ScoringIdentical.php    |  41 ++++
 .../src/AnswerFormTypes/Cloze/Type.php        |  21 +-
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  |  29 ++-
 components/ILIAS/Questions/src/Collector.php  |  23 +-
 .../ILIAS/Questions/src/Presentation/Edit.php | 214 ++++++++++--------
 .../Question/{ => Definitions}/Lifecycle.php  |   2 +-
 .../Definitions/TextMatchingOptions.php       |  54 +++++
 .../src/Question/Persistence/Repository.php   |   7 +-
 .../src/Question/QuestionImplementation.php   |   2 +-
 .../Questions/src/Question/Views/Edit.php     |  29 ++-
 17 files changed, 381 insertions(+), 154 deletions(-)
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Capabilities/Skills.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definitions/ScoringIdentical.php
 rename components/ILIAS/Questions/src/Question/{ => Definitions}/Lifecycle.php (94%)
 create mode 100644 components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 624bbfa24d00..9a15908a8281 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -58,6 +58,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
                 $DIC['http'],
                 $DIC->uiService(),
                 new DataFactory(),
+                new UuidFactory(),
                 new QuestionsRepository(
                     $DIC['ilDB'],
                     new UuidFactory(),
@@ -66,7 +67,11 @@ protected static function buildDIC(ILIASContainer $DIC): self
                             new Cloze\Persistence(
                                 new TableNameSpaceCore('cloze')
                             ),
-                            new Cloze\Capabilities\Marking(),
+                            [
+                                Cloze\Capabilities\Marking::class => new Cloze\Capabilities\Marking(),
+                                Cloze\Capabilities\Feedback::class => new Cloze\Capabilities\Feedback(),
+                                Cloze\Capabilities\Skills::class => new Cloze\Capabilities\Skills()
+                            ],
                             new Cloze\Views\Edit(
                                 $DIC['lng'],
                                 $DIC['ui.factory'],
diff --git a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php
index 18f055fc1589..856da90dd100 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php
@@ -20,7 +20,10 @@
 
 namespace ILIAS\Questions\AnswerForm\Capabilities;
 
+use ILIAS\Questions\AnswerForm;
+
 interface Capability
 {
     public function isConfigured(): bool;
+    public function withAnswerForm(AnswerForm $answer_form): self;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Skills.php b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Skills.php
new file mode 100644
index 000000000000..9af7f1e5a4e9
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Skills.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm\Capabilities;
+
+use ILIAS\Questions\Question\Response;
+
+interface Skills extends Capability
+{
+    public function getSkillPointsForResponse(Response $response): float;
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Type.php b/components/ILIAS/Questions/src/AnswerForm/Type.php
index fc971b99c8a1..c0fbf81ecbce 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Type.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Type.php
@@ -20,8 +20,7 @@
 
 namespace ILIAS\Questions\AnswerForm;
 
-use ILIAS\Questions\AnswerForm\Capabilities\Feedback;
-use ILIAS\Questions\AnswerForm\Capabilities\Marking;
+use ILIAS\Questions\AnswerForm\Capabilities\Capability;
 use ILIAS\Questions\AnswerForm\Views\Edit;
 use ILIAS\Questions\AnswerForm\Views\Participant;
 use ILIAS\Language\Language;
@@ -41,9 +40,8 @@ public function withData(
     public function getLabel(Language $lng): string;
 
     public function getPersistence(): Persistence;
-    public function isMarkable(): bool;
-    public function getMarking(): ?Marking;
-    public function getFeedback(): ?Feedback;
+    public function hasCapability(string $capability_class_name): bool;
+    public function getCapability(string $capability_class_name): ?Capability;
     public function getEditView(): Edit;
     public function getParticipantView(): Participant;
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
index f7e6c9176f32..df2d5ceefd45 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
@@ -22,14 +22,24 @@
 
 use ILIAS\Questions\AnswerForm\Capabilities\Feedback as FeedbackInterface;
 use ILIAS\Questions\Question\Response;
+use ILIAS\Questions\AnswerForm;
 
 class Feedback implements FeedbackInterface
 {
+    private ?AnswerForm $answer_form = null;
+
     public function isConfigured(): bool
     {
         return false;
     }
 
+    public function withAnswerForm(AnswerForm $answer_form): self
+    {
+        $clone = clone $this;
+        $clone->answer_form = $answer_form;
+        return $clone;
+    }
+
     public function getGeneralFeedback(Response $response): array
     {
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
index 256b4328e7c6..92be39b13791 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
@@ -22,14 +22,24 @@
 
 use ILIAS\Questions\AnswerForm\Capabilities\Marking as MarkingInterface;
 use ILIAS\Questions\Response\Response;
+use ILIAS\Questions\AnswerForm;
 
 class Marking implements MarkingInterface
 {
+    private ?AnswerForm $answer_form = null;
+
     public function isConfigured(): bool
     {
         return false;
     }
 
+    public function withAnswerForm(AnswerForm $answer_form): self
+    {
+        $clone = clone $this;
+        $clone->answer_form = $answer_form;
+        return $clone;
+    }
+
     public function addAchievedPointsToResponse(Response $response): Response
     {
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php
new file mode 100644
index 000000000000..1d15759e7ed0
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Capabilities;
+
+use ILIAS\Questions\AnswerForm\Capabilities\Skills as SkillsInterface;
+use ILIAS\Questions\Question\Response;
+use ILIAS\Questions\AnswerForm;
+
+class Skills implements SkillsInterface
+{
+    private ?AnswerForm $answer_form = null;
+
+    public function isConfigured(): bool
+    {
+        return false;
+    }
+
+    public function withAnswerForm(AnswerForm $answer_form): self
+    {
+        $clone = clone $this;
+        $clone->answer_form = $answer_form;
+        return $clone;
+    }
+
+    public function getSkillPointsForResponse(Response $response): float
+    {
+
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definitions/ScoringIdentical.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definitions/ScoringIdentical.php
new file mode 100644
index 000000000000..b62d9cde4276
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definitions/ScoringIdentical.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Definitions;
+
+use ILIAS\Language\Language;
+
+enum ScoringIdentical: string
+{
+    case ScoreAll = 'score_all';
+    case OnlyScoreDistinct = 'score_distinct';
+
+    public static function buildOptionsList(Language $lng): array
+    {
+        return array_reduce(
+            self::cases(),
+            function (array $c, self $v) use ($lng): array {
+                $c[$v->value] = $lng->txt($v->value);
+                return $c;
+            },
+            []
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
index 816a6198b345..fcf016394416 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
@@ -21,8 +21,7 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze;
 
 use ILIAS\Questions\AnswerForm\Type as TypeInterface;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Capabilities\Feedback;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Capabilities\Marking;
+use ILIAS\Questions\AnswerForm\Capabilities\Capability;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Edit;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Participant;
 use ILIAS\Language\Language;
@@ -44,9 +43,12 @@ class Type implements TypeInterface
      */
     private array $gaps = [];
 
+    /**
+     * @param array<string, \ILIAS\Questions\AnswerForm\Capabilities\Capability> $available_capabilities
+     */
     public function __construct(
         private readonly Persistence $persistence,
-        private readonly Marking $marking,
+        private readonly array $available_capabilities,
         private readonly Edit $edit_view,
         private readonly Participant $participant_view
     ) {
@@ -80,19 +82,14 @@ public function getPersistence(): Persistence
         return $this->persistence;
     }
 
-    public function isMarkable(): bool
-    {
-        return true;
-    }
-
-    public function getMarking(): ?Marking
+    public function hasCapability(string $capability_class_name): bool
     {
-        return $this->marking->withAnswerForm($this);
+        return array_key_exists($capability_class_name, $this->available_capabilities);
     }
 
-    public function getFeedback(): ?Feedback
+    public function getCapability(string $capability_class_name): ?Capability
     {
-
+        return $this->available_capabilities[$capability_class_name]?->withAnswerForm($this);
     }
 
     public function getEditView(): Edit
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index aee9ea68c4dd..9b075e29f51b 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -21,7 +21,9 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
 
 use ILIAS\Questions\AnswerForm\Views\Edit as EditViewInterface;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Type;
+use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
 use ILIAS\Questions\Question\Persistence\UpdateQuery;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Language\Language;
@@ -85,6 +87,31 @@ private function buildBasicEditingForm(
         URLBuilder $url_builder,
         URLBuilderToken $step_token
     ): StandardForm {
-
+        $ff = $this->ui_factory->input()->field();
+        return $this->ui_factory->input()->container()->form()->standard(
+            $url_builder->withParameter($step_token, self::SET_GAP_TYPES)->buildURI()->__toString(),
+            [
+                'form' => $ff->section(
+                    [
+                        'cloze_text' => $ff->markdown(
+                            new \ilUIMarkdownPreviewGUI(),
+                            $this->lng->txt('cloze_text')
+                        )->withRequired(true),
+                        'matching_method' => $ff->select(
+                            $this->lng->txt('text_rating'),
+                            TextMatchingOptions::buildOptionsList($this->lng)
+                        )->withRequired(true),
+                        'min_autocomplete' => $ff->numeric($this->lng->txt('min_auto_complete')),
+                        'identical_responses' => $ff->select(
+                            $this->lng->txt('scoring_identical_responses'),
+                            ScoringIdentical::buildOptionsList($this->lng)
+                        )->withRequired(true),
+                        'max_chars' => $ff->numeric($this->lng->txt('cloze_fixed_textlength')),
+                        'enable_combinations' => $ff->checkbox($this->lng->txt('enable_combinations'))
+                    ],
+                    $this->lng->txt('set_basic_properties')
+                )
+            ]
+        );
     }
 }
diff --git a/components/ILIAS/Questions/src/Collector.php b/components/ILIAS/Questions/src/Collector.php
index 77c0be20da04..8208cdb88258 100644
--- a/components/ILIAS/Questions/src/Collector.php
+++ b/components/ILIAS/Questions/src/Collector.php
@@ -20,7 +20,6 @@
 
 namespace ILIAS\Questions;
 
-use ILIAS\Questions\AnswerForm\Type as AnswerFormType;
 use ILIAS\Questions\Question\Persistence\Repository;
 use ILIAS\Questions\Question\Question;
 
@@ -33,30 +32,14 @@ public function __construct(
     ) {
     }
 
-    public function having(string $property_class_name): self
+    public function withRequiredCapabilities(array $capability_class_names): self
     {
-        if (in_array($property_class_name, $this->required_capabilities)) {
-            return $this;
-        }
-
+        $this->checkCapabilities($capability_class_names);
         $clone = clone $this;
-        $clone->required_capabilities[] = $property_class_name;
-        $clone->available_answer_form_types = array_filter(
-            $clone->available_answer_form_types,
-            static fn(AnswerFormType $v): bool => $v->isGradable()
-        );
-
+        $clone->required_capabilities = $capability_class_names;
         return $clone;
     }
 
-    /**
-     * @return array<string, \ILIAS\Questions\AnswerForm\Type>
-     */
-    public function getAvailableAnswerTypes(): array
-    {
-        return $this->repository->getAvailableAnswerTypes();
-    }
-
     public function getQuestionsForId(int $id): Question|null
     {
         return $this->repository->getForQuestionId($id);
diff --git a/components/ILIAS/Questions/src/Presentation/Edit.php b/components/ILIAS/Questions/src/Presentation/Edit.php
index 04c5581e97b2..4e51fcb838b1 100644
--- a/components/ILIAS/Questions/src/Presentation/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Edit.php
@@ -20,13 +20,13 @@
 
 namespace ILIAS\Questions\Presentation;
 
-use ILIAS\Questions\AnswerForm\Capabilities\Capability;
 use ILIAS\Questions\AnswerForm\Type;
 use ILIAS\Questions\Question\Persistence\Repository;
-use ILIAS\Questions\Question\Views\Edit as QuestionEdit;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\URI;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
@@ -44,9 +44,10 @@
 class Edit
 {
     private const array QUERY_PARAMETER_NAME_SPACE = ['q'];
-    private const string ACTION_TOKEN_STRING = 'a';
-    private const string STEP_TOKEN_STRING = 's';
-    private const string ROW_ID_TOKEN_STRING = 'r';
+    private const string TOKEN_STRING_ACTION = 'a';
+    private const string TOKEN_STRING_STEP = 's';
+    private const string TOKEN_STRING_QUESTION_ID = 'q';
+    private const string TOKEN_STRING_PAGE_ID = 'p';
     private const string CMD_CREATE_QUESTION = 'create';
     private const string CMD_EDIT_QUESTION = 'edit';
     private const string CMD_CREATE_ACTION_FORM = 'create_af';
@@ -67,16 +68,17 @@ public function __construct(
         private readonly HTTP $http,
         private readonly \ilUIService $ui_services,
         private readonly DataFactory $data_factory,
+        private readonly UuidFactory $uuid_factory,
         private readonly Repository $questions_repository
     ) {
 
     }
 
-    public function withRequiredCapabilities(array $capabilities): self
+    public function withRequiredCapabilities(array $capability_class_names): self
     {
-        $this->checkCapabilities($capabilities);
+        $this->checkCapabilities($capability_class_names);
         $clone = clone $this;
-        $clone->required_capabilities = $capabilities;
+        $clone->required_capabilities = $capability_class_names;
         return $clone;
     }
 
@@ -98,18 +100,12 @@ public function view(
         \ilToolbarGUI $toolbar,
         URI $base_uri
     ): array {
-        [$url_builder, $action_token, $step_token, $row_id_token] = (new URLBuilder($base_uri))
-            ->acquireParameters(
-                self::QUERY_PARAMETER_NAME_SPACE,
-                self::ACTION_TOKEN_STRING,
-                self::STEP_TOKEN_STRING,
-                self::ROW_ID_TOKEN_STRING
-            );
-
-        return match($this->retrieveAction($action_token)) {
-            self::CMD_CREATE_QUESTION => $this->createQuestion($url_builder, $action_token, $step_token, $row_id_token),
-            self::CMD_EDIT_QUESTION => $this->editQuestion($url_builder, $action_token, $step_token, $row_id_token),
-            default => $this->showTable($toolbar, $url_builder, $action_token, $row_id_token)
+        [$url_builder, $action_token, $step_token, $question_id_token, $page_id_token] =
+            $this->acquireURLBuilderAndParameters($base_uri);
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_CREATE_QUESTION => $this->createQuestion($url_builder, $action_token, $step_token, $question_id_token),
+            self::CMD_EDIT_QUESTION => $this->editQuestion($url_builder, $action_token, $step_token, $question_id_token, $page_id_token),
+            default => $this->showTable($toolbar, $url_builder, $action_token, $question_id_token)
         };
     }
 
@@ -117,32 +113,22 @@ public function forwardPageCmds(
         \ilGlobalTemplateInterface $tpl,
         URI $base_uri,
     ): void {
-        [$url_builder, $action_token, $row_id_token] = (new URLBuilder($base_uri))
-            ->acquireParameters(
-                self::QUERY_PARAMETER_NAME_SPACE,
-                self::ACTION_TOKEN_STRING,
-                self::ROW_ID_TOKEN_STRING
-            );
+        [$url_builder, $action_token, $step, $question_id_token, $page_id_token] =
+            $this->acquireURLBuilderAndParameters($base_uri);
 
-        $this->initializeEditMode($url_builder, $action_token, $row_id_token);
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
 
-        $question_id = $this->http->wrapper()->query()->retrieve(
-            $row_id_token->getName(),
-            $this->refinery->kindlyTo()->string()
-        );
+        $question_id = $this->retrieveQuestionId($question_id_token);
 
-        $page_id = $this->http->wrapper()->query()->retrieve(
-            QuestionEdit::PAGE_ID_PARAM_FOR_EDITOR,
-            $this->refinery->kindlyTo()->int()
-        );
+        $page_id = $this->retrievePageId($page_id_token);
 
-        $this->setParametersForQuestionCmds($row_id_token, $question_id, $page_id);
+        $this->setParametersForQuestionCmds($question_id_token, $question_id->toString(), $page_id_token, $page_id);
 
         $tpl->setContent(
             $this->ctrl->forwardCommand(
                 new \QstsQuestionPageGUI(
                     $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION)
-                        ->withParameter($row_id_token, $question_id)
+                        ->withParameter($question_id_token, $question_id->toString())
                         ->buildURI(),
                     $page_id
                 )
@@ -153,27 +139,19 @@ public function forwardPageCmds(
     public function createAnswerForm(
         URI $base_uri
     ): array {
-        [$url_builder, $action_token] = (new URLBuilder($base_uri))
-            ->acquireParameters(
-                self::QUERY_PARAMETER_NAME_SPACE,
-                self::ACTION_TOKEN_STRING
-            );
-        return match($this->retrieveAction($action_token)) {
-            self::CMD_CREATE_ACTION_FORM => $this->processCreateAnswerForm($url_builder, $action_token),
-            default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
+        [$url_builder, $action_token, $step_token, $question_id_token, $page_id_token] = $this->acquireURLBuilderAndParameters($base_uri);
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_CREATE_ACTION_FORM => $this->processCreateAnswerForm($url_builder, $action_token, $step_token, $question_id_token, $page_id_token),
+            default => [$this->buildCreateAnswerForm($url_builder, $action_token, $question_id_token, $page_id_token)]
         };
     }
 
     public function editAnswerForm(
         URI $base_uri
     ): array {
-        [$url_builder, $action_token] = (new URLBuilder($base_uri))
-            ->acquireParameters(
-                self::QUERY_PARAMETER_NAME_SPACE,
-                self::ACTION_TOKEN_STRING
-            );
-        return match($this->retrieveAction($action_token)) {
-            self::CMD_CREATE_ACTION_FORM => [$this->retrieve($url_builder, $action_token)],
+        [$url_builder, $action_token] = $this->acquireURLBuilderAndParameters($base_uri);
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_EDIT_ACTION_FORM => [$this->processCreateAnswerForm($url_builder, $action_token)],
             default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
         };
     }
@@ -182,9 +160,9 @@ private function createQuestion(
         URLBuilder $url_builder,
         URLBuilderToken $action_token,
         URLBuilderToken $step_token,
-        URLBuilderToken $row_id_token
+        URLBuilderToken $question_id_token
     ): array {
-        $this->initializeEditMode($url_builder, $action_token, $row_id_token);
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
 
         $create = (new QuestionImplementation())->getEditView(
             $this->lng,
@@ -197,7 +175,7 @@ private function createQuestion(
         )->create(
             $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION),
             $step_token,
-            $this->retrieveAction($action_token)
+            $this->retrieveStringValueForToken($step_token)
         );
 
         if (is_array($create)) {
@@ -206,7 +184,7 @@ private function createQuestion(
 
         $this->questions_repository->store($create);
         return $this->buildEditStartView(
-            $url_builder->withParameter($row_id_token, $create->getId()),
+            $url_builder->withParameter($question_id_token, $create->getId()),
             $step_token,
             $create
         );
@@ -217,16 +195,14 @@ private function editQuestion(
         URLBuilder $url_builder,
         URLBuilderToken $action_token,
         URLBuilderToken $step_token,
-        URLBuilderToken $row_id_token
+        URLBuilderToken $question_id_token,
+        URLBuilderToken $page_id_token
     ): array {
-        $this->initializeEditMode($url_builder, $action_token, $row_id_token);
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
 
-        $question_id = $this->http->wrapper()->query()->retrieve(
-            $row_id_token->getName(),
-            $this->refinery->kindlyTo()->string()
-        );
+        $question_id = $this->retrieveQuestionId($question_id_token);
 
-        $url_builder_with_row_id = $url_builder->withParameter($row_id_token, $question_id);
+        $url_builder_with_row_id = $url_builder->withParameter($question_id_token, $question_id->toString());
 
         $edit = $this->questions_repository->getForQuestionId($question_id)->getEditView(
             $this->lng,
@@ -239,7 +215,8 @@ private function editQuestion(
         )->edit(
             $url_builder_with_row_id->withParameter($action_token, self::CMD_EDIT_QUESTION),
             $step_token,
-            $this->retrieveAction($action_token)
+            $page_id_token,
+            $this->retrieveStringValueForToken($step_token)
         );
 
         if (is_array($edit)) {
@@ -258,7 +235,7 @@ private function showTable(
         \ilToolbarGUI $toolbar,
         URLBuilder $url_builder,
         URLBuilderToken $action_token,
-        URLBuilderToken $row_id_token
+        URLBuilderToken $question_id_token
     ): array {
         $toolbar->addComponent(
             $this->ui_factory->button()->standard(
@@ -274,7 +251,7 @@ private function showTable(
             $this->questions_repository,
             $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
             $action_token,
-            $row_id_token
+            $question_id_token
         );
         return [
             $table->getFilter($url_builder->buildURI()->__toString()),
@@ -285,26 +262,76 @@ private function showTable(
 
     private function processCreateAnswerForm(
         URLBuilder $url_builder,
-        URLBuilderToken $action_token
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $question_id_token,
+        URLBuilderToken $page_id_token
     ): array {
-        $form = $this->buildCreateAnswerForm($url_builder, $action_token)
-            ->withRequest($this->http->request());
+        $form = $this->buildCreateAnswerForm(
+            $url_builder,
+            $action_token,
+            $question_id_token,
+            $page_id_token
+        )->withRequest($this->http->request());
+
         $data = $form->getData();
         if ($data === null || $data['form_type'] === null) {
             return [$form];
         }
-        return $data['form_type']->getEditView()->create();
+        return $data['form_type']->getEditView()->create(
+            $url_builder,
+            $step_token,
+            $this->retrieveStringValueForToken($step_token)
+        );
+    }
+
+    private function acquireURLBuilderAndParameters(URI $base_uri): array
+    {
+        return (new URLBuilder($base_uri))
+            ->acquireParameters(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::TOKEN_STRING_ACTION,
+                self::TOKEN_STRING_STEP,
+                self::TOKEN_STRING_QUESTION_ID,
+                self::TOKEN_STRING_PAGE_ID
+            );
     }
 
-    private function retrieveAction(
-        URLBuilderToken $action_token
+    private function retrieveStringValueForToken(
+        URLBuilderToken $token
     ): string {
         return $this->http->wrapper()->query()->retrieve(
-            $action_token->getName(),
+            $token->getName(),
             $this->buildActionTrafo()
         );
     }
 
+    private function retrieveQuestionId(
+        URLBuilderToken $question_id_token
+    ): ?Uuid {
+        return $this->http->wrapper()->query()->retrieve(
+            $question_id_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->custom()->transformation(
+                    fn($v): Uuid => $this->uuid_factory->fromString($v)
+                ),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
+    public function retrievePageId(
+        URLBuilderToken $page_id_token
+    ): ?int {
+        return $this->http->wrapper()->query()->retrieve(
+            $page_id_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->kindlyTo()->int(),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
     private function buildActionTrafo(): Transformation
     {
         return $this->refinery->byTrying([
@@ -316,7 +343,7 @@ private function buildActionTrafo(): Transformation
     private function initializeEditMode(
         URLBuilder $url_builder,
         URLBuilderToken $action_token,
-        URLBuilderToken $row_id_token
+        URLBuilderToken $question_id_token
     ): void {
         $this->global_screen->tool()->context()->current()->addAdditionalData(
             LayoutProvider::MODE_ENABLED,
@@ -324,7 +351,7 @@ private function initializeEditMode(
         );
         $this->global_screen->tool()->context()->current()->addAdditionalData(
             LayoutProvider::QUESTIONLIST_ENTRY,
-            $this->buildQuestionListSlate($url_builder, $action_token, $row_id_token)
+            $this->buildQuestionListSlate($url_builder, $action_token, $question_id_token)
         );
         $this->global_screen->tool()->context()->current()->addAdditionalData(
             LayoutProvider::URL_CLOSE_MODE_INFO,
@@ -337,28 +364,19 @@ private function initializeEditMode(
     }
 
     private function setParametersForQuestionCmds(
-        URLBuilderToken $row_id_token,
+        URLBuilderToken $question_id_token,
         string $question_id,
+        URLBuilderToken $page_id_token,
         int $page_id
     ): void {
         $this->ctrl->setParameterByClass(
             \QstsQuestionPageGUI::class,
-            $row_id_token->getName(),
+            $question_id_token->getName(),
             $question_id
         );
         $this->ctrl->setParameterByClass(
             \QstsQuestionPageGUI::class,
-            QuestionEdit::PAGE_ID_PARAM_FOR_EDITOR,
-            $page_id
-        );
-        $this->ctrl->setParameterByClass(
-            $this->ctrl->getCmdClass(),
-            $row_id_token->getName(),
-            $question_id
-        );
-        $this->ctrl->setParameterByClass(
-            $this->ctrl->getCmdClass(),
-            QuestionEdit::PAGE_ID_PARAM_FOR_EDITOR,
+            $page_id_token->getName(),
             $page_id
         );
     }
@@ -366,7 +384,7 @@ private function setParametersForQuestionCmds(
     private function buildQuestionListSlate(
         URLBuilder $url_builder,
         URLBuilderToken $action_token,
-        URLBuilderToken $row_id_token
+        URLBuilderToken $question_id_token
     ): LegacySlate {
         return $this->ui_factory->mainControls()->slate()->legacy(
             $this->lng->txt('mainbar_button_label_questionlist'),
@@ -376,7 +394,7 @@ private function buildQuestionListSlate(
                     $this->ui_factory->panel()->secondary()->listing(
                         $this->lng->txt('mainbar_button_label_questionlist'),
                         [
-                            $this->buildItemGroupForQuestionListSlate($url_builder, $action_token, $row_id_token)
+                            $this->buildItemGroupForQuestionListSlate($url_builder, $action_token, $question_id_token)
                         ]
                     )
                 )
@@ -387,7 +405,7 @@ private function buildQuestionListSlate(
     private function buildItemGroupForQuestionListSlate(
         URLBuilder $url_builder,
         URLBuilderToken $action_token,
-        URLBuilderToken $row_id_token
+        URLBuilderToken $question_id_token
     ): ItemGroup {
         return $this->ui_factory->item()->group(
             '',
@@ -396,7 +414,7 @@ private function buildItemGroupForQuestionListSlate(
                     $v->toEditLink(
                         $this->ui_factory->link(),
                         $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
-                        $row_id_token
+                        $question_id_token
                     )
                 ),
                 iterator_to_array($this->questions_repository->getAllQuestions())
@@ -426,11 +444,17 @@ private function buildEditStartView(
 
     private function buildCreateAnswerForm(
         URLBuilder $url_builder,
-        URLBuilderToken $action_token
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token,
+        URLBuilderToken $page_id_token
     ): StandardForm {
         $if = $this->ui_factory->input();
         return $if->container()->form()->standard(
-            $url_builder->withParameter($action_token, self::CMD_CREATE_ACTION_FORM)->buildURI()->__toString(),
+            $url_builder
+                ->withParameter($action_token, self::CMD_CREATE_ACTION_FORM)
+                ->withParameter($question_id_token, $this->retrieveQuestionId($question_id_token)->toString())
+                ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
+                ->buildURI()->__toString(),
             [
                 'form_type' => $if->field()->section(
                     [
@@ -459,7 +483,7 @@ function (array $c, Type $v): array {
     private function checkCapabilities(array $capabilities): void
     {
         foreach ($capabilities as $capability) {
-            if (!($capability instanceof Capability)) {
+            if (!$this->questions_repository->capabilityExists($capability)) {
                 throw new \InvalidArgumentException('All provided capabilities must implement ILIAS\Questions\AnswerForm\Capabilities\Capability.');
             }
         }
diff --git a/components/ILIAS/Questions/src/Question/Lifecycle.php b/components/ILIAS/Questions/src/Question/Definitions/Lifecycle.php
similarity index 94%
rename from components/ILIAS/Questions/src/Question/Lifecycle.php
rename to components/ILIAS/Questions/src/Question/Definitions/Lifecycle.php
index ef6100a67196..43184f62a9f7 100644
--- a/components/ILIAS/Questions/src/Question/Lifecycle.php
+++ b/components/ILIAS/Questions/src/Question/Definitions/Lifecycle.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question;
+namespace ILIAS\Questions\Question\Definitions;
 
 enum Lifecycle: string
 {
diff --git a/components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php b/components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php
new file mode 100644
index 000000000000..004f8903c66a
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Definitions;
+
+use ILIAS\Language\Language;
+
+enum TextMatchingOptions: string
+{
+    case CaseInsensitive = 'cloze_textgap_case_insensitive';
+    case CaseSensitive = 'cloze_textgap_case_sensitive';
+    case Levenstein1 = '1';
+    case Levenstein2 = '2';
+    case Levenstein3 = '3';
+    case Levenstein4 = '4';
+    case Levenstein5 = '5';
+
+    public function getLabel(Language $lng): string
+    {
+        return match ($this) {
+            self::CaseInsensitive, self::CaseSensitive => $lng->txt($this->value),
+            default => sprintf($lng->txt('cloze_textgap_levenshtein_of'), $this->value)
+        };
+    }
+
+    public static function buildOptionsList(Language $lng): array
+    {
+        return array_reduce(
+            self::cases(),
+            function (array $c, self $v) use ($lng): array {
+                $c[$v->value] = $v->getLabel($lng);
+                return $c;
+            },
+            []
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Repository.php b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
index db5cc4be9e42..76d23f8bd54d 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
@@ -22,7 +22,7 @@
 
 use ILIAS\Questions\AnswerForm\Type;
 use ILIAS\Questions\AnswerFormTypes\Factory as FormTypesFactory;
-use ILIAS\Questions\Question\Lifecycle;
+use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
@@ -86,13 +86,13 @@ public function getAllQuestions(): \Generator
         yield from $this->getForWhereClause('');
     }
 
-    public function getForQuestionId(string $question_id): ?QuestionImplementation
+    public function getForQuestionId(Uuid $question_id): ?QuestionImplementation
     {
         if ($question_id < 1) {
             return new QuestionImplementation();
         }
 
-        return $this->getForWhereClause("q.id='{$question_id}'")->current();
+        return $this->getForWhereClause("q.id='{$question_id->toString()}'")->current();
     }
 
     /**
@@ -186,6 +186,7 @@ private function storeQuestion(QuestionImplementation $question): Uuid
                 ]
             ]
         );
+        return $question->getId();
     }
 
     private function buildAvailableUuid(): Uuid
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index b9f1957a99bc..25a623087044 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -21,7 +21,7 @@
 namespace ILIAS\Questions\Question;
 
 use ILIAS\Questions\AnswerForm\Form;
-use ILIAS\Questions\Question\Lifecycle;
+use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index 34a96d6ca774..c4402252b84f 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -22,7 +22,7 @@
 
 use ILIAS\Questions\Question\Question;
 use ILIAS\Questions\Question\QuestionImplementation;
-use ILIAS\Questions\Question\Lifecycle;
+use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
@@ -38,8 +38,6 @@ class Edit
 {
     private const string CMD_SAVE_QUESTION = 'sq';
 
-    public const string PAGE_ID_PARAM_FOR_EDITOR = 'p_id';
-
     public function __construct(
         private readonly Language $lng,
         private readonly \ilObjUser $current_user,
@@ -67,13 +65,14 @@ public function create(
     public function edit(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
+        URLBuilderToken $page_id_token,
         string $step
     ): array|Question {
         return match ($step) {
             self::CMD_SAVE_QUESTION => $this->onBasicPropertiesFormSubmission($url_builder, $step_token),
             default => [
                 $this->buildBasicPropertiesForm($url_builder, $step_token),
-                $this->buildPreviewPanel($url_builder, $step_token)
+                $this->buildPreviewPanel($url_builder, $page_id_token)
             ]
         };
     }
@@ -141,26 +140,25 @@ function (array $c, Lifecycle $v): array {
     private function buildAddBasicPropertiesToQuestionTrafo(): Transformation
     {
         return $this->refinery->custom()->transformation(
-            static fn(array $vs): QuestionImplementation => new QuestionImplementation(
-                null,
-                null,
+            fn(array $vs): QuestionImplementation => new QuestionImplementation(
+                $this->question?->getId(),
+                $this->question?->getPageId(),
                 $vs['title'],
                 $vs['author'],
                 Lifecycle::tryFrom($vs['lifecycle']) ?? Lifecycle::Draft,
-                $vs['remarks']
+                $vs['remarks'],
+                $this->question?->getOriginalId(),
+                $this->question?->getLastUpdate(),
+                $this->question?->getCreated(),
+                $this->question?->getAnswerForms() ?? []
             )
         );
     }
 
     private function buildPreviewPanel(
         URLBuilder $url_builder,
-        URLBuilderToken $step_token
+        URLBuilderToken $page_id_token
     ): StandardPanel {
-        $this->ctrl->setParameterByClass(
-            \QstsQuestionPageGUI::class,
-            self::PAGE_ID_PARAM_FOR_EDITOR,
-            $this->question->getPageId()
-        );
         return $this->ui_factory->panel()->standard(
             $this->lng->txt('preview'),
             $this->ui_factory->legacy()->content($this->question->getTitle())
@@ -173,7 +171,8 @@ private function buildPreviewPanel(
                             $this->data_factory->uri(
                                 ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(\QstsQuestionPageGUI::class, 'edit')
                             )
-                        )->buildURI()->__toString()
+                        )->withParameter($page_id_token, (string) $this->question->getPageId())
+                        ->buildURI()->__toString()
                 )
             ])
         );

From fac71fc071ddfd8f913e49081002bac60e2d5bd4 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 29 Oct 2025 11:40:53 +0100
Subject: [PATCH 081/141] Test: Implementing Questions

---
 .../class.ilObjQuestionsGUI.php               |   3 +-
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  42 ++---
 .../src/AnswerFormTypes/Cloze/Type.php        |  40 ++++-
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  |  36 +++--
 .../Questions/src/AnswerFormTypes/Factory.php |  15 +-
 .../ILIAS/Questions/src/Presentation/Edit.php | 145 +++++++++++++-----
 .../src/Presentation/QuestionsTable.php       |   4 +-
 .../src/Question/Persistence/Repository.php   |  24 +--
 .../Questions/src/Question/Views/Edit.php     |   6 +-
 .../ILIAS/Test/classes/class.ilObjTestGUI.php |   1 +
 .../classes/class.ilObjQuestionPoolGUI.php    |   1 +
 lang/ilias_de.lang                            |  27 +++-
 lang/ilias_en.lang                            |  27 +++-
 13 files changed, 250 insertions(+), 121 deletions(-)

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
index d1f7d376fb60..ee562db4f82d 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -52,6 +52,7 @@ public function __construct(
         parent::__construct($a_data, $a_id, $a_call_by_reference, false);
 
         $this->lng->loadLanguageModule('assessment');
+        $this->lng->loadLanguageModule('qsts');
 
         if (!$rbacsystem->checkAccess('read', $this->object->getRefId())) {
             $this->ilias->raiseError($this->lng->txt("msg_no_perm_read_assf"), $this->ilias->error_obj->WARNING);
@@ -108,7 +109,7 @@ public function getAdminTabs(): void
 
     protected function getTabs(): void
     {
-        if ($this->rbac_system->checkAccess('visible,read', $this->object->getRefId())) {
+        if ($this->rbac_system->checkAccess('read', $this->object->getRefId())) {
             $this->tabs_gui->addTab(
                 'questions',
                 $this->lng->txt('questions'),
diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 9a15908a8281..d57d426088cc 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -46,6 +46,27 @@ public static function dic(): self
     protected static function buildDIC(ILIASContainer $DIC): self
     {
         $dic = new self();
+        $dic[AnswerFormTypesFactory::class] = static fn($c): AnswerFormTypesFactory =>
+            new AnswerFormTypesFactory([
+                new Cloze\Type(
+                    new Cloze\Persistence(
+                        new TableNameSpaceCore('cloze')
+                    ),
+                    [
+                        Cloze\Capabilities\Marking::class => new Cloze\Capabilities\Marking(),
+                        Cloze\Capabilities\Feedback::class => new Cloze\Capabilities\Feedback(),
+                        Cloze\Capabilities\Skills::class => new Cloze\Capabilities\Skills()
+                    ],
+                    new Cloze\Views\Edit(
+                        $DIC['lng'],
+                        $DIC['ui.factory'],
+                        $DIC['refinery'],
+                        $DIC['http']->request(),
+                        new DataFactory()
+                    ),
+                    new Cloze\Views\Participant()
+                )
+            ]);
         $dic[Edit::class] = static fn($c): Edit =>
             new Edit(
                 $DIC['lng'],
@@ -59,29 +80,10 @@ protected static function buildDIC(ILIASContainer $DIC): self
                 $DIC->uiService(),
                 new DataFactory(),
                 new UuidFactory(),
+                $c[AnswerFormTypesFactory::class],
                 new QuestionsRepository(
                     $DIC['ilDB'],
                     new UuidFactory(),
-                    new AnswerFormTypesFactory([
-                        new Cloze\Type(
-                            new Cloze\Persistence(
-                                new TableNameSpaceCore('cloze')
-                            ),
-                            [
-                                Cloze\Capabilities\Marking::class => new Cloze\Capabilities\Marking(),
-                                Cloze\Capabilities\Feedback::class => new Cloze\Capabilities\Feedback(),
-                                Cloze\Capabilities\Skills::class => new Cloze\Capabilities\Skills()
-                            ],
-                            new Cloze\Views\Edit(
-                                $DIC['lng'],
-                                $DIC['ui.factory'],
-                                $DIC['refinery'],
-                                $DIC['http']->request(),
-                                new DataFactory()
-                            ),
-                            new Cloze\Views\Participant()
-                        )
-                    ])
                 )
             );
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
index fcf016394416..d9a0d42345c8 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
@@ -29,7 +29,9 @@
 class Type implements TypeInterface
 {
     private string $id;
-    private float $available_points = 0.0;
+    private ?float $available_points = null;
+    private int $image_size = 150;
+    private bool $shuffle_answer_options = false;
     private string $cloze_text = '';
     private string $cloze_text_legacy = '';
     private bool $case_sensitive = false;
@@ -57,21 +59,45 @@ public function __construct(
     public function withData(
         string $id,
         ?float $available_points,
-        ?int $image_size,
-        ?bool $shuffle_answer_options,
+        int $image_size,
+        bool $shuffle_answer_options,
         string $additional_text,
         string $additional_text_legacy,
         ?array $data
     ): static {
         $this->id = $id;
-        if ($available_points !== null) {
-            $this->available_points = $available_points;
-        }
-
+        $this->available_points = $available_points;
+        $this->image_size = $image_size;
+        $this->shuffle_answer_options = $shuffle_answer_options;
         $this->cloze_text = $additional_text;
         $this->cloze_text_legacy = $additional_text_legacy;
     }
 
+    public function getAvailablePoints(): ?float
+    {
+        return $this->available_points;
+    }
+
+    public function getImageSize(): int
+    {
+        return $this->image_size;
+    }
+
+    public function getShuffleAnswerOptions(): bool
+    {
+        return $this->shuffle_answer_options;
+    }
+
+    public function getClozeText(): string
+    {
+        return $this->cloze_text;
+    }
+
+    public function getClozeTextLegacy(): string
+    {
+        return $this->cloze_text_legacy;
+    }
+
     public function getLabel(Language $lng): string
     {
         return $lng->txt('assClozeTest');
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 9b075e29f51b..7466f023025d 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -55,7 +55,7 @@ public function create(
         string $step
     ): array|UpdateQuery {
         return match($step) {
-            self::SET_GAP_TYPES => $this->setGapTypes($url_builder, $step_token),
+            self::SET_GAP_TYPES => [$this->processBasicEditingForm($url_builder, $step_token)],
             default => [$this->buildBasicEditingForm($url_builder, $step_token)]
         };
     }
@@ -96,22 +96,40 @@ private function buildBasicEditingForm(
                         'cloze_text' => $ff->markdown(
                             new \ilUIMarkdownPreviewGUI(),
                             $this->lng->txt('cloze_text')
-                        )->withRequired(true),
+                        )->withRequired(true)
+                        ->withValue($this->type->getClozeText()),
                         'matching_method' => $ff->select(
                             $this->lng->txt('text_rating'),
                             TextMatchingOptions::buildOptionsList($this->lng)
-                        )->withRequired(true),
-                        'min_autocomplete' => $ff->numeric($this->lng->txt('min_auto_complete')),
+                        )->withRequired(true)
+                        ->withValue($this->type->getMatchingMethod()->value),
+                        'min_autocomplete' => $ff->numeric($this->lng->txt('min_auto_complete'))
+                            ->withRequired(true)
+                            ->withValue($this->type->getAutocompleteLength()),
                         'identical_responses' => $ff->select(
-                            $this->lng->txt('scoring_identical_responses'),
+                            $this->lng->txt('scoring_of_identical_responses'),
                             ScoringIdentical::buildOptionsList($this->lng)
-                        )->withRequired(true),
+                        )->withRequired(true)
+                        ->withValue($this->type->getScoringIdentical()->value),
                         'max_chars' => $ff->numeric($this->lng->txt('cloze_fixed_textlength')),
-                        'enable_combinations' => $ff->checkbox($this->lng->txt('enable_combinations'))
+                        'enable_combinations' => $ff->checkbox($this->lng->txt('cloze_enable_combinations'))
                     ],
-                    $this->lng->txt('set_basic_properties')
+                    $this->lng->txt('create_answer_form')
                 )
             ]
-        );
+        )->withSubmitLabel($this->lng->txt('next'));
+    }
+
+    private function processBasicEditingForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): StandardForm {
+        $form = $this->buildBasicEditingForm($url_builder, $step_token)->withRequest($this->request);
+        $data = $form->getData();
+        if ($data === null) {
+            return $form;
+        }
+
+        $this->buildGapTypesForm($url_builder, $step_token, $data);
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Factory.php
index 5cf60fd2de56..4dc0b6dfc17a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Factory.php
@@ -37,8 +37,8 @@ public function __construct(
     ) {
         $this->available_answer_form_types = array_reduce(
             $available_answer_form_types,
-            static function (array $c, Type $v) {
-                $c[$v::class] = $v;
+            function (array $c, Type $v) {
+                $c[$this->getHashedClass($v::class)] = $v;
                 return $c;
             },
             []
@@ -48,13 +48,18 @@ static function (array $c, Type $v) {
     /**
      * @return array<string, \ILIAS\Questions\AnswerForm\Type>
      */
-    public function getAvailableAnswerTypes(): array
+    public function getAvailableAnswerFormTypes(): array
     {
         return $this->available_answer_form_types;
     }
 
-    public function getAnswerFormTypeByClass(string $class): ?Type
+    public function getHashedClass(string $class): string
     {
-        return $this->available_answer_form_types[$class] ?? null;
+        return md5($class);
+    }
+
+    public function getAnswerFormTypeByClassHash(string $class_hash): ?Type
+    {
+        return $this->available_answer_form_types[$class_hash] ?? null;
     }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Edit.php b/components/ILIAS/Questions/src/Presentation/Edit.php
index 4e51fcb838b1..d1a34eb596f6 100644
--- a/components/ILIAS/Questions/src/Presentation/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Edit.php
@@ -21,6 +21,7 @@
 namespace ILIAS\Questions\Presentation;
 
 use ILIAS\Questions\AnswerForm\Type;
+use ILIAS\Questions\AnswerFormTypes\Factory as AnswerFormTypesFactory;
 use ILIAS\Questions\Question\Persistence\Repository;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\Factory as DataFactory;
@@ -48,10 +49,11 @@ class Edit
     private const string TOKEN_STRING_STEP = 's';
     private const string TOKEN_STRING_QUESTION_ID = 'q';
     private const string TOKEN_STRING_PAGE_ID = 'p';
+    private const string TOKEN_TYPE_HASH = 't';
     private const string CMD_CREATE_QUESTION = 'create';
     private const string CMD_EDIT_QUESTION = 'edit';
-    private const string CMD_CREATE_ACTION_FORM = 'create_af';
-    private const string CMD_EDIT_ACTION_FORM = 'edit_af';
+    private const string CMD_CREATE_ANSWER_FORM = 'create_af';
+    private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
 
     private array $required_capabilities = [];
     private Editability $editability = Editability::Full;
@@ -69,6 +71,7 @@ public function __construct(
         private readonly \ilUIService $ui_services,
         private readonly DataFactory $data_factory,
         private readonly UuidFactory $uuid_factory,
+        private readonly AnswerFormTypesFactory $answer_form_types_factory,
         private readonly Repository $questions_repository
     ) {
 
@@ -100,12 +103,34 @@ public function view(
         \ilToolbarGUI $toolbar,
         URI $base_uri
     ): array {
-        [$url_builder, $action_token, $step_token, $question_id_token, $page_id_token] =
-            $this->acquireURLBuilderAndParameters($base_uri);
+        [
+            $url_builder,
+            $action_token,
+            $step_token,
+            $question_id_token,
+            $page_id_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
         return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_CREATE_QUESTION => $this->createQuestion($url_builder, $action_token, $step_token, $question_id_token),
-            self::CMD_EDIT_QUESTION => $this->editQuestion($url_builder, $action_token, $step_token, $question_id_token, $page_id_token),
-            default => $this->showTable($toolbar, $url_builder, $action_token, $question_id_token)
+            self::CMD_CREATE_QUESTION => $this->createQuestion(
+                $url_builder,
+                $action_token,
+                $step_token,
+                $question_id_token,
+                $page_id_token
+            ),
+            self::CMD_EDIT_QUESTION => $this->editQuestion(
+                $url_builder,
+                $action_token,
+                $step_token,
+                $question_id_token,
+                $page_id_token
+            ),
+            default => $this->showTable(
+                $toolbar,
+                $url_builder,
+                $action_token,
+                $question_id_token
+            )
         };
     }
 
@@ -113,15 +138,17 @@ public function forwardPageCmds(
         \ilGlobalTemplateInterface $tpl,
         URI $base_uri,
     ): void {
-        [$url_builder, $action_token, $step, $question_id_token, $page_id_token] =
-            $this->acquireURLBuilderAndParameters($base_uri);
+        [
+            0 => $url_builder,
+            1 => $action_token,
+            3 => $question_id_token,
+            4 => $page_id_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
 
         $this->initializeEditMode($url_builder, $action_token, $question_id_token);
 
         $question_id = $this->retrieveQuestionId($question_id_token);
-
         $page_id = $this->retrievePageId($page_id_token);
-
         $this->setParametersForQuestionCmds($question_id_token, $question_id->toString(), $page_id_token, $page_id);
 
         $tpl->setContent(
@@ -139,10 +166,39 @@ public function forwardPageCmds(
     public function createAnswerForm(
         URI $base_uri
     ): array {
-        [$url_builder, $action_token, $step_token, $question_id_token, $page_id_token] = $this->acquireURLBuilderAndParameters($base_uri);
+        [
+            $url_builder,
+            $action_token,
+            $step_token,
+            $question_id_token,
+            $page_id_token,
+            $type_hash_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+        $url_builder_with_params = $url_builder
+                ->withParameter($question_id_token, $this->retrieveQuestionId($question_id_token)->toString())
+                ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
+                ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
+
+        $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
+        if ($answer_form_type_class_hash !== '') {
+            return $this->forwardCreateAnswerFormCmd(
+                $this->answer_form_types_factory->getAnswerFormTypeByClassHash($answer_form_type_class_hash),
+                $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
+                $step_token
+            );
+        }
+
         return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_CREATE_ACTION_FORM => $this->processCreateAnswerForm($url_builder, $action_token, $step_token, $question_id_token, $page_id_token),
-            default => [$this->buildCreateAnswerForm($url_builder, $action_token, $question_id_token, $page_id_token)]
+            self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
+                $url_builder_with_params,
+                $action_token,
+                $step_token,
+                $type_hash_token
+            ),
+            default => [$this->buildCreateAnswerForm(
+                $url_builder_with_params,
+                $action_token
+            )]
         };
     }
 
@@ -151,7 +207,7 @@ public function editAnswerForm(
     ): array {
         [$url_builder, $action_token] = $this->acquireURLBuilderAndParameters($base_uri);
         return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_EDIT_ACTION_FORM => [$this->processCreateAnswerForm($url_builder, $action_token)],
+            self::CMD_EDIT_ANSWER_FORM => [$this->processCreateAnswerForm($url_builder, $action_token)],
             default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
         };
     }
@@ -160,7 +216,8 @@ private function createQuestion(
         URLBuilder $url_builder,
         URLBuilderToken $action_token,
         URLBuilderToken $step_token,
-        URLBuilderToken $question_id_token
+        URLBuilderToken $question_id_token,
+        URLBuilderToken $page_id_token
     ): array {
         $this->initializeEditMode($url_builder, $action_token, $question_id_token);
 
@@ -186,6 +243,7 @@ private function createQuestion(
         return $this->buildEditStartView(
             $url_builder->withParameter($question_id_token, $create->getId()),
             $step_token,
+            $page_id_token,
             $create
         );
 
@@ -227,6 +285,7 @@ private function editQuestion(
         return $this->buildEditStartView(
             $url_builder_with_row_id,
             $step_token,
+            $page_id_token,
             $edit
         );
     }
@@ -248,6 +307,7 @@ private function showTable(
             $this->ui_factory,
             $this->ui_services,
             $this->lng,
+            $this->answer_form_types_factory,
             $this->questions_repository,
             $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
             $action_token,
@@ -264,21 +324,32 @@ private function processCreateAnswerForm(
         URLBuilder $url_builder,
         URLBuilderToken $action_token,
         URLBuilderToken $step_token,
-        URLBuilderToken $question_id_token,
-        URLBuilderToken $page_id_token
+        URLBuilderToken $type_hash_token
     ): array {
         $form = $this->buildCreateAnswerForm(
             $url_builder,
-            $action_token,
-            $question_id_token,
-            $page_id_token
+            $action_token
         )->withRequest($this->http->request());
 
         $data = $form->getData();
         if ($data === null || $data['form_type'] === null) {
             return [$form];
         }
-        return $data['form_type']->getEditView()->create(
+
+        return $this->forwardCreateAnswerFormCmd(
+            $data['form_type'],
+            $url_builder->withParameter($type_hash_token, $this->answer_form_types_factory->getHashedClass($data['form_type']::class)),
+            $action_token,
+            $step_token
+        );
+    }
+
+    private function forwardCreateAnswerFormCmd(
+        Type $type,
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): array {
+        return $type->getEditView()->create(
             $url_builder,
             $step_token,
             $this->retrieveStringValueForToken($step_token)
@@ -293,7 +364,8 @@ private function acquireURLBuilderAndParameters(URI $base_uri): array
                 self::TOKEN_STRING_ACTION,
                 self::TOKEN_STRING_STEP,
                 self::TOKEN_STRING_QUESTION_ID,
-                self::TOKEN_STRING_PAGE_ID
+                self::TOKEN_STRING_PAGE_ID,
+                self::TOKEN_TYPE_HASH
             );
     }
 
@@ -302,7 +374,7 @@ private function retrieveStringValueForToken(
     ): string {
         return $this->http->wrapper()->query()->retrieve(
             $token->getName(),
-            $this->buildActionTrafo()
+            $this->buildStringTrafo()
         );
     }
 
@@ -332,7 +404,7 @@ public function retrievePageId(
         );
     }
 
-    private function buildActionTrafo(): Transformation
+    private function buildStringTrafo(): Transformation
     {
         return $this->refinery->byTrying([
             $this->refinery->kindlyTo()->string(),
@@ -425,6 +497,7 @@ private function buildItemGroupForQuestionListSlate(
     private function buildEditStartView(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
+        URLBuilderToken $page_id_token,
         QuestionImplementation $question
     ): array {
         return $question->getEditView(
@@ -438,32 +511,26 @@ private function buildEditStartView(
         )->edit(
             $url_builder,
             $step_token,
+            $page_id_token,
             ''
         );
     }
 
     private function buildCreateAnswerForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token,
-        URLBuilderToken $page_id_token
+        URLBuilder $url_builder
     ): StandardForm {
         $if = $this->ui_factory->input();
         return $if->container()->form()->standard(
-            $url_builder
-                ->withParameter($action_token, self::CMD_CREATE_ACTION_FORM)
-                ->withParameter($question_id_token, $this->retrieveQuestionId($question_id_token)->toString())
-                ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
-                ->buildURI()->__toString(),
+            $url_builder->buildURI()->__toString(),
             [
                 'form_type' => $if->field()->section(
                     [
                         $if->field()->select(
-                            $this->lng->txt('select_answer_form'),
+                            $this->lng->txt('select_answer_form_type'),
                             array_reduce(
-                                $this->questions_repository->getAvailableAnswerTypes(),
+                                $this->answer_form_types_factory->getAvailableAnswerFormTypes(),
                                 function (array $c, Type $v): array {
-                                    $c[$v::class] = $v->getLabel($this->lng);
+                                    $c[$this->answer_form_types_factory->getHashedClass($v::class)] = $v->getLabel($this->lng);
                                     return $c;
                                 },
                                 []
@@ -473,11 +540,11 @@ function (array $c, Type $v): array {
                     $this->lng->txt('create_answer_form')
                 )->withAdditionalTransformation(
                     $this->refinery->custom()->transformation(
-                        fn(array $vs): ?Type => $this->questions_repository->getAvailableAnswerTypeByClass($vs[0])
+                        fn(array $vs): ?Type => $this->answer_form_types_factory->getAnswerFormTypeByClassHash($vs[0])
                     )
                 )
             ]
-        );
+        )->withSubmitLabel($this->lng->txt('next'));
     }
 
     private function checkCapabilities(array $capabilities): void
diff --git a/components/ILIAS/Questions/src/Presentation/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/QuestionsTable.php
index 46d8da3e0f40..6e9f170d3add 100644
--- a/components/ILIAS/Questions/src/Presentation/QuestionsTable.php
+++ b/components/ILIAS/Questions/src/Presentation/QuestionsTable.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\Presentation;
 
+use ILIAS\Questions\AnswerFormTypes\Factory as AnswerFormTypesFactory;
 use ILIAS\Questions\Question\Persistence\Repository;
 use ILIAS\Data\Range;
 use ILIAS\Data\Order;
@@ -35,6 +36,7 @@ public function __construct(
         private readonly UIFactory $ui_factory,
         private readonly \ilUIService $ui_service,
         private readonly \ilLanguage $lng,
+        private readonly AnswerFormTypesFactory $answer_form_type_factory,
         private readonly Repository $questions_repository,
         private readonly URLBuilder $url_builder,
         private readonly URLBuilderToken $action_token,
@@ -58,7 +60,7 @@ public function getFilter(string $action): Filter
             '' => $this->lng->txt('filter_all_question_types')
         ];
 
-        foreach ($this->questions_repository->getAvailableAnswerTypes() as $class => $type) {
+        foreach ($this->answer_form_type_factory->getAvailableAnswerFormTypes() as $class => $type) {
             $question_type_options[$class] = $type->getLabel($this->lng);
         }
 
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Repository.php b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
index 76d23f8bd54d..b8791e9c7c3e 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
@@ -60,24 +60,10 @@ class Repository
 
     public function __construct(
         private readonly \ilDBInterface $db,
-        private readonly UuidFactory $uuid_factory,
-        private readonly FormTypesFactory $form_types_factory
+        private readonly UuidFactory $uuid_factory
     ) {
     }
 
-    /**
-     * @return array<string, \ILIAS\Questions\AnswerForm\Type>
-     */
-    public function getAvailableAnswerTypes(): array
-    {
-        return $this->form_types_factory->getAvailableAnswerTypes();
-    }
-
-    public function getAvailableAnswerTypeByClass(string $class): ?Type
-    {
-        return $this->form_types_factory->getAnswerFormTypeByClass($class);
-    }
-
     /**
      * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
      */
@@ -88,11 +74,9 @@ public function getAllQuestions(): \Generator
 
     public function getForQuestionId(Uuid $question_id): ?QuestionImplementation
     {
-        if ($question_id < 1) {
-            return new QuestionImplementation();
-        }
-
-        return $this->getForWhereClause("q.id='{$question_id->toString()}'")->current();
+        return $this->getForWhereClause(
+            "q.id={$this->db->quote($question_id->toString(), \ilDBConstants::T_TEXT)}"
+        )->current();
     }
 
     /**
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index c4402252b84f..e1d9fcab1497 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -112,17 +112,17 @@ private function buildBasicPropertiesInputs(): array
                 'author' => $ff->text($this->lng->txt('author'))
                     ->withValue($this->current_user->getFullname()),
                 'lifecycle' => $ff->select(
-                    $this->lng->txt('lifecycle'),
+                    $this->lng->txt('qst_lifecycle'),
                     array_reduce(
                         Lifecycle::cases(),
                         function (array $c, Lifecycle $v): array {
-                            $c[$v->value] = $this->lng->txt($v->value);
+                            $c[$v->value] = $this->lng->txt("qst_lifecycle_{$v->value}");
                             return $c;
                         },
                         []
                     )
                 )->withRequired(true),
-                'remarks' => $ff->textarea($this->lng->txt('remarks'))
+                'remarks' => $ff->textarea($this->lng->txt('qst_remarks'))
             ],
             $this->lng->txt('edit_basic_form_properties')
         )->withAdditionalTransformation($this->buildAddBasicPropertiesToQuestionTrafo());
diff --git a/components/ILIAS/Test/classes/class.ilObjTestGUI.php b/components/ILIAS/Test/classes/class.ilObjTestGUI.php
index 7a59ac284581..60446de5daf1 100755
--- a/components/ILIAS/Test/classes/class.ilObjTestGUI.php
+++ b/components/ILIAS/Test/classes/class.ilObjTestGUI.php
@@ -249,6 +249,7 @@ public function __construct()
         $this->ctrl->saveParameter($this, ['ref_id', 'test_ref_id']);
 
         $this->lng->loadLanguageModule('assessment');
+        $this->lng->loadLanguageModule('qsts');
 
         $this->objective_oriented_container = new ilTestObjectiveOrientedContainer();
 
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php
index 98195c86b9e0..3463a66ac425 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php
@@ -136,6 +136,7 @@ public function __construct()
         $this->ctrl->saveParameterByClass('ilobjquestionpoolgui', 'consumer_context');
 
         $this->lng->loadLanguageModule('assessment');
+        $this->lng->loadLanguageModule('qsts');
 
         $here_uri = $this->data_factory->uri($this->request->getUri()->__toString());
         $url_builder = new URLBuilder($here_uri);
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index 51950a836da7..fd266bc696db 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -1137,14 +1137,6 @@ assessment#:#qst_essay_chars_remaining#:#Noch übrige Zeichen:
 assessment#:#qst_essay_wordcounter_enabled#:#Wörter zählen
 assessment#:#qst_essay_wordcounter_enabled_info#:#Die eingegebenen Wörter werden gezählt. Die Anzahl der Wörter wird den Teilnehmern unterhalb des Texteingabefeldes angezeigt.
 assessment#:#qst_essay_written_words#:#Anzahl der eingegebenen Wörter:
-assessment#:#qst_lifecycle#:#Lebenszyklus
-assessment#:#qst_lifecycle_draft#:#Entwurf
-assessment#:#qst_lifecycle_filter_all#:#Alle Lebenszyklen
-assessment#:#qst_lifecycle_final#:#Endgültig
-assessment#:#qst_lifecycle_outdated#:#Veraltet
-assessment#:#qst_lifecycle_rejected#:#Abgelehnt
-assessment#:#qst_lifecycle_review#:#Überarbeitung notwendig
-assessment#:#qst_lifecycle_sharable#:#Verteilbar
 assessment#:#qst_nested_nested_answers_off#:#Ohne Einrückung
 assessment#:#qst_nested_nested_answers_on#:#Mit Einrückung
 assessment#:#qst_nr_of_tries#:#Anzahl der Versuche
@@ -5055,6 +5047,8 @@ common#:#obj_ps_desc#:#Globale Einstellungen für Datenschutz und Sicherheit
 common#:#obj_qpl#:#Fragenpool für Tests
 common#:#obj_qpl_duplicate#:#Fragenpool für Tests kopieren
 common#:#obj_qpl_select#:#-- Bitte wählen Sie einen Fragenpool für Tests aus --
+common#:#obj_qsts#:#Fragen
+common#:#obj_qsts_desc#:#Globale Einstellungen für Fragen
 common#:#obj_rcat#:#ECS-Kategorie
 common#:#obj_rcrs#:#ECS-Kurs
 common#:#obj_recf#:#Wiederhergestellte Objekte
@@ -14049,6 +14043,23 @@ qpl#:#qpl_page_type_qfbg#:#Generelles Feedback
 qpl#:#qpl_page_type_qfbs#:#Spezielles Feedback
 qpl#:#qpl_page_type_qht#:#Hinweis
 qpl#:#qpl_page_type_qpl#:#Fragenseite
+qsts#:#cloze_enable_combinations#:#Enable Gap Combination
+qsts#:#cont_ed_insert_answf#:#Antwortformular einfügen
+qsts#:#create_answer_form#:#Antwortformular erstellen
+qsts#:#edit_basic_form_properties#:#Grundeinstellungen der Frage bearbeiten
+qsts#:#qst_lifecycle#:#Lebenszyklus
+qsts#:#qst_lifecycle_draft#:#Entwurf
+qsts#:#qst_lifecycle_filter_all#:#Alle Lebenszyklen
+qsts#:#qst_lifecycle_final#:#Endgültig
+qsts#:#qst_lifecycle_outdated#:#Veraltet
+qsts#:#qst_lifecycle_rejected#:#Abgelehnt
+qsts#:#qst_lifecycle_review#:#Überarbeitung notwendig
+qsts#:#qst_lifecycle_sharable#:#Verteilbar
+qsts#:#qst_remarks#:#Bemerkungen
+qsts#:#score_all#:#Alle Antworten bewerten
+qsts#:#score_distinct#:#Gleiche Antworten nur einmal bewerten
+qsts#:#scoring_of_identical_responses#:#Bewertung gleicher Antworten
+qsts#:#select_answer_form_type#:#Art des Antwortformulars auswählen
 rating#:#rat_not_rated_yet#:#Noch nicht bewertet
 rating#:#rat_nr_ratings#:#%s Bewertungen
 rating#:#rat_one_rating#:#Eine Bewertung
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index c92b72993303..ca4200875e3d 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -1137,14 +1137,6 @@ assessment#:#qst_essay_chars_remaining#:#Remaining characters:
 assessment#:#qst_essay_wordcounter_enabled#:#Count Words
 assessment#:#qst_essay_wordcounter_enabled_info#:#The entered words are counted. The number of written words is shown to the participants below the text input field.
 assessment#:#qst_essay_written_words#:#Number of entered words:
-assessment#:#qst_lifecycle#:#Lifecycle
-assessment#:#qst_lifecycle_draft#:#Draft
-assessment#:#qst_lifecycle_filter_all#:#All Lifecycles
-assessment#:#qst_lifecycle_final#:#Final
-assessment#:#qst_lifecycle_outdated#:#Outdated
-assessment#:#qst_lifecycle_rejected#:#Rejected
-assessment#:#qst_lifecycle_review#:#To be Reviewed
-assessment#:#qst_lifecycle_sharable#:#Shareable
 assessment#:#qst_nested_nested_answers_off#:#No indents, just order
 assessment#:#qst_nested_nested_answers_on#:#Use indents in anwers
 assessment#:#qst_nr_of_tries#:#Number of Tries
@@ -5057,6 +5049,8 @@ common#:#obj_ps_desc#:#Configure global privacy and security settings here.
 common#:#obj_qpl#:#Question Pool for Tests
 common#:#obj_qpl_duplicate#:#Copy Question Pool for Tests
 common#:#obj_qpl_select#:#-- Please select one question pool for tests --
+common#:#obj_qsts#:#Questions
+common#:#obj_qsts_desc#:#Global Settings For Questions
 common#:#obj_rcat#:#ECS Category
 common#:#obj_rcrs#:#ECS Course
 common#:#obj_recf#:#Restored Objects
@@ -14022,6 +14016,23 @@ qpl#:#qpl_page_type_qfbg#:#General Feedback
 qpl#:#qpl_page_type_qfbs#:#Special Feedback
 qpl#:#qpl_page_type_qht#:#Hint
 qpl#:#qpl_page_type_qpl#:#Question Page
+qsts#:#cloze_enable_combinations#:#Lückenkombinationen aktivieren
+qsts#:#cont_ed_insert_answf#:#Insert Answer Form
+qsts#:#create_answer_form#:#Create Answer Form
+qsts#:#edit_basic_form_properties#:#Edit Basic Form Properties
+qsts#:#qst_lifecycle#:#Lifecycle
+qsts#:#qst_lifecycle_draft#:#Draft
+qsts#:#qst_lifecycle_filter_all#:#All Lifecycles
+qsts#:#qst_lifecycle_final#:#Final
+qsts#:#qst_lifecycle_outdated#:#Outdated
+qsts#:#qst_lifecycle_rejected#:#Rejected
+qsts#:#qst_lifecycle_review#:#To be Reviewed
+qsts#:#qst_lifecycle_sharable#:#Shareable
+qsts#:#qst_remarks#:#Remarks
+qsts#:#score_all#:#All Responses are Scored
+qsts#:#score_distinct#:#Identical Responses are Only Scored Once
+qsts#:#scoring_of_identical_responses#:#Scoring of Identical Responses
+qsts#:#select_answer_form_type#:#Select Type of Answer Form
 rating#:#rat_not_rated_yet#:#Not Rated Yet
 rating#:#rat_nr_ratings#:#%s Ratings
 rating#:#rat_one_rating#:#One Rating

From 5d2edc6b1931e773519bf0b28c5eb9ad76f04d02 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 3 Nov 2025 10:35:05 +0100
Subject: [PATCH 082/141] Questions: Implement Cloze Question

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       | 105 +++++---
 .../Questions/src/AnswerForm/Views/Edit.php   |   8 +-
 .../Cloze/Properties/AnswerForm/Factory.php   | 111 +++++++++
 .../Properties/AnswerForm/Properties.php      | 151 ++++++++++++
 .../Cloze/Properties/ClozeText/Factory.php    |  58 +++++
 .../Cloze/Properties/ClozeText/Text.php       | 142 +++++++++++
 .../Definitions/ScoringIdentical.php          |  24 +-
 .../Cloze/Properties/Gaps/AnswerOption.php    |  55 +++++
 .../Cloze/Properties/Gaps/Data.php            | 128 ++++++++++
 .../Cloze/Properties/Gaps/Factory.php         |  76 ++++++
 .../Cloze/Properties/Gaps/Gap.php             | 110 +++++++++
 .../Cloze/Properties/Gaps/Gaps.php            | 131 ++++++++++
 .../Cloze/Properties/Gaps/LongMenu.php        | 114 +++++++++
 .../Cloze/Properties/Gaps/Numeric.php         | 109 +++++++++
 .../Cloze/Properties/Gaps/Select.php          |  92 +++++++
 .../Cloze/Properties/Gaps/Text.php            | 104 ++++++++
 .../Cloze/Properties/Gaps/Type.php            |  53 ++++
 .../src/AnswerFormTypes/Cloze/Type.php        |  64 ++---
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 230 +++++++++++++++---
 .../ILIAS/Questions/src/Presentation/Edit.php |   1 -
 .../src/Presentation/QuestionsTable.php       |  10 +-
 .../{UpdateQuery.php => ManipulateQuery.php}  |   2 +-
 .../src/Setup/ClozeQuestionTables.php         |  47 ++--
 23 files changed, 1776 insertions(+), 149 deletions(-)
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/{ => Properties}/Definitions/ScoringIdentical.php (54%)
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOption.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
 rename components/ILIAS/Questions/src/Question/Persistence/{UpdateQuery.php => ManipulateQuery.php} (98%)

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index d57d426088cc..bf3208872f0b 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -46,46 +46,81 @@ public static function dic(): self
     protected static function buildDIC(ILIASContainer $DIC): self
     {
         $dic = new self();
-        $dic[AnswerFormTypesFactory::class] = static fn($c): AnswerFormTypesFactory =>
-            new AnswerFormTypesFactory([
-                new Cloze\Type(
-                    new Cloze\Persistence(
-                        new TableNameSpaceCore('cloze')
-                    ),
-                    [
-                        Cloze\Capabilities\Marking::class => new Cloze\Capabilities\Marking(),
-                        Cloze\Capabilities\Feedback::class => new Cloze\Capabilities\Feedback(),
-                        Cloze\Capabilities\Skills::class => new Cloze\Capabilities\Skills()
-                    ],
-                    new Cloze\Views\Edit(
-                        $DIC['lng'],
-                        $DIC['ui.factory'],
-                        $DIC['refinery'],
-                        $DIC['http']->request(),
-                        new DataFactory()
-                    ),
-                    new Cloze\Views\Participant()
-                )
+        $dic[DataFactory::class] = static fn($c): DataFactory => new DataFactory();
+        $dic[UuidFactory::class] = static fn($c): UuidFactory => new UuidFactory();
+
+        $dic[AnswerFormTypesFactory::class] = static fn($c): AnswerFormTypesFactory
+            => new AnswerFormTypesFactory([
+                $c[Cloze\Type::class]
             ]);
-        $dic[Edit::class] = static fn($c): Edit =>
-            new Edit(
-                $DIC['lng'],
-                $DIC['ilUser'],
+        $dic[QuestionsRepository::class] = static fn($c): QuestionsRepository =>
+            new QuestionsRepository(
+                $DIC['ilDB'],
+                new UuidFactory(),
+            );
+        $dic[Edit::class] = static fn($c): Edit => new Edit(
+            $DIC['lng'],
+            $DIC['ilUser'],
+            $DIC['refinery'],
+            $DIC['ui.factory'],
+            $DIC['ui.renderer'],
+            $DIC['global_screen'],
+            $DIC['ilCtrl'],
+            $DIC['http'],
+            $DIC->uiService(),
+            $c[DataFactory::class],
+            $c[UuidFactory::class],
+            $c[AnswerFormTypesFactory::class],
+            $c[QuestionsRepository::class]
+        );
+
+        $dic[Cloze\Properties\ClozeText\Factory::class] = static fn($c): Cloze\Properties\ClozeText\Factory
+            => new Cloze\Properties\ClozeText\Factory(
                 $DIC['refinery'],
+                (new \ilMustacheFactory())->getBasicEngine(),
+                $c[UuidFactory::class],
+                $c[DataFactory::class]->text()
+            );
+        $dic[Cloze\Properties\Gaps\Factory::class] = static fn($c): Cloze\Properties\Gaps\Factory => new Cloze\Properties\Gaps\Factory([
+            new Cloze\Properties\Gaps\Text(),
+            new Cloze\Properties\Gaps\Numeric(),
+            new Cloze\Properties\Gaps\Select(),
+            new Cloze\Properties\Gaps\LongMenu()
+        ]);
+        $dic[Cloze\Properties\AnswerForm\Factory::class] = static fn($c): Cloze\Properties\AnswerForm\Factory
+            => new Cloze\Properties\AnswerForm\Factory(
+                $c[Cloze\Properties\ClozeText\Factory::class],
+                $c[Cloze\Properties\Gaps\Factory::class]
+            );
+        $dic[Cloze\Persistence::class] = static fn($c): Cloze\Persistence
+            => new Cloze\Persistence(
+                new TableNameSpaceCore('cloze')
+            );
+        $dic[Cloze\Views\Edit::class] = static fn($c): Cloze\Views\Edit
+            => new Cloze\Views\Edit(
+                $DIC['lng'],
                 $DIC['ui.factory'],
-                $DIC['ui.renderer'],
-                $DIC['global_screen'],
-                $DIC['ilCtrl'],
+                $DIC['refinery'],
                 $DIC['http'],
-                $DIC->uiService(),
-                new DataFactory(),
-                new UuidFactory(),
-                $c[AnswerFormTypesFactory::class],
-                new QuestionsRepository(
-                    $DIC['ilDB'],
-                    new UuidFactory(),
-                )
+                $c[UuidFactory::class],
+                $c[DataFactory::class],
+                $c[Cloze\Properties\AnswerForm\Factory::class],
+                $c[Cloze\Properties\ClozeText\Factory::class],
+                $c[Cloze\Properties\Gaps\Factory::class]
             );
+        $dic[Cloze\Views\Participant::class] = static fn($c): Cloze\Views\Participant
+            => new Cloze\Views\Participant();
+        $dic[Cloze\Type::class] = static fn($c): Cloze\Type => new Cloze\Type(
+            $c[Cloze\Properties\AnswerForm\Factory::class],
+            $c[Cloze\Persistence::class],
+            [
+                Cloze\Capabilities\Marking::class => new Cloze\Capabilities\Marking(),
+                Cloze\Capabilities\Feedback::class => new Cloze\Capabilities\Feedback(),
+                Cloze\Capabilities\Skills::class => new Cloze\Capabilities\Skills()
+            ],
+            $c[Cloze\Views\Edit::class],
+            $c[Cloze\Views\Participant::class]
+        );
 
         return $dic;
     }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
index b5552ac55283..2dd5fbb85e41 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\AnswerForm\Views;
 
-use ILIAS\Questions\Question\Persistence\UpdateQuery;
+use ILIAS\Questions\Question\Persistence\ManipulateQuery;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
 
@@ -30,17 +30,17 @@ public function create(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
         string $step
-    ): array|UpdateQuery;
+    ): array|ManipulateQuery;
 
     public function edit(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
         string $step
-    ): array|UpdateQuery;
+    ): array|ManipulateQuery;
 
     public function other(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
         string $cmd
-    ): array|UpdateQuery;
+    ): array|ManipulateQuery;
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
new file mode 100644
index 000000000000..1f419d91647c
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm;
+
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
+use ILIAS\Refinery\Factory as Refinery;
+
+class Factory
+{
+    public function __construct(
+        private readonly ClozeTextFactory $cloze_text_factory,
+        private readonly GapsFactory $gaps_factory
+    ) {
+    }
+
+    public function fromData(
+        ?string $answer_form_id,
+        string $cloze_text,
+        string $legay_cloze_text,
+        array $data
+    ): Properties {
+        return new Properties(
+            $answer_form_id,
+            $this->cloze_text_factory->buildFromTextString($cloze_text),
+            $legay_cloze_text
+        );
+    }
+
+    public function fromForm(
+        ?string $answer_form_id,
+        ClozeText $cloze_text,
+        string $legacy_cloze_text,
+        ScoringIdentical $scoring_of_identical_responses,
+        bool $combinations_enabled
+    ): Properties {
+        return new Properties(
+            $answer_form_id,
+            $cloze_text,
+            $legacy_cloze_text,
+            $scoring_of_identical_responses,
+            $combinations_enabled
+        );
+    }
+
+    public function fromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        string $form_input_path,
+        ?Uuid $answer_form_id,
+        string $legacy_cloze_text,
+        ScoringIdentical $default_scoring_identical
+    ): Properties {
+        $cloze_text = $post_wrapper->retrieve(
+            $form_input_path . '/' . Properties::FORM_KEY_CLOZE_TEXT,
+            $refinery->custom()->transformation(
+                fn(string $v): ClozeText => $this->cloze_text_factory->buildFromHiddenInputString($v)
+            )
+        );
+
+        $scoring_of_identical_responses = $post_wrapper->retrieve(
+            $form_input_path . '/' . Properties::FORM_KEY_IDENTICAL_SCORING,
+            $refinery->custom()->transformation(
+                static fn(string $v): ScoringIdentical => ScoringIdentical::tryFrom($v) ?? $default_scoring_identical
+            )
+        );
+
+        $combinations_enabled = $post_wrapper->retrieve(
+            $form_input_path . '/' . Properties::FORM_KEY_ENABLE_COMBINATIONS,
+            $refinery->kindlyTo()->bool()
+        );
+
+        return new Properties(
+            $answer_form_id,
+            $cloze_text,
+            $legacy_cloze_text,
+            $scoring_of_identical_responses,
+            $combinations_enabled
+        );
+    }
+
+    public function buildDefault(): Properties
+    {
+        return new Properties(
+            null,
+            $this->cloze_text_factory->buildFromTextString('')
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
new file mode 100644
index 000000000000..3c0f26b2ce4b
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm;
+
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
+use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\Component\Input\Field\Group;
+
+class Properties
+{
+    public const string FORM_KEY_CLOZE_TEXT = 'cloze_text';
+    public const string FORM_KEY_IDENTICAL_SCORING = 'identical_scoring';
+    public const string FORM_KEY_ENABLE_COMBINATIONS = 'enable_combinations';
+
+    /**
+     * @param array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Gap> $gaps
+     */
+    public function __construct(
+        private readonly ?Uuid $answer_form_id,
+        private Text $cloze_text,
+        private Gaps $gaps,
+        private readonly string $legacy_cloze_text = '',
+        private readonly ScoringIdentical $scoring_identical = ScoringIdentical::ScoreAll,
+        private readonly bool $combinations_activated = false
+    ) {
+    }
+
+    public function getAnswerFormId(): ?Uuid
+    {
+        return $this->answer_form_id;
+    }
+
+    public function getClozeText(): Text
+    {
+        return $this->cloze_text;
+    }
+
+    public function withClozeText(Text $cloze_text): self
+    {
+        $clone = clone $this;
+        $clone->cloze_text = $this->cloze_text;
+        return $clone;
+    }
+
+    public function getLegacyClozeText(): string
+    {
+        return $this->legacy_cloze_text;
+    }
+
+    public function getScoringOfIdenticalResponses(): ScoringIdentical
+    {
+        return $this->scoring_identical;
+    }
+
+    public function areCombinationsActivated(): bool
+    {
+        return $this->combinations_activated;
+    }
+
+    public function getGaps(): Gaps
+    {
+        return $this->gaps;
+    }
+
+    public function withGaps(array $gaps): self
+    {
+        $clone = clone $this;
+        $clone->gaps = $gaps;
+        return $clone;
+    }
+
+    public function buildBasicEditingInputs(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery,
+        Factory $propteries_factory,
+        ClozeTextFactory $cloze_text_factory
+    ): Section {
+        return $ff->section(
+            [
+                self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getInput(
+                    $lng,
+                    $ff,
+                    $cloze_text_factory
+                ),
+                self::FORM_KEY_IDENTICAL_SCORING => ScoringIdentical::buildInput(
+                    $lng,
+                    $ff,
+                    $refinery,
+                    $this->scoring_identical
+                )->withValue($this->getScoringOfIdenticalResponses()->value),
+                self::FORM_KEY_ENABLE_COMBINATIONS => $ff->checkbox($lng->txt('cloze_enable_combinations'))
+                    ->withValue($this->areCombinationsActivated())
+            ],
+            $lng->txt('create_answer_form')
+        )->withAdditionalTransformation(
+            $refinery->custom()->transformation(
+                fn(array $vs): self => $propteries_factory->fromForm(
+                    $this->answer_form_id,
+                    $vs[self::FORM_KEY_CLOZE_TEXT],
+                    $this->legacy_cloze_text,
+                    $vs[self::FORM_KEY_IDENTICAL_SCORING],
+                    $vs[self::FORM_KEY_ENABLE_COMBINATIONS]
+                )
+            )
+        );
+    }
+
+    public function buildBasicEditingInputsHidden(
+        FieldFactory $ff
+    ): Group {
+        return $ff->group(
+            [
+                self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getHiddenInput($ff)
+                    ->withDedicatedName(self::FORM_KEY_CLOZE_TEXT),
+                self::FORM_KEY_IDENTICAL_SCORING => $ff->hidden()
+                    ->withDedicatedName(self::FORM_KEY_IDENTICAL_SCORING)
+                    ->withValue($this->getScoringOfIdenticalResponses()->value),
+                self::FORM_KEY_ENABLE_COMBINATIONS => $ff->hidden()
+                    ->withDedicatedName(self::FORM_KEY_ENABLE_COMBINATIONS)
+                    ->withValue($this->areCombinationsActivated() ? 1 : 0)
+            ]
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
new file mode 100644
index 000000000000..892d37175d3c
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText;
+
+use ILIAS\Data\Text\Factory as TextFactory;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Refinery\Factory as Refinery;
+use Mustache\Engine;
+
+class Factory
+{
+    public function __construct(
+        private readonly Refinery $refinery,
+        private readonly Engine $mustache_engine,
+        private readonly UuidFactory $uuid_factory,
+        private readonly TextFactory $text_factory
+    ) {
+    }
+
+    public function buildFromTextString(string $text): Text
+    {
+        return new Text(
+            $this->refinery,
+            $this->mustache_engine,
+            $this->uuid_factory,
+            $this->text_factory,
+            $this->text_factory->markdown($text)
+        );
+    }
+
+    public function buildFromHiddenInputString(string $text): Text
+    {
+        return $this->buildFromTextString($this->unmaskTextFromOutputInHiddenInput($text));
+    }
+
+    private function unmaskTextFromOutputInHiddenInput(string $text): string
+    {
+        return str_replace(['&#123;&#123;', '&#125;&#125;'], ['{{', '}}'], $text);
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
new file mode 100644
index 000000000000..ecb2e9a72450
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText;
+
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
+use ILIAS\Data\Text\Markdown;
+use ILIAS\Data\Text\Factory as TextFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Field\Markdown as MarkdownInput;
+use ILIAS\UI\Component\Input\Field\Hidden as HiddenInput;
+use Mustache\Engine;
+
+class Text
+{
+    public function __construct(
+        private readonly Refinery $refinery,
+        private readonly Engine $mustache_engine,
+        private readonly TextFactory $text_factory,
+        private Markdown $cloze_text
+    ) {
+    }
+
+    public function getInput(
+        Language $lng,
+        FieldFactory $ff,
+        Factory $cloze_text_factory
+    ): MarkdownInput {
+        return $ff->markdown(
+            new \ilUIMarkdownPreviewGUI(),
+            $lng->txt('cloze_text')
+        )->withMustacheVAriables([
+            'GAP' => $lng->txt('gap')
+        ])->withAdditionalTransformation(
+            $this->refinery->custom()->transformation(
+                fn(string $v): self => $cloze_text_factory->buildFromTextString($v)
+            )
+        )->withAdditionalTransformation(
+            $this->refinery->custom()->constraint(
+                fn(self $v): bool => $v->hasAtLeastOneGap(),
+                $lng->txt('no_gaps')
+            )
+        )->withRequired(true)
+        ->withValue($this->cloze_text->getRawRepresentation());
+    }
+
+    public function getHiddenInput(FieldFactory $ff): HiddenInput
+    {
+        return $ff->hidden()->withValue($this->getTextForOutputInHiddenInput());
+    }
+
+    public function getRenderedMarkdown(): string
+    {
+        return $this->mustache_engine->render(
+            $this->cloze_text->getRawRepresentation(),
+            array_reduce(
+                $this->getAllGaps(),
+                function (array $c, Uuid $v): array {
+                    $c[$this->buildGapPlaceholderNameWithId($v)] = $this->buildShortenedGapRepresentation($v);
+                    return $c;
+                },
+                []
+            )
+        );
+    }
+
+    public function hasAtLeastOneGap(): bool
+    {
+        return $this->new_gaps + $this->preexisting_gaps !== [];
+    }
+
+    public function extractGapsFromMarkdown(
+        Gaps $existing_gaps
+    ): array {
+        if ($this->cloze_text->getRawRepresentation() === '') {
+            return $existing_gaps->withResetGaps();
+        }
+
+        $position = 0;
+        return array_reduce(
+            $this->mustache_engine->getTokenizer()->scan($this->cloze_text->getRawRepresentation()),
+            function (Gaps $c, array $v) use (&$position): Gaps {
+                if ($v['type'] !== '_v'
+                    || !str_starts_with($v['name'], 'GAP')) {
+                    return $c;
+                }
+
+                if ($v['name'] === 'GAP') {
+                    return $c->withNewGap();
+                }
+
+                $gap = $c->getGapByTagName($v['name'])?->withPosition($position);
+
+                if ($gap === null) {
+                    return $c;
+                }
+
+                return $c->withUpdatedGap($gap);
+            },
+            $existing_gaps
+        );
+    }
+
+    public function addIdsOfNewGapsToClozeText(Gaps $gaps): Markdown
+    {
+        $new_gaps = $gaps->getUndefinedGaps();
+        return $this->text_factory->markdown(
+            mb_ereg_replace_callback(
+                $this->buildGapPlaceholder(),
+                function (array $matches) use (&$new_gaps): string {
+                    return array_shift($new_gaps)->getGapPlaceholder();
+                },
+                $this->cloze_text->getRawRepresentation()
+            )
+        );
+    }
+
+    private function getTextForOutputInHiddenInput(): string
+    {
+        return str_replace(['{{', '}}'], ['&#123;&#123;', '&#125;&#125;'], $this->cloze_text->getRawRepresentation());
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definitions/ScoringIdentical.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php
similarity index 54%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definitions/ScoringIdentical.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php
index b62d9cde4276..19e3c1f9a30f 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definitions/ScoringIdentical.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php
@@ -18,16 +18,36 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Definitions;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions;
 
 use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Field\Select;
 
 enum ScoringIdentical: string
 {
     case ScoreAll = 'score_all';
     case OnlyScoreDistinct = 'score_distinct';
 
-    public static function buildOptionsList(Language $lng): array
+    public static function buildInput(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery,
+        self $default_value
+    ): Select {
+        return $ff->select(
+            $lng->txt('scoring_of_identical_responses'),
+            self::buildOptionsList($lng)
+        )->withRequired(true)
+        ->withAdditionalTransformation(
+            $refinery->custom()->transformation(
+                fn(string $v): self => self::tryFrom($v) ?? $default_value
+            )
+        );
+    }
+
+    private static function buildOptionsList(Language $lng): array
     {
         return array_reduce(
             self::cases(),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOption.php
new file mode 100644
index 000000000000..08156d56a6a1
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOption.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Data\UUID\Uuid;
+
+class AnswerOption
+{
+    public function __construct(
+        private readonly ?Uuid $answer_option_id = null,
+        private readonly ?int $position = null,
+        private readonly string|float $value = '',
+        private readonly ?float $available_points = null
+    ) {
+    }
+
+    public function getPosition(): ?int
+    {
+        return $this->position;
+    }
+
+    public function getValue(): string|float|null
+    {
+        return $this->value;
+    }
+
+    public function getAvailablePoints(): ?float
+    {
+        return $this->available_points;
+    }
+
+    public function toPersistence(ManipulateQuery $query): ManipulateQuery
+    {
+
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data.php
new file mode 100644
index 000000000000..05879bded9bc
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
+use ILIAS\Data\UUID\Uuid;
+
+class Data
+{
+    public function __construct(
+        private readonly Uuid $answer_input_id,
+        private ?int $max_chars,
+        private ?float $step_size,
+        private ?TextMatchingOptions $text_matching_method,
+        private ?int $min_autocomplete,
+        private ?bool $shuffle_answer_options,
+        private ?float $lower_limit,
+        private ?float $upper_limit
+    ) {
+    }
+
+    public function getAnswerInputId(): Uuid
+    {
+        return $this->answer_input_id;
+    }
+
+    public function getMaxChars(): ?int
+    {
+        return $this->max_chars;
+    }
+
+    public function withMaxChars(int $max_chars): self
+    {
+        $clone = clone $this;
+        $clone->max_chars = $max_chars;
+        return $clone;
+    }
+
+    public function getStepSize(): ?int
+    {
+        return $this->step_size;
+    }
+
+    public function withStepSize(int $step_size): self
+    {
+        $clone = clone $this;
+        $clone->step_size = $step_size;
+        return $clone;
+    }
+
+    public function getTextMatchingMethod(): ?TextMatchingOptions
+    {
+        return $this->text_matching_method;
+    }
+
+    public function withTextMatchingMethod(TextMatchingOptions $matching_method): self
+    {
+        $clone = clone $this;
+        $clone->text_matching_method = $matching_method;
+        return $clone;
+    }
+
+    public function getMinAutocomplete(): ?int
+    {
+        return $this->min_autocomplete;
+    }
+
+    public function withMinAutocomplete(int $min_autocomplete): self
+    {
+        $clone = clone $this;
+        $clone->min_autocomplete = $min_autocomplete;
+        return $clone;
+    }
+
+    public function getShuffleAnswerOptions(): ?bool
+    {
+        return $this->shuffle_answer_options;
+    }
+
+    public function withShuffleAnswerOptions(bool $shuffle_answer_options): self
+    {
+        $clone = clone $this;
+        $clone->shuffle_answer_options = $shuffle_answer_options;
+        return $clone;
+    }
+
+    public function getLowerLimit(): ?float
+    {
+        return $this->lower_limit;
+    }
+
+    public function withLowerLimit(float $lower_limit): self
+    {
+        $clone = clone $this;
+        $clone->lower_limit = $lower_limit;
+        return $clone;
+    }
+
+    public function getUpperLimit(): ?float
+    {
+        return $this->upper_limit;
+    }
+
+    public function withUpperLimit(float $upper_limit): self
+    {
+        $clone = clone $this;
+        $clone->upper_limit = $upper_limit;
+        return $clone;
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
new file mode 100644
index 000000000000..7c93e8dc43f3
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\Language\Language;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+
+class Factory
+{
+    private array $available_gap_types;
+
+    public function __construct(
+        private readonly UuidFactory $uuid_factory,
+        array $available_gap_types
+    ) {
+        foreach ($available_gap_types as $type) {
+            $this->available_gap_types[$type->getIdentifier()] = $type;
+        }
+    }
+
+    public function getAvailableGapTypesOptionsArray(
+        Language $lng
+    ): array {
+        return array_map(
+            fn(string $v) => $lng->txt("{$v}_gap"),
+            array_keys($this->available_gap_type_classes)
+        );
+    }
+
+    public function getNewGap(): ?Undefined
+    {
+        return new Gap(
+            $this->uuid_factory->uuid4()
+        );
+    }
+
+    public function getGapOfType(
+        string $type_identifier,
+        string $answer_input_id
+    ): ?Gap {
+        $class = $this->available_gap_type_classes[$type_identifier];
+        if ($class === null) {
+            return $class;
+        }
+        return (new $class())->withAnswerInputId(
+            $this->uuid_factory->fromString($answer_input_id)
+        );
+    }
+
+    /**
+     * @return array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap>
+     */
+    public function fromDatabase(
+        array $data
+    ): array {
+
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
new file mode 100644
index 000000000000..22e04976d286
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Constraint;
+use ILIAS\Refinery\Transformation;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Field\Section;
+
+class Gap
+{
+    private const string GAP_PLACEHOLDER_NAME = 'GAP';
+
+    public function __construct(
+        private Uuid $answer_input_id,
+        private ?Type $type = null,
+        ?ManipulateQuery $data = null
+    ) {
+        if ($this->type !== null && $data !== null) {
+            $this->type = $this->type->withData($data);
+        }
+    }
+
+    public function getAnswerInputId(): ?Uuid
+    {
+        return $this->answer_input_id;
+    }
+
+    public function withAnswerInputId(Uuid $answer_input_id): self
+    {
+        $clone = clone $this;
+        $clone->answer_input_id = $answer_input_id;
+        return $clone;
+    }
+
+    public function getGapPlaceholder(): string
+    {
+        if ($this->answer_input_id === null) {
+            return '{{' . self::GAP_PLACEHOLDER_NAME . '}}';
+        }
+
+        return "{{{$this->buildGapPlaceholderNameWithId()}}}";
+    }
+
+    public function getShortenedGapName(): string
+    {
+        return self::GAP_PLACEHOLDER_NAME . '_' . mb_substr($this->answer_input_id, 0, 4);
+    }
+
+    public function getShortenedGapRepresentation(): string
+    {
+        return "[{$this->buildShortenedGapName()}]";
+    }
+
+    public function getEditSection(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery
+    ): Section {
+        $section = $ff->section(
+            $this->getEditInputs($lng, $ff, $refinery),
+            "{$this->getShortenedGapName()} ({$lng->txt("{$this->getIdentifier()}_gap")})"
+        );
+
+        $edit_section_constraint = $this->getEditSectionConstraint($refinery, $lng);
+        if ($edit_section_constraint !== null) {
+            $section = $section->withAdditionalTransformation($edit_section_constraint);
+        }
+
+
+        return $section->withAdditionalTransformation(
+            $this->getBuildGapTransformation($refinery, $this->answer_input_id)
+        );
+    }
+
+    protected function buildTagsArrayfromAnswerOptions(array $answer_options): array
+    {
+        return array_map(
+            fn(AnswerOption $v): string => $v->getValue(),
+            $answer_options
+        );
+    }
+
+    private function buildGapPlaceholderNameWithId(): string
+    {
+        return self::GAP_PLACEHOLDER_NAME . '_' . $this->answer_input_id->toString();
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
new file mode 100644
index 000000000000..71545507c25b
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Constraint;
+use ILIAS\Refinery\Transformation;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Field\Section;
+
+class Gaps
+{
+    public function __construct(
+        private readonly Factory $factory,
+        private array $gaps
+    ) {
+    }
+
+    public function getGapById(Uuid $gap_id): ?Gap
+    {
+        return $this->gaps[$gap_id->toString()] ?? null;
+    }
+
+    public function getGapByTagName(string $tag_name): ?Gap
+    {
+        return $this->gaps[mb_substr($v['name'], 4)] ?? null;
+    }
+
+    public function withNewGap(): self
+    {
+        $new_gap = $this->factory->getNewGap();
+        $clone = clone $this;
+        $clone->gaps[$new_gap->getAnswerInputId()] = $new_gap;
+        return $clone;
+    }
+
+    public function withResetGaps(): self
+    {
+        if ($this->gaps === []) {
+            return self;
+        }
+
+        $clone = clone $this;
+        $clone->gaps = [];
+        return $clone;
+    }
+
+    public function getUndefinedGaps(): array
+    {
+        return array_filter(
+            $this->gaps,
+            fn(Gap $v): bool => $v instanceof Undefined
+        );
+    }
+
+    public function buildGapsTypeInputs(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery
+    ): Section {
+        return $ff->section(
+            array_reduce(
+                $this->gaps,
+                function (array $c, Gap $v) use ($ff): array {
+                    $c[$v->getAnswerInputId()->toString()] = $ff->select(
+                        $v->getShortenedGapName(),
+                        $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng)
+                    )->withRequired(true);
+                    return $c;
+                },
+                []
+            ),
+            $lng->txt('select_gap_types')
+        )->withAdditionalTransformation(
+            $refinery->custom()->transformation(
+                fn(array $vs): Gaps => array_reduce(
+                    array_keys($vs),
+                    fn(Gaps $c, string $v): Gaps => $c->withGap(
+                        $this->factory->getGapOfType($vs[$v], $v)
+                    ),
+                    $this
+                )
+            )
+        );
+    }
+
+    public function buildAnswerOptionsInputs(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery
+    ): Section {
+        return $ff->section(
+            array_reduce(
+                $this->gaps,
+                function (array $c, Gap $v) use ($lng, $ff, $refinery): array {
+                    $c[$v->getAnswerInputId()->toString()] = $v->getEditSection(
+                        $lng,
+                        $ff,
+                        $refinery
+                    );
+                    return $c;
+                },
+                []
+            ),
+            $this->lng->txt('add_answer_options')
+        )->withAdditionalTransformation(
+
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
new file mode 100644
index 000000000000..3705ff41969e
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Constraint;
+use ILIAS\Refinery\Transformation;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+
+class LongMenu implements Type
+{
+    private int $min_autocomplete = 3;
+
+    public function getIdentifier(): string
+    {
+        return 'long_menu';
+    }
+
+    public function withData(Data $data): self
+    {
+        if ($data->getMinAutocomplete() === null) {
+            return $this;
+        }
+
+        $clone = clone $this;
+        $clone->min_autocomplete = $data->getMinAutocomplete();
+        return $clone;
+    }
+
+    public function getEditInputs(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery
+    ): array {
+        return [
+            'answer_options' => $ff->tag(
+                $lng->txt('answer_options'),
+                []
+            )->withValue($this->buildTagsArrayFromAnswerOptions($this->answer_options)),
+            'min_autocomplete' => $ff->numeric(
+                $lng->txt('min_autocomplete')
+            )->withRequired(true)
+            ->withValue($this->min_autocomplete),
+            'options_awarding_points' => $ff->tag(
+                $lng->txt('answer_options'),
+                []
+            )->withValue(
+                array_reduce(
+                    $this->answer_options,
+                    static function (array $c, AnswerOption $v): array {
+                        if ($v->getAvailablePoints() > 0.0) {
+                            $c[] = $v->getValue();
+                        }
+                        return $c;
+                    },
+                    []
+                )
+            )
+        ];
+    }
+
+    public function getEditSectionConstraint(
+        Refinery $refinery,
+        Language $lng
+    ): ?Constraint {
+        return $refinery->custom()->constraint(
+            fn(array $v): bool => $vs['answer_options'] !== [],
+            $lng->txt('error')
+        );
+    }
+
+    public function getBuildGapTransformation(
+        Refinery $refinery,
+        Uuid $answer_input_id
+    ): Transformation {
+        return $refinery->custom()->transformation(
+            fn(array $vs): self => new self(
+                $answer_input_id,
+                $vs['min_autocomplete'],
+                $vs['answer_options']
+            )
+        );
+    }
+
+    public function addValuesToData(Data $data): Data
+    {
+        return $data->withMinAutocomplete($this->min_autocomplete);
+    }
+
+    public function getAnswerInput(): \ilFormPropertyGUI
+    {
+        ;
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
new file mode 100644
index 000000000000..e8d82f6bd9c3
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Constraint;
+use ILIAS\Refinery\Transformation;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+
+class Numeric implements Type
+{
+    private float $step_size = 0.0001;
+    private ?float $lower_limit = null;
+    private ?float $upper_limit = null;
+
+    public function getIdentifier(): string
+    {
+        return 'numeric';
+    }
+
+    public function withData(Data $data): Type
+    {
+        $clone = clone $this;
+        $clone->lower_limit = $data->getLowerLimit();
+        $clone->upper_limit = $data->getUpperLimit();
+        if ($data->getStepSize() !== null) {
+            return $this->step_size = $data->getStepSize();
+        }
+        return $clone;
+    }
+
+    public function getEditInputs(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery
+    ): array {
+        return [
+            'lower_limit' => $ff->numeric('lower_limit')
+                ->withStepSize($this->step_size)
+                ->withRequired(true)
+                ->withValue($this->lower_limit),
+            'upper_limit' => $ff->numeric('upper_limit')
+                ->withStepSize(0.00000001)
+                ->withValue($this->upper_limit),
+            'step_size' => $ff->numeric('step_size')
+                ->withStepSize($this->step_size)
+                ->withRequired(true)
+                ->withValue($this->step_size)
+        ];
+    }
+
+    public function getEditSectionConstraint(
+        Refinery $refinery,
+        Language $lng
+    ): ?Constraint {
+        return $refinery->custom()->constraint(
+            fn(array $v): bool => $vs['upper_limit'] === null
+                || $vs['upper_limit'] >= $vs['lower_limit']
+                    && $vs['upper_limit'] >= $vs['step_size'],
+            $lng->txt('error')
+        );
+    }
+
+    public function getBuildGapTransformation(
+        Refinery $refinery,
+        Uuid $answer_input_id
+    ): Transformation {
+        return $refinery->custom()->transformation(
+            fn(array $vs): self => new self(
+                $answer_input_id,
+                $vs['lower_limit'],
+                $vs['upper_limit'],
+                $vs['step_size']
+            )
+        );
+    }
+
+    public function addValuesToData(Data $data): Data
+    {
+        return $data->withLowerLimit($this->lower_limit)
+            ->withUpperLimit($this->upper_limit)
+            ->withStepSize($this->step_size);
+    }
+
+    public function getAnswerInput(): \ilFormPropertyGUI
+    {
+        ;
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
new file mode 100644
index 000000000000..b959bc8b26ea
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Constraint;
+use ILIAS\Refinery\Transformation;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+
+class Select implements Type
+{
+    private bool $shuffle_answer_options = false;
+
+    public function getIdentifier(): string
+    {
+        return 'select';
+    }
+
+    public function withData(Data $data): self
+    {
+        if ($data->getShuffleAnswerOptions() === null) {
+            return $this;
+        }
+
+        $clone = clone $this;
+        $clone->shuffle_answer_options = $data->getShuffleAnswerOptions();
+        return $clone;
+    }
+
+    public function getEditInputs(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery
+    ): array {
+        return [
+            'answer_options' => $ff->tag(
+                $lng->txt('answer_options'),
+                []
+            )->withRequired(true)
+            ->withValue($this->buildTagsArrayFromAnswerOptions($this->answer_options))
+        ];
+    }
+
+    public function getEditSectionConstraint(
+        Refinery $refinery,
+        Language $lng
+    ): ?Constraint {
+        return null;
+    }
+
+    public function getBuildGapTransformation(
+        Refinery $refinery,
+        Uuid $answer_input_id
+    ): Transformation {
+        return $refinery->custom()->transformation(
+            fn(array $vs): self => new self(
+                $answer_input_id,
+                $vs['answer_options']
+            )
+        );
+    }
+
+    public function addValuesToData(Data $data): Data
+    {
+        return $data->withShuffleAnswerOptions($this->shuffle_answer_options);
+    }
+
+    public function getAnswerInput(): \ilFormPropertyGUI
+    {
+        ;
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
new file mode 100644
index 000000000000..e306ac61918b
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Constraint;
+use ILIAS\Refinery\Transformation;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+
+class Text implements Type
+{
+    private ?int $max_chars = null;
+    private TextMatchingOptions $text_matching_method = TextMatchingOptions::CaseInsensitive;
+
+    public function getIdentifier(): string
+    {
+        return 'text';
+    }
+
+    public function withData(Data $data): self
+    {
+        $clone = clone $this;
+        $clone->max_chars = $data->getMaxChars();
+        if ($data->getTextMatchingMethod() !== null) {
+            return $clone->text_matching_method = $data->getTextMatchingMethod();
+        }
+        return $clone;
+    }
+
+    public function getEditInputs(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery
+    ): array {
+        return [
+            'answer_options' => $ff->tag(
+                $lng->txt('answer_options'),
+                []
+            )->withRequired(true)
+            ->withValue($this->buildTagsArrayFromAnswerOptions($this->answer_options)),
+            'matching_method' => $ff->select(
+                $lng->txt('matching_method'),
+                TextMatchingOptions::buildOptionsList($lng)
+            )->withRequired(true)
+            ->withValue($this->text_matching_method->value),
+            'max_chars' => $ff->numeric(
+                $lng->txt('max_chars'),
+            )->withValue($this->max_chars)
+        ];
+    }
+
+    public function getEditSectionConstraint(
+        Refinery $refinery,
+        Language $lng
+    ): ?Constraint {
+        return null;
+    }
+
+    public function getBuildGapTransformation(
+        Refinery $refinery,
+        Uuid $answer_input_id
+    ): Transformation {
+        return $refinery->custom()->transformation(
+            fn(array $vs): self => new self(
+                $answer_input_id,
+                $vs['max_chars'],
+                $vs['matching_method'],
+                $vs['answer_options']
+            )
+        );
+    }
+
+    public function addValuesToData(Data $data): Data
+    {
+        return $data->withMaxChars($this->max_chars)
+            ->withTextMatchingMethods($this->text_matching_method);
+    }
+
+    public function getAnswerInput(): \ilFormPropertyGUI
+    {
+        ;
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
new file mode 100644
index 000000000000..1b1d489c47bc
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Constraint;
+use ILIAS\Refinery\Transformation;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+
+interface Type
+{
+    public function getIdentifier(): string;
+    public function withData(Data $data): self;
+    public function getEditInputs(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery
+    ): array;
+
+    public function getEditSectionConstraint(
+        Refinery $refinery,
+        Language $lng
+    ): ?Constraint;
+
+    public function getBuildGapTransformation(
+        Refinery $refinery,
+        Uuid $answer_input_id
+    ): Transformation;
+
+    public function addValuesToData(Data $data): Data;
+
+    public function getAnswerInput(): \ilFormPropertyGUI;
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
index d9a0d42345c8..48b8894ebf2e 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
@@ -22,85 +22,55 @@
 
 use ILIAS\Questions\AnswerForm\Type as TypeInterface;
 use ILIAS\Questions\AnswerForm\Capabilities\Capability;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Edit;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Participant;
 use ILIAS\Language\Language;
 
 class Type implements TypeInterface
 {
-    private string $id;
-    private ?float $available_points = null;
-    private int $image_size = 150;
-    private bool $shuffle_answer_options = false;
-    private string $cloze_text = '';
-    private string $cloze_text_legacy = '';
-    private bool $case_sensitive = false;
-    private bool $identical_responses_valid = true;
-    private ?int $max_chars = null;
-    private int $min_autocomplete = 3;
-
-    /**
-     *
-     * @var array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Gap>
-     */
-    private array $gaps = [];
+    private Properties $properties;
 
     /**
      * @param array<string, \ILIAS\Questions\AnswerForm\Capabilities\Capability> $available_capabilities
      */
     public function __construct(
+        private readonly PropertiesFactory $properties_factory,
         private readonly Persistence $persistence,
         private readonly array $available_capabilities,
         private readonly Edit $edit_view,
         private readonly Participant $participant_view
     ) {
+        $this->properties = $this->properties_factory->buildDefault();
     }
 
     public function withData(
         string $id,
         ?float $available_points,
-        int $image_size,
-        bool $shuffle_answer_options,
+        ?int $image_size,
+        ?bool $shuffle_answer_options,
         string $additional_text,
         string $additional_text_legacy,
         ?array $data
     ): static {
-        $this->id = $id;
-        $this->available_points = $available_points;
-        $this->image_size = $image_size;
-        $this->shuffle_answer_options = $shuffle_answer_options;
-        $this->cloze_text = $additional_text;
-        $this->cloze_text_legacy = $additional_text_legacy;
-    }
-
-    public function getAvailablePoints(): ?float
-    {
-        return $this->available_points;
-    }
-
-    public function getImageSize(): int
-    {
-        return $this->image_size;
-    }
+        $this->properties = $this->properties_factory->fromData(
+            $id,
+            $additional_text,
+            $additional_text_legacy,
+            $data
+        );
 
-    public function getShuffleAnswerOptions(): bool
-    {
-        return $this->shuffle_answer_options;
-    }
-
-    public function getClozeText(): string
-    {
-        return $this->cloze_text;
     }
 
-    public function getClozeTextLegacy(): string
+    public function getLabel(Language $lng): string
     {
-        return $this->cloze_text_legacy;
+        return $lng->txt('assClozeTest');
     }
 
-    public function getLabel(Language $lng): string
+    public function getProperties(): Properties
     {
-        return $lng->txt('assClozeTest');
+        return $this->properties;
     }
 
     public function getPersistence(): Persistence
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 7466f023025d..2cde75915c28 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -21,22 +21,33 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
 
 use ILIAS\Questions\AnswerForm\Views\Edit as EditViewInterface;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Definitions\ScoringIdentical;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Type;
-use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
-use ILIAS\Questions\Question\Persistence\UpdateQuery;
+use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\HTTP\Services as HTTPServices;
 use ILIAS\Data\Factory as DataFactory;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
 use ILIAS\Refinery\Factory as Refinery;
-use Psr\Http\Message\RequestInterface;
 
 class Edit implements EditViewInterface
 {
-    private const string SET_GAP_TYPES = 'sgt';
+    private const string STEP_SET_GAP_TYPES = 'sgt';
+    private const string STEP_SET_ANSWER_OPTIONS = 'sao';
+    private const string STEP_SET_POINTS = 'sap';
+    private const string STEP_SAVE = 's';
+
+    private const string MAIN_SECTION_NAME = 'form';
+    private const string PROPERTIES_SECTION_NAME = 'properties';
 
     private ?Type $type = null;
 
@@ -44,8 +55,12 @@ public function __construct(
         private readonly Language $lng,
         private readonly UIFactory $ui_factory,
         private readonly Refinery $refinery,
-        private readonly RequestInterface $request,
-        private readonly DataFactory $data_factory
+        private readonly HTTPServices $http,
+        private readonly UuidFactory $uuid_factory,
+        private readonly DataFactory $data_factory,
+        private readonly PropertiesFactory $properties_factory,
+        private readonly ClozeTextFactory $cloze_text_factory,
+        private readonly GapFactory $gap_factory
     ) {
     }
 
@@ -53,9 +68,11 @@ public function create(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
         string $step
-    ): array|UpdateQuery {
+    ): array|ManipulateQuery {
         return match($step) {
-            self::SET_GAP_TYPES => [$this->processBasicEditingForm($url_builder, $step_token)],
+            self::STEP_SET_GAP_TYPES => $this->processBasicEditingForm($url_builder, $step_token),
+            self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm($url_builder, $step_token),
+            self::STEP_SET_POINTS => $this->processAnswerOptionsForm($url_builder, $step_token),
             default => [$this->buildBasicEditingForm($url_builder, $step_token)]
         };
     }
@@ -64,7 +81,7 @@ public function edit(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
         string $step
-    ): array|UpdateQuery {
+    ): array|ManipulateQuery {
 
     }
 
@@ -72,7 +89,7 @@ public function other(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
         string $step
-    ): array|UpdateQuery {
+    ): array|ManipulateQuery {
 
     }
 
@@ -87,34 +104,15 @@ private function buildBasicEditingForm(
         URLBuilder $url_builder,
         URLBuilderToken $step_token
     ): StandardForm {
-        $ff = $this->ui_factory->input()->field();
         return $this->ui_factory->input()->container()->form()->standard(
-            $url_builder->withParameter($step_token, self::SET_GAP_TYPES)->buildURI()->__toString(),
+            $url_builder->withParameter($step_token, self::STEP_SET_GAP_TYPES)->buildURI()->__toString(),
             [
-                'form' => $ff->section(
-                    [
-                        'cloze_text' => $ff->markdown(
-                            new \ilUIMarkdownPreviewGUI(),
-                            $this->lng->txt('cloze_text')
-                        )->withRequired(true)
-                        ->withValue($this->type->getClozeText()),
-                        'matching_method' => $ff->select(
-                            $this->lng->txt('text_rating'),
-                            TextMatchingOptions::buildOptionsList($this->lng)
-                        )->withRequired(true)
-                        ->withValue($this->type->getMatchingMethod()->value),
-                        'min_autocomplete' => $ff->numeric($this->lng->txt('min_auto_complete'))
-                            ->withRequired(true)
-                            ->withValue($this->type->getAutocompleteLength()),
-                        'identical_responses' => $ff->select(
-                            $this->lng->txt('scoring_of_identical_responses'),
-                            ScoringIdentical::buildOptionsList($this->lng)
-                        )->withRequired(true)
-                        ->withValue($this->type->getScoringIdentical()->value),
-                        'max_chars' => $ff->numeric($this->lng->txt('cloze_fixed_textlength')),
-                        'enable_combinations' => $ff->checkbox($this->lng->txt('cloze_enable_combinations'))
-                    ],
-                    $this->lng->txt('create_answer_form')
+                self::MAIN_SECTION_NAME => $this->type->getProperties()->buildBasicEditingInputs(
+                    $this->lng,
+                    $this->ui_factory->input()->field(),
+                    $this->refinery,
+                    $this->properties_factory,
+                    $this->cloze_text_factory
                 )
             ]
         )->withSubmitLabel($this->lng->txt('next'));
@@ -123,13 +121,165 @@ private function buildBasicEditingForm(
     private function processBasicEditingForm(
         URLBuilder $url_builder,
         URLBuilderToken $step_token
+    ): array {
+        $form = $this->buildBasicEditingForm($url_builder, $step_token)->withRequest($this->http->request());
+        $data = $form->getData();
+        if ($data === null) {
+            return [$form];
+        }
+
+        return $this->buildOutputWithPanel(
+            $this->buildGapTypesForm($url_builder, $step_token, $data['form']),
+            $data[self::MAIN_SECTION_NAME]->getClozeText()
+        );
+    }
+
+    private function buildOutputWithPanel(
+        StandardForm $form,
+        ClozeText $cloze_text
+    ): array {
+        return [
+            $this->ui_factory->panel()->standard(
+                $this->lng->txt('cloze_text'),
+                $this->ui_factory->legacy()->content($cloze_text->getRenderedMarkdown())
+            ),
+            $form
+        ];
+    }
+
+    private function buildGapTypesForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        Properties $properties
+    ): StandardForm {
+        $ff = $this->ui_factory->input()->field();
+        $gaps = $properties->getClozeText()->extractGapsFromMarkdown($properties->getGaps());
+        return $this->ui_factory->input()->container()->form()->standard(
+            $url_builder->withParameter($step_token, self::STEP_SET_ANSWER_OPTIONS)->buildURI()->__toString(),
+            [
+                self::MAIN_SECTION_NAME => $properties->getGaps()->buildGapsTypeInputs($this->lng, $ff),
+                self::PROPERTIES_SECTION_NAME => $properties
+                    ->withClozeText(
+                        $properties->getClozeText()->addIdsOfNewGapsToClozeText($gaps)
+                    )->buildBasicEditingInputsHidden($ff)
+                    ->withDedicatedName(self::PROPERTIES_SECTION_NAME)
+
+            ]
+        )->withSubmitLabel($this->lng->txt('next'));
+    }
+
+    private function processGapTypesForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): array {
+        $properties = $this->retrievePropertiesFromPost();
+        $form = $this->buildGapTypesForm(
+            $url_builder,
+            $step_token,
+            $properties
+        )->withRequest($this->http->request());
+        $data = $form->getData();
+        if ($data === null) {
+            return [$form];
+        }
+
+        return $this->buildOutputWithPanel(
+            $this->buildAnswerOptionsForm($url_builder, $step_token, $properties, $data[self::MAIN_SECTION_NAME]),
+            $properties->getClozeText()
+        );
+    }
+
+    private function buildAnswerOptionsForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        Properties $properties,
+        array $data
     ): StandardForm {
-        $form = $this->buildBasicEditingForm($url_builder, $step_token)->withRequest($this->request);
+        $ff = $this->ui_factory->input()->field();
+        return $this->ui_factory->input()->container()->form()->standard(
+            $url_builder->withParameter($step_token, self::STEP_SET_POINTS)->buildURI()->__toString(),
+            [
+                self::MAIN_SECTION_NAME => $properties->getGaps()->buildAnswerOptionsInputs($this->lng, $ff),
+                self::PROPERTIES_SECTION_NAME => $properties->buildBasicEditingInputsHidden($ff)
+                    ->withDedicatedName(self::PROPERTIES_SECTION_NAME)
+            ]
+        )->withSubmitLabel($this->lng->txt('next'));
+    }
+
+    private function processAnswerOptionsForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): array {
+        $properties = $this->retrievePropertiesFromPost();
+        $form = $this->buildAnswerOptionsForm(
+            $url_builder,
+            $step_token,
+            $properties
+        )->withRequest($this->http->request());
         $data = $form->getData();
         if ($data === null) {
-            return $form;
+            return [$form];
         }
 
-        $this->buildGapTypesForm($url_builder, $step_token, $data);
+        return $this->buildOutputWithPanel(
+            $this->buildAssignPointsForm(
+                $url_builder,
+                $step_token,
+                $properties->withGaps(data[self::MAIN_SECTION_NAME])
+            ),
+            $properties->getClozeText()
+        );
+    }
+
+    private function buildAssignPointsForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        Properties $properties
+    ): StandardForm {
+        $gaps = $properties->getGaps();
+        $ff = $this->ui_factory->input()->field();
+        return $this->ui_factory->input()->container()->form()->standard(
+            $url_builder->withParameter($step_token, self::STEP_SAVE)->buildURI()->__toString(),
+            [
+                self::MAIN_SECTION_NAME => $ff->section(
+                    array_reduce(
+                        array_keys($data),
+                        function (array $c, string $v) use ($ff, $cloze_text, $data): array {
+                            $answer_input_id = $this->uuid_factory->fromString($v);
+                            $gap = $this->gap_factory->getEmptyGapByIdentifier($data[$v])
+                                ->withAnswerInputId($answer_input_id);
+                            if ($gap === null) {
+                                return $c;
+                            }
+                            $c[$v] = $gap->getEditSection(
+                                $this->lng,
+                                $this->ui_factory->input()->field(),
+                                $this->refinery,
+                                $cloze_text->buildShortenedGapName($answer_input_id)
+                            );
+                            return $c;
+                        },
+                        []
+                    ),
+                    $this->lng->txt('add_answer_options')
+                ),
+                self::PROPERTIES_SECTION_NAME => $properties->buildBasicEditingInputsHidden($ff)
+                    ->withDedicatedName(self::PROPERTIES_SECTION_NAME)
+            ]
+        )->withSubmitLabel($this->lng->txt('save'));
+    }
+
+    private function retrievePropertiesFromPost(): Properties
+    {
+        $properties = $this->type->getProperties();
+        return $this->properties_factory->fromPost(
+            $this->refinery,
+            $this->http->wrapper()->post(),
+            'form/' . self::PROPERTIES_SECTION_NAME,
+            $properties->getAnswerFormId(),
+            $properties->getLegacyClozeText(),
+            $properties->getScoringOfIdenticalResponses(),
+            $properties->areCombinationsActivated()
+        );
     }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Edit.php b/components/ILIAS/Questions/src/Presentation/Edit.php
index d1a34eb596f6..bcd7978a5f3c 100644
--- a/components/ILIAS/Questions/src/Presentation/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Edit.php
@@ -339,7 +339,6 @@ private function processCreateAnswerForm(
         return $this->forwardCreateAnswerFormCmd(
             $data['form_type'],
             $url_builder->withParameter($type_hash_token, $this->answer_form_types_factory->getHashedClass($data['form_type']::class)),
-            $action_token,
             $step_token
         );
     }
diff --git a/components/ILIAS/Questions/src/Presentation/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/QuestionsTable.php
index 6e9f170d3add..39bb97834356 100644
--- a/components/ILIAS/Questions/src/Presentation/QuestionsTable.php
+++ b/components/ILIAS/Questions/src/Presentation/QuestionsTable.php
@@ -99,8 +99,9 @@ public function getRows(
         array $visible_column_ids,
         Range $range,
         Order $order,
-        ?array $filter_data,
-        ?array $additional_parameters
+        mixed $additional_viewcontrol_data,
+        mixed $filter_data,
+        mixed $additional_parameters
     ): \Generator {
         foreach ($this->questions_repository->getAllQuestions() as $question) {
             yield $question->toTableRow(
@@ -113,8 +114,9 @@ public function getRows(
     }
 
     public function getTotalRowCount(
-        ?array $filter_data,
-        ?array $additional_parameters
+        mixed $additional_viewcontrol_data,
+        mixed $filter_data,
+        mixed $additional_parameters
     ): ?int {
         return 0;
     }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/UpdateQuery.php b/components/ILIAS/Questions/src/Question/Persistence/ManipulateQuery.php
similarity index 98%
rename from components/ILIAS/Questions/src/Question/Persistence/UpdateQuery.php
rename to components/ILIAS/Questions/src/Question/Persistence/ManipulateQuery.php
index f77e4956cac4..66880fdc2096 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/UpdateQuery.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/ManipulateQuery.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\Question\Persistence;
 
-class UpdateQuery
+class ManipulateQuery
 {
     private array $tables = [];
     private array $columns = [];
diff --git a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
index 188fa167e16b..962a6123d8df 100644
--- a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
@@ -46,25 +46,15 @@ public function step_1(): void
                     'length' => 64,
                     'notnull' => true
                 ],
-                 'case_sensitive' => [
-                    'type' => \ilDBConstants::T_INTEGER,
-                    'length' => 1,
+                 'scoring_identical_responses' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 32,
                     'notnull' => true
                 ],
-                 'identical_responses_valid' => [
+                'combinations_activated' => [
                     'type' => \ilDBConstants::T_INTEGER,
                     'length' => 1,
                     'notnull' => true
-                ],
-                 'max_chars' => [
-                    'type' => \ilDBConstants::T_INTEGER,
-                    'length' => 2,
-                    'notnull' => false
-                ],
-                 'min_autocomplete' => [
-                    'type' => \ilDBConstants::T_INTEGER,
-                    'length' => 1,
-                    'notnull' => false
                 ]
             ]);
         }
@@ -94,10 +84,37 @@ public function step_2(): void
                     'length' => 32,
                     'notnull' => true
                 ],
-                 'max_chars' => [
+                'max_chars' => [
                     'type' => \ilDBConstants::T_INTEGER,
                     'length' => 2,
                     'notnull' => false
+                ],
+                'step_size' => [
+                    'type' => \ilDBConstants::T_FLOAT,
+                    'notnull' => false
+                ],
+                'text_matching_method' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 32,
+                    'notnull' => false
+                ],
+                'min_autocomplete' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 2,
+                    'notnull' => false
+                ],
+                'shuffle_answer_options' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 1,
+                    'notnull' => false
+                ],
+                'lower_limit' => [
+                    'type' => \ilDBConstants::T_FLOAT,
+                    'notnull' => false
+                ],
+                'upper_limit' => [
+                    'type' => \ilDBConstants::T_FLOAT,
+                    'notnull' => false
                 ]
             ]);
         }

From eb938fd8acca8ad228a1f26d84f7b6ddc500336e Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 13 Nov 2025 13:02:52 +0100
Subject: [PATCH 083/141] Test: Implement Cloze Question

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       | 16 +++--
 .../Cloze/Properties/AnswerForm/Factory.php   |  4 +-
 .../Properties/AnswerForm/Properties.php      |  3 +-
 .../Cloze/Properties/ClozeText/Factory.php    |  1 -
 .../Cloze/Properties/ClozeText/Text.php       | 70 +++++++++++--------
 .../Cloze/Properties/Gaps/Factory.php         | 12 +++-
 .../Cloze/Properties/Gaps/Gap.php             | 13 ++--
 .../Cloze/Properties/Gaps/Gaps.php            | 31 +++++---
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 19 +++--
 9 files changed, 110 insertions(+), 59 deletions(-)

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index bf3208872f0b..4fd32cb4a67a 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -81,12 +81,16 @@ protected static function buildDIC(ILIASContainer $DIC): self
                 $c[UuidFactory::class],
                 $c[DataFactory::class]->text()
             );
-        $dic[Cloze\Properties\Gaps\Factory::class] = static fn($c): Cloze\Properties\Gaps\Factory => new Cloze\Properties\Gaps\Factory([
-            new Cloze\Properties\Gaps\Text(),
-            new Cloze\Properties\Gaps\Numeric(),
-            new Cloze\Properties\Gaps\Select(),
-            new Cloze\Properties\Gaps\LongMenu()
-        ]);
+        $dic[Cloze\Properties\Gaps\Factory::class] = static fn($c): Cloze\Properties\Gaps\Factory =>
+            new Cloze\Properties\Gaps\Factory(
+                $c[UuidFactory::class],
+                [
+                    new Cloze\Properties\Gaps\Text(),
+                    new Cloze\Properties\Gaps\Numeric(),
+                    new Cloze\Properties\Gaps\Select(),
+                    new Cloze\Properties\Gaps\LongMenu()
+                ]
+            );
         $dic[Cloze\Properties\AnswerForm\Factory::class] = static fn($c): Cloze\Properties\AnswerForm\Factory
             => new Cloze\Properties\AnswerForm\Factory(
                 $c[Cloze\Properties\ClozeText\Factory::class],
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
index 1f419d91647c..e3e09d301122 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
@@ -59,6 +59,7 @@ public function fromForm(
         return new Properties(
             $answer_form_id,
             $cloze_text,
+            $cloze_text->getGaps(),
             $legacy_cloze_text,
             $scoring_of_identical_responses,
             $combinations_enabled
@@ -105,7 +106,8 @@ public function buildDefault(): Properties
     {
         return new Properties(
             null,
-            $this->cloze_text_factory->buildFromTextString('')
+            $this->cloze_text_factory->buildFromTextString(''),
+            $this->gaps_factory->getEmptyGapsObject()
         );
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
index 3c0f26b2ce4b..cffe3ff344d2 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
@@ -107,7 +107,8 @@ public function buildBasicEditingInputs(
                 self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getInput(
                     $lng,
                     $ff,
-                    $cloze_text_factory
+                    $cloze_text_factory,
+                    $this->gaps
                 ),
                 self::FORM_KEY_IDENTICAL_SCORING => ScoringIdentical::buildInput(
                     $lng,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
index 892d37175d3c..38a11609da62 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
@@ -40,7 +40,6 @@ public function buildFromTextString(string $text): Text
         return new Text(
             $this->refinery,
             $this->mustache_engine,
-            $this->uuid_factory,
             $this->text_factory,
             $this->text_factory->markdown($text)
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index ecb2e9a72450..3d18820ae1bc 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -21,6 +21,7 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText;
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
 use ILIAS\Data\Text\Markdown;
 use ILIAS\Data\Text\Factory as TextFactory;
 use ILIAS\Data\UUID\Uuid;
@@ -33,6 +34,8 @@
 
 class Text
 {
+    private ?Gaps $gaps = null;
+
     public function __construct(
         private readonly Refinery $refinery,
         private readonly Engine $mustache_engine,
@@ -44,20 +47,22 @@ public function __construct(
     public function getInput(
         Language $lng,
         FieldFactory $ff,
-        Factory $cloze_text_factory
+        Factory $cloze_text_factory,
+        Gaps $current_gaps
     ): MarkdownInput {
         return $ff->markdown(
             new \ilUIMarkdownPreviewGUI(),
             $lng->txt('cloze_text')
-        )->withMustacheVAriables([
-            'GAP' => $lng->txt('gap')
+        )->withMustacheVariables([
+            Gap::GAP_PLACEHOLDER_NAME => $lng->txt('gap')
         ])->withAdditionalTransformation(
             $this->refinery->custom()->transformation(
                 fn(string $v): self => $cloze_text_factory->buildFromTextString($v)
+                    ->withGapsFromMarkdown($current_gaps)
             )
         )->withAdditionalTransformation(
             $this->refinery->custom()->constraint(
-                fn(self $v): bool => $v->hasAtLeastOneGap(),
+                fn(self $v): bool => $v->getGaps()->hasAtLeastOneGap(),
                 $lng->txt('no_gaps')
             )
         )->withRequired(true)
@@ -69,43 +74,43 @@ public function getHiddenInput(FieldFactory $ff): HiddenInput
         return $ff->hidden()->withValue($this->getTextForOutputInHiddenInput());
     }
 
-    public function getRenderedMarkdown(): string
-    {
+    public function getRenderedMarkdown(
+        Gaps $gaps
+    ): string {
         return $this->mustache_engine->render(
             $this->cloze_text->getRawRepresentation(),
-            array_reduce(
-                $this->getAllGaps(),
-                function (array $c, Uuid $v): array {
-                    $c[$this->buildGapPlaceholderNameWithId($v)] = $this->buildShortenedGapRepresentation($v);
-                    return $c;
-                },
-                []
-            )
+            $gaps->getPlaceholderArrayForPreview()
         );
     }
 
-    public function hasAtLeastOneGap(): bool
+    public function getGaps(): Gaps
     {
-        return $this->new_gaps + $this->preexisting_gaps !== [];
+        if ($this->gaps === null) {
+            throw new \Exception('You have to call `self::withGapsFromMarkdown()` first to initialize gaps.');
+        }
+
+        return $this->gaps;
     }
 
-    public function extractGapsFromMarkdown(
-        Gaps $existing_gaps
-    ): array {
+    public function withGapsFromMarkdown(
+        Gaps $pre_existing_gaps
+    ): self {
+        $clone = clone $this;
         if ($this->cloze_text->getRawRepresentation() === '') {
-            return $existing_gaps->withResetGaps();
+            $clone->gaps = $pre_existing_gaps->withResetGaps();
+            return $clone;
         }
 
         $position = 0;
-        return array_reduce(
+        $clone->gaps = array_reduce(
             $this->mustache_engine->getTokenizer()->scan($this->cloze_text->getRawRepresentation()),
             function (Gaps $c, array $v) use (&$position): Gaps {
                 if ($v['type'] !== '_v'
-                    || !str_starts_with($v['name'], 'GAP')) {
+                    || !str_starts_with($v['name'], Gap::GAP_PLACEHOLDER_NAME)) {
                     return $c;
                 }
 
-                if ($v['name'] === 'GAP') {
+                if ($v['name'] === Gap::GAP_PLACEHOLDER_NAME) {
                     return $c->withNewGap();
                 }
 
@@ -117,20 +122,29 @@ function (Gaps $c, array $v) use (&$position): Gaps {
 
                 return $c->withUpdatedGap($gap);
             },
-            $existing_gaps
+            $pre_existing_gaps
+        );
+        $clone->cloze_text = $this->addIdsOfNewGapsToClozeText(
+            $clone->cloze_text,
+            $clone->gaps->getUndefinedGaps()
         );
+
+        return $clone;
     }
 
-    public function addIdsOfNewGapsToClozeText(Gaps $gaps): Markdown
+    private function addIdsOfNewGapsToClozeText(Markdown $cloze_text, array $new_gaps): Markdown
     {
-        $new_gaps = $gaps->getUndefinedGaps();
+        if ($new_gaps === []) {
+            return $cloze_text;
+        }
+
         return $this->text_factory->markdown(
             mb_ereg_replace_callback(
-                $this->buildGapPlaceholder(),
+                '{{' . Gap::GAP_PLACEHOLDER_NAME . '}}',
                 function (array $matches) use (&$new_gaps): string {
                     return array_shift($new_gaps)->getGapPlaceholder();
                 },
-                $this->cloze_text->getRawRepresentation()
+                $cloze_text->getRawRepresentation()
             )
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index 7c93e8dc43f3..3585dc7849a1 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -41,11 +41,11 @@ public function getAvailableGapTypesOptionsArray(
     ): array {
         return array_map(
             fn(string $v) => $lng->txt("{$v}_gap"),
-            array_keys($this->available_gap_type_classes)
+            array_keys($this->available_gap_types)
         );
     }
 
-    public function getNewGap(): ?Undefined
+    public function getNewGap(): Gap
     {
         return new Gap(
             $this->uuid_factory->uuid4()
@@ -65,6 +65,14 @@ public function getGapOfType(
         );
     }
 
+    public function getEmptyGapsObject(): Gaps
+    {
+        return new Gaps(
+            $this,
+            []
+        );
+    }
+
     /**
      * @return array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap>
      */
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index 22e04976d286..18a6afbedbb1 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -31,7 +31,7 @@
 
 class Gap
 {
-    private const string GAP_PLACEHOLDER_NAME = 'GAP';
+    public const string GAP_PLACEHOLDER_NAME = 'GAP';
 
     public function __construct(
         private Uuid $answer_input_id,
@@ -55,18 +55,19 @@ public function withAnswerInputId(Uuid $answer_input_id): self
         return $clone;
     }
 
-    public function getGapPlaceholder(): string
+    public function isUndefined(): bool
     {
-        if ($this->answer_input_id === null) {
-            return '{{' . self::GAP_PLACEHOLDER_NAME . '}}';
-        }
+        return $this->type === null;
+    }
 
+    public function getGapPlaceholder(): string
+    {
         return "{{{$this->buildGapPlaceholderNameWithId()}}}";
     }
 
     public function getShortenedGapName(): string
     {
-        return self::GAP_PLACEHOLDER_NAME . '_' . mb_substr($this->answer_input_id, 0, 4);
+        return self::GAP_PLACEHOLDER_NAME . '_' . mb_substr($this->answer_input_id->toString(), 0, 4);
     }
 
     public function getShortenedGapRepresentation(): string
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 71545507c25b..b2efec7678a6 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -20,12 +20,9 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\Question\Persistence\ManipulateQuery;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\Refinery\Constraint;
-use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
 
@@ -47,11 +44,16 @@ public function getGapByTagName(string $tag_name): ?Gap
         return $this->gaps[mb_substr($v['name'], 4)] ?? null;
     }
 
+    public function hasAtLeastOneGap(): bool
+    {
+        return $this->gaps !== [];
+    }
+
     public function withNewGap(): self
     {
         $new_gap = $this->factory->getNewGap();
         $clone = clone $this;
-        $clone->gaps[$new_gap->getAnswerInputId()] = $new_gap;
+        $clone->gaps[$new_gap->getAnswerInputId()->toString()] = $new_gap;
         return $clone;
     }
 
@@ -70,22 +72,35 @@ public function getUndefinedGaps(): array
     {
         return array_filter(
             $this->gaps,
-            fn(Gap $v): bool => $v instanceof Undefined
+            fn(Gap $v): bool => $v->isUndefined()
+        );
+    }
+
+    public function getPlaceholderArrayForPreview()
+    {
+        array_reduce(
+            $this->gaps,
+            function (array $c, Gap $v): array {
+                $c[$v->buildGapPlaceholderNameWithId($v)] = $v->buildShortenedGapRepresentation($v);
+                return $c;
+            },
+            []
         );
     }
 
     public function buildGapsTypeInputs(
         Language $lng,
         FieldFactory $ff,
-        Refinery $refinery
+        Refinery $refinery,
+        array $available_gap_types
     ): Section {
         return $ff->section(
             array_reduce(
                 $this->gaps,
-                function (array $c, Gap $v) use ($ff): array {
+                function (array $c, Gap $v) use ($ff, $available_gap_types): array {
                     $c[$v->getAnswerInputId()->toString()] = $ff->select(
                         $v->getShortenedGapName(),
-                        $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng)
+                        $available_gap_types
                     )->withRequired(true);
                     return $c;
                 },
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 2cde75915c28..81b9c6a09cbf 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -141,7 +141,11 @@ private function buildOutputWithPanel(
         return [
             $this->ui_factory->panel()->standard(
                 $this->lng->txt('cloze_text'),
-                $this->ui_factory->legacy()->content($cloze_text->getRenderedMarkdown())
+                $this->ui_factory->legacy()->content(
+                    $cloze_text->getRenderedMarkdown(
+                        $cloze_text->getGaps()
+                    )
+                )
             ),
             $form
         ];
@@ -153,15 +157,18 @@ private function buildGapTypesForm(
         Properties $properties
     ): StandardForm {
         $ff = $this->ui_factory->input()->field();
-        $gaps = $properties->getClozeText()->extractGapsFromMarkdown($properties->getGaps());
         return $this->ui_factory->input()->container()->form()->standard(
             $url_builder->withParameter($step_token, self::STEP_SET_ANSWER_OPTIONS)->buildURI()->__toString(),
             [
-                self::MAIN_SECTION_NAME => $properties->getGaps()->buildGapsTypeInputs($this->lng, $ff),
+                self::MAIN_SECTION_NAME => $properties->getGaps()->buildGapsTypeInputs(
+                    $this->lng,
+                    $ff,
+                    $this->refinery,
+                    $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng)
+                ),
                 self::PROPERTIES_SECTION_NAME => $properties
-                    ->withClozeText(
-                        $properties->getClozeText()->addIdsOfNewGapsToClozeText($gaps)
-                    )->buildBasicEditingInputsHidden($ff)
+                    ->withClozeText($properties->getClozeText())
+                    ->buildBasicEditingInputsHidden($ff)
                     ->withDedicatedName(self::PROPERTIES_SECTION_NAME)
 
             ]

From 05970207420b5ff9868c0aeaab948091f75378be Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 17 Nov 2025 14:53:44 +0100
Subject: [PATCH 084/141] Test: Implement Cloze Question

---
 .../Cloze/Properties/AnswerForm/Factory.php   |  3 ++
 .../Properties/AnswerForm/Properties.php      | 19 +++++--
 .../Cloze/Properties/ClozeText/Text.php       | 53 +++++++++----------
 .../Cloze/Properties/Gaps/Gap.php             | 41 +++++++-------
 .../Cloze/Properties/Gaps/Gaps.php            | 46 ++++++++++++----
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 19 ++++---
 6 files changed, 115 insertions(+), 66 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
index e3e09d301122..360f81d7bb02 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
@@ -24,6 +24,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Refinery\Factory as Refinery;
@@ -71,6 +72,7 @@ public function fromPost(
         ArrayBasedRequestWrapper $post_wrapper,
         string $form_input_path,
         ?Uuid $answer_form_id,
+        Gaps $gaps,
         string $legacy_cloze_text,
         ScoringIdentical $default_scoring_identical
     ): Properties {
@@ -96,6 +98,7 @@ public function fromPost(
         return new Properties(
             $answer_form_id,
             $cloze_text,
+            $cloze_text->updateGapsFromMarkdown($gaps),
             $legacy_cloze_text,
             $scoring_of_identical_responses,
             $combinations_enabled
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
index cffe3ff344d2..b39e28393c4a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
@@ -37,6 +37,7 @@ class Properties
     public const string FORM_KEY_CLOZE_TEXT = 'cloze_text';
     public const string FORM_KEY_IDENTICAL_SCORING = 'identical_scoring';
     public const string FORM_KEY_ENABLE_COMBINATIONS = 'enable_combinations';
+    public const string FORM_KEY_GAPS_TO_EDIT = 'gaps';
 
     /**
      * @param array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Gap> $gaps
@@ -95,6 +96,17 @@ public function withGaps(array $gaps): self
         return $clone;
     }
 
+    public function withNewGapsFromClozeText(): self
+    {
+        $clone = clone $this;
+        $clone->gaps = $clone->cloze_text->updateGapsFromMarkdown($this->gaps);
+        $clone->cloze_text = $this->addIdsOfNewGapsToClozeText(
+            $clone->cloze_text,
+            $clone->gaps->getUndefinedGaps()
+        );
+        return $clone;
+    }
+
     public function buildBasicEditingInputs(
         Language $lng,
         FieldFactory $ff,
@@ -107,8 +119,7 @@ public function buildBasicEditingInputs(
                 self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getInput(
                     $lng,
                     $ff,
-                    $cloze_text_factory,
-                    $this->gaps
+                    $cloze_text_factory
                 ),
                 self::FORM_KEY_IDENTICAL_SCORING => ScoringIdentical::buildInput(
                     $lng,
@@ -123,7 +134,7 @@ public function buildBasicEditingInputs(
         )->withAdditionalTransformation(
             $refinery->custom()->transformation(
                 fn(array $vs): self => $propteries_factory->fromForm(
-                    $this->answer_form_id,
+                    $this,
                     $vs[self::FORM_KEY_CLOZE_TEXT],
                     $this->legacy_cloze_text,
                     $vs[self::FORM_KEY_IDENTICAL_SCORING],
@@ -140,6 +151,8 @@ public function buildBasicEditingInputsHidden(
             [
                 self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getHiddenInput($ff)
                     ->withDedicatedName(self::FORM_KEY_CLOZE_TEXT),
+                self::FORM_KEY_GAPS_TO_EDIT => $this->gaps->getHiddenInput($ff)
+                    ->withDedicatedName(self::FORM_KEY_GAPS_TO_EDIT),
                 self::FORM_KEY_IDENTICAL_SCORING => $ff->hidden()
                     ->withDedicatedName(self::FORM_KEY_IDENTICAL_SCORING)
                     ->withValue($this->getScoringOfIdenticalResponses()->value),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 3d18820ae1bc..5390c8b572a1 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -24,7 +24,6 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
 use ILIAS\Data\Text\Markdown;
 use ILIAS\Data\Text\Factory as TextFactory;
-use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
@@ -34,8 +33,6 @@
 
 class Text
 {
-    private ?Gaps $gaps = null;
-
     public function __construct(
         private readonly Refinery $refinery,
         private readonly Engine $mustache_engine,
@@ -47,8 +44,7 @@ public function __construct(
     public function getInput(
         Language $lng,
         FieldFactory $ff,
-        Factory $cloze_text_factory,
-        Gaps $current_gaps
+        Factory $cloze_text_factory
     ): MarkdownInput {
         return $ff->markdown(
             new \ilUIMarkdownPreviewGUI(),
@@ -58,11 +54,10 @@ public function getInput(
         ])->withAdditionalTransformation(
             $this->refinery->custom()->transformation(
                 fn(string $v): self => $cloze_text_factory->buildFromTextString($v)
-                    ->withGapsFromMarkdown($current_gaps)
             )
         )->withAdditionalTransformation(
             $this->refinery->custom()->constraint(
-                fn(self $v): bool => $v->getGaps()->hasAtLeastOneGap(),
+                fn(self $v): bool => $v->hasAtLeastOneGap(),
                 $lng->txt('no_gaps')
             )
         )->withRequired(true)
@@ -83,26 +78,15 @@ public function getRenderedMarkdown(
         );
     }
 
-    public function getGaps(): Gaps
-    {
-        if ($this->gaps === null) {
-            throw new \Exception('You have to call `self::withGapsFromMarkdown()` first to initialize gaps.');
-        }
-
-        return $this->gaps;
-    }
-
-    public function withGapsFromMarkdown(
+    public function updateGapsFromMarkdown(
         Gaps $pre_existing_gaps
-    ): self {
-        $clone = clone $this;
+    ): Gaps {
         if ($this->cloze_text->getRawRepresentation() === '') {
-            $clone->gaps = $pre_existing_gaps->withResetGaps();
-            return $clone;
+            return $pre_existing_gaps->withResetGaps();
         }
 
         $position = 0;
-        $clone->gaps = array_reduce(
+        return array_reduce(
             $this->mustache_engine->getTokenizer()->scan($this->cloze_text->getRawRepresentation()),
             function (Gaps $c, array $v) use (&$position): Gaps {
                 if ($v['type'] !== '_v'
@@ -124,15 +108,9 @@ function (Gaps $c, array $v) use (&$position): Gaps {
             },
             $pre_existing_gaps
         );
-        $clone->cloze_text = $this->addIdsOfNewGapsToClozeText(
-            $clone->cloze_text,
-            $clone->gaps->getUndefinedGaps()
-        );
-
-        return $clone;
     }
 
-    private function addIdsOfNewGapsToClozeText(Markdown $cloze_text, array $new_gaps): Markdown
+    public function addIdsOfNewGapsToClozeText(Markdown $cloze_text, array $new_gaps): Markdown
     {
         if ($new_gaps === []) {
             return $cloze_text;
@@ -149,6 +127,23 @@ function (array $matches) use (&$new_gaps): string {
         );
     }
 
+    private function hasAtLeastOneGap(): bool
+    {
+        if ($this->cloze_text->getRawRepresentation() === '') {
+            return false;
+        }
+
+        foreach ($this->mustache_engine->getTokenizer()
+            ->scan($this->cloze_text->getRawRepresentation()) as $token) {
+            if ($token['type'] === '_v'
+                || str_starts_with($token['name'], Gap::GAP_PLACEHOLDER_NAME)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private function getTextForOutputInHiddenInput(): string
     {
         return str_replace(['{{', '}}'], ['&#123;&#123;', '&#125;&#125;'], $this->cloze_text->getRawRepresentation());
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index 18a6afbedbb1..ef4046cb890f 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -24,8 +24,6 @@
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\Refinery\Constraint;
-use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
 
@@ -33,6 +31,9 @@ class Gap
 {
     public const string GAP_PLACEHOLDER_NAME = 'GAP';
 
+    private const string FORM_KEY_INPUT_ID = 'input_id';
+    private const string FORM_KEY_TYPE = 'type';
+
     public function __construct(
         private Uuid $answer_input_id,
         private ?Type $type = null,
@@ -65,47 +66,49 @@ public function getGapPlaceholder(): string
         return "{{{$this->buildGapPlaceholderNameWithId()}}}";
     }
 
-    public function getShortenedGapName(): string
+    public function buildShortenedGapName(): string
     {
         return self::GAP_PLACEHOLDER_NAME . '_' . mb_substr($this->answer_input_id->toString(), 0, 4);
     }
 
-    public function getShortenedGapRepresentation(): string
+    public function buildShortenedGapRepresentation(): string
     {
         return "[{$this->buildShortenedGapName()}]";
     }
 
+    public function buildGapPlaceholderNameWithId(): string
+    {
+        return self::GAP_PLACEHOLDER_NAME . '_' . $this->answer_input_id->toString();
+    }
+
     public function getEditSection(
         Language $lng,
         FieldFactory $ff,
         Refinery $refinery
     ): Section {
         $section = $ff->section(
-            $this->getEditInputs($lng, $ff, $refinery),
-            "{$this->getShortenedGapName()} ({$lng->txt("{$this->getIdentifier()}_gap")})"
+            $this->type->getEditInputs($lng, $ff, $refinery),
+            "{$this->buildShortenedGapName()} ({$lng->txt("{$this->getIdentifier()}_gap")})"
         );
 
-        $edit_section_constraint = $this->getEditSectionConstraint($refinery, $lng);
+        $edit_section_constraint = $this->type->getEditSectionConstraint($refinery, $lng);
         if ($edit_section_constraint !== null) {
             $section = $section->withAdditionalTransformation($edit_section_constraint);
         }
 
 
         return $section->withAdditionalTransformation(
-            $this->getBuildGapTransformation($refinery, $this->answer_input_id)
+            $this->type->getBuildGapTransformation($refinery, $this->answer_input_id)
         );
     }
 
-    protected function buildTagsArrayfromAnswerOptions(array $answer_options): array
-    {
-        return array_map(
-            fn(AnswerOption $v): string => $v->getValue(),
-            $answer_options
-        );
-    }
-
-    private function buildGapPlaceholderNameWithId(): string
-    {
-        return self::GAP_PLACEHOLDER_NAME . '_' . $this->answer_input_id->toString();
+    public function getHiddenInput(
+        FieldFactory $ff,
+        Refinery $refinery
+    ): Group {
+        return $ff->group([
+            self::FORM_KEY_INPUT_ID => $this->answer_input_id->toString(),
+            self::FORM_KEY_TYPE => $this->type?->getIdentifier() ?? ''
+        ]);
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index b2efec7678a6..94ef7f6660dd 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -41,7 +41,7 @@ public function getGapById(Uuid $gap_id): ?Gap
 
     public function getGapByTagName(string $tag_name): ?Gap
     {
-        return $this->gaps[mb_substr($v['name'], 4)] ?? null;
+        return $this->gaps[mb_substr($tag_name, 4)] ?? null;
     }
 
     public function hasAtLeastOneGap(): bool
@@ -49,6 +49,13 @@ public function hasAtLeastOneGap(): bool
         return $this->gaps !== [];
     }
 
+    public function withGap(Gap $gap): self
+    {
+        $clone = clone $this;
+        $clone->gaps[$gap->getAnswerInputId()->toString()] = $gap;
+        return $clone;
+    }
+
     public function withNewGap(): self
     {
         $new_gap = $this->factory->getNewGap();
@@ -60,7 +67,7 @@ public function withNewGap(): self
     public function withResetGaps(): self
     {
         if ($this->gaps === []) {
-            return self;
+            return $this;
         }
 
         $clone = clone $this;
@@ -76,9 +83,9 @@ public function getUndefinedGaps(): array
         );
     }
 
-    public function getPlaceholderArrayForPreview()
+    public function getPlaceholderArrayForPreview(): array
     {
-        array_reduce(
+        return array_reduce(
             $this->gaps,
             function (array $c, Gap $v): array {
                 $c[$v->buildGapPlaceholderNameWithId($v)] = $v->buildShortenedGapRepresentation($v);
@@ -96,10 +103,10 @@ public function buildGapsTypeInputs(
     ): Section {
         return $ff->section(
             array_reduce(
-                $this->gaps,
+                $this->getUndefinedGaps(),
                 function (array $c, Gap $v) use ($ff, $available_gap_types): array {
                     $c[$v->getAnswerInputId()->toString()] = $ff->select(
-                        $v->getShortenedGapName(),
+                        $v->buildShortenedGapName(),
                         $available_gap_types
                     )->withRequired(true);
                     return $c;
@@ -109,9 +116,9 @@ function (array $c, Gap $v) use ($ff, $available_gap_types): array {
             $lng->txt('select_gap_types')
         )->withAdditionalTransformation(
             $refinery->custom()->transformation(
-                fn(array $vs): Gaps => array_reduce(
+                fn(array $vs): self => array_reduce(
                     array_keys($vs),
-                    fn(Gaps $c, string $v): Gaps => $c->withGap(
+                    fn(self $c, string $v): self => $c->withGap(
                         $this->factory->getGapOfType($vs[$v], $v)
                     ),
                     $this
@@ -138,9 +145,30 @@ function (array $c, Gap $v) use ($lng, $ff, $refinery): array {
                 },
                 []
             ),
-            $this->lng->txt('add_answer_options')
+            $lng->txt('add_answer_options')
         )->withAdditionalTransformation(
+            $refinery->custom()->transformation(
+                fn(array $vs): self => array_reduce(
+                    array_keys($vs),
+                    fn(self $c, string $v): self => $c->withGap($v),
+                    $this
+                )
+            )
+        );
+    }
 
+    public function getHiddenInput(FieldFactory $ff): Group
+    {
+        return $ff->group(
+            array_reduce(
+                $this->gaps,
+                function (array $c, Gap $v) use ($lng, $ff, $refinery): array {
+                    $c[$v->getAnswerInputId()->toString()] = $v->getHiddenInput($ff);
+                    return $c;
+                },
+                []
+            ),
+            $lng->txt('add_answer_options')
         );
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 81b9c6a09cbf..96a36ae04318 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -26,12 +26,12 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Type;
 use ILIAS\Questions\Question\Persistence\ManipulateQuery;
 use ILIAS\HTTP\Services as HTTPServices;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Factory as UuidFactory;
-use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
@@ -129,21 +129,26 @@ private function processBasicEditingForm(
         }
 
         return $this->buildOutputWithPanel(
-            $this->buildGapTypesForm($url_builder, $step_token, $data['form']),
+            $this->buildGapTypesForm(
+                $url_builder,
+                $step_token,
+                $data['form']->withNewGapsFromClozeText()
+            ),
             $data[self::MAIN_SECTION_NAME]->getClozeText()
         );
     }
 
     private function buildOutputWithPanel(
         StandardForm $form,
-        ClozeText $cloze_text
+        ClozeText $cloze_text,
+        ?Gaps $gaps = null
     ): array {
         return [
             $this->ui_factory->panel()->standard(
                 $this->lng->txt('cloze_text'),
                 $this->ui_factory->legacy()->content(
                     $cloze_text->getRenderedMarkdown(
-                        $cloze_text->getGaps()
+                        $gaps ?? $cloze_text->getGaps()
                     )
                 )
             ),
@@ -192,7 +197,8 @@ private function processGapTypesForm(
 
         return $this->buildOutputWithPanel(
             $this->buildAnswerOptionsForm($url_builder, $step_token, $properties, $data[self::MAIN_SECTION_NAME]),
-            $properties->getClozeText()
+            $properties->getClozeText(),
+            $data
         );
     }
 
@@ -206,7 +212,7 @@ private function buildAnswerOptionsForm(
         return $this->ui_factory->input()->container()->form()->standard(
             $url_builder->withParameter($step_token, self::STEP_SET_POINTS)->buildURI()->__toString(),
             [
-                self::MAIN_SECTION_NAME => $properties->getGaps()->buildAnswerOptionsInputs($this->lng, $ff),
+                self::MAIN_SECTION_NAME => $properties->getGaps()->buildAnswerOptionsInputs($this->lng, $ff, $this->refinery),
                 self::PROPERTIES_SECTION_NAME => $properties->buildBasicEditingInputsHidden($ff)
                     ->withDedicatedName(self::PROPERTIES_SECTION_NAME)
             ]
@@ -284,6 +290,7 @@ private function retrievePropertiesFromPost(): Properties
             $this->http->wrapper()->post(),
             'form/' . self::PROPERTIES_SECTION_NAME,
             $properties->getAnswerFormId(),
+            $properties->getGaps(),
             $properties->getLegacyClozeText(),
             $properties->getScoringOfIdenticalResponses(),
             $properties->areCombinationsActivated()

From bf8164c0d4bfe6270c196d0a5ea3a5c5348443ce Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 1 Dec 2025 08:36:55 +0100
Subject: [PATCH 085/141] Questions: Implementing Cloze Question

---
 .../class.ilObjQuestionsGUI.php               |   5 +
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  37 ++-
 .../Cloze/Properties/AnswerForm/Factory.php   |  55 +---
 .../Properties/AnswerForm/Properties.php      |  90 ++++--
 .../Cloze/Properties/ClozeText/Text.php       |  23 +-
 .../Cloze/Properties/Gaps/AnswerOption.php    |  55 ----
 .../Cloze/Properties/Gaps/Data.php            | 128 ---------
 .../Properties/Gaps/Data/AnswerOption.php     | 137 +++++++++
 .../Properties/Gaps/Data/AnswerOptions.php    | 223 +++++++++++++++
 .../Cloze/Properties/Gaps/Data/Data.php       | 267 ++++++++++++++++++
 .../Cloze/Properties/Gaps/Data/Factory.php    |  86 ++++++
 .../Cloze/Properties/Gaps/Factory.php         |  50 ++--
 .../Cloze/Properties/Gaps/Gap.php             | 120 ++++++--
 .../Cloze/Properties/Gaps/Gaps.php            |  88 +++++-
 .../Cloze/Properties/Gaps/LongMenu.php        | 152 ++++++----
 .../Cloze/Properties/Gaps/Numeric.php         | 124 ++++----
 .../Cloze/Properties/Gaps/Select.php          |  88 +++---
 .../Cloze/Properties/Gaps/Text.php            | 108 ++++---
 .../Cloze/Properties/Gaps/Type.php            |  53 ++--
 .../Gaps/class.UploadAnswerOptionsGUI.php     |  97 +++++++
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 143 +++++-----
 .../src/Setup/ClozeQuestionTables.php         |  25 +-
 22 files changed, 1532 insertions(+), 622 deletions(-)
 delete mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOption.php
 delete mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOption.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOptions.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Data.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Factory.php
 create mode 100755 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/class.UploadAnswerOptionsGUI.php

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
index ee562db4f82d..eedde9e858f3 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -21,6 +21,7 @@
 use ILIAS\Questions\Legacy\LocalDIC;
 use ILIAS\Questions\Presentation\Edit;
 use ILIAS\Questions\Units\GlobalConfigurationGUI;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\UploadAnswerOptionsGUI;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\URI;
 
@@ -66,6 +67,10 @@ public function executeCommand(): void
         $this->prepareOutput();
 
         switch ($next_class) {
+            case strtolower(UploadAnswerOptionsGUI::class):
+                $this->ctrl->forwardCommand(new UploadAnswerOptionsGUI());
+                break;
+
             case strtolower(ilPermissionGUI::class):
                 $this->tabs_gui->activateTab('perm_settings');
                 $this->ctrl->forwardCommand(new \ilPermissionGUI($this));
diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 4fd32cb4a67a..d09078855e44 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -81,18 +81,41 @@ protected static function buildDIC(ILIASContainer $DIC): self
                 $c[UuidFactory::class],
                 $c[DataFactory::class]->text()
             );
-        $dic[Cloze\Properties\Gaps\Factory::class] = static fn($c): Cloze\Properties\Gaps\Factory =>
-            new Cloze\Properties\Gaps\Factory(
+        $dic[Cloze\Properties\Gaps\Data\Factory::class] = static fn($c): Cloze\Properties\Gaps\Data\Factory
+            => new Cloze\Properties\Gaps\Data\Factory(
                 $c[UuidFactory::class],
+                $DIC['refinery']
+            );
+        $dic[Cloze\Properties\Gaps\Factory::class] = static fn($c): Cloze\Properties\Gaps\Factory
+            => new Cloze\Properties\Gaps\Factory(
+                $c[UuidFactory::class],
+                $c[Cloze\Properties\Gaps\Data\Factory::class],
                 [
-                    new Cloze\Properties\Gaps\Text(),
-                    new Cloze\Properties\Gaps\Numeric(),
-                    new Cloze\Properties\Gaps\Select(),
-                    new Cloze\Properties\Gaps\LongMenu()
+                    new Cloze\Properties\Gaps\Text(
+                        $DIC['refinery'],
+                        $DIC['lng'],
+                        $DIC['ui.factory']
+                    ),
+                    new Cloze\Properties\Gaps\Numeric(
+                        $DIC['refinery'],
+                        $DIC['lng'],
+                        $DIC['ui.factory']
+                    ),
+                    new Cloze\Properties\Gaps\Select(
+                        $DIC['refinery'],
+                        $DIC['lng'],
+                        $DIC['ui.factory']
+                    ),
+                    new Cloze\Properties\Gaps\LongMenu(
+                        $DIC['refinery'],
+                        $DIC['lng'],
+                        $DIC['ui.factory']
+                    )
                 ]
             );
         $dic[Cloze\Properties\AnswerForm\Factory::class] = static fn($c): Cloze\Properties\AnswerForm\Factory
             => new Cloze\Properties\AnswerForm\Factory(
+                $c[UuidFactory::class],
                 $c[Cloze\Properties\ClozeText\Factory::class],
                 $c[Cloze\Properties\Gaps\Factory::class]
             );
@@ -106,8 +129,6 @@ protected static function buildDIC(ILIASContainer $DIC): self
                 $DIC['ui.factory'],
                 $DIC['refinery'],
                 $DIC['http'],
-                $c[UuidFactory::class],
-                $c[DataFactory::class],
                 $c[Cloze\Properties\AnswerForm\Factory::class],
                 $c[Cloze\Properties\ClozeText\Factory::class],
                 $c[Cloze\Properties\Gaps\Factory::class]
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
index 360f81d7bb02..00e6dfaa69b9 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
@@ -24,14 +24,14 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
-use ILIAS\Data\UUID\Uuid;
+use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Refinery\Factory as Refinery;
 
 class Factory
 {
     public function __construct(
+        private readonly UuidFactory $uuid_factory,
         private readonly ClozeTextFactory $cloze_text_factory,
         private readonly GapsFactory $gaps_factory
     ) {
@@ -51,57 +51,20 @@ public function fromData(
     }
 
     public function fromForm(
-        ?string $answer_form_id,
+        Properties $properties,
         ClozeText $cloze_text,
         string $legacy_cloze_text,
         ScoringIdentical $scoring_of_identical_responses,
         bool $combinations_enabled
     ): Properties {
+        $updated_gaps = $cloze_text->updateGapsFromMarkdown($properties->getGaps());
         return new Properties(
-            $answer_form_id,
-            $cloze_text,
-            $cloze_text->getGaps(),
-            $legacy_cloze_text,
-            $scoring_of_identical_responses,
-            $combinations_enabled
-        );
-    }
-
-    public function fromPost(
-        Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        string $form_input_path,
-        ?Uuid $answer_form_id,
-        Gaps $gaps,
-        string $legacy_cloze_text,
-        ScoringIdentical $default_scoring_identical
-    ): Properties {
-        $cloze_text = $post_wrapper->retrieve(
-            $form_input_path . '/' . Properties::FORM_KEY_CLOZE_TEXT,
-            $refinery->custom()->transformation(
-                fn(string $v): ClozeText => $this->cloze_text_factory->buildFromHiddenInputString($v)
-            )
-        );
-
-        $scoring_of_identical_responses = $post_wrapper->retrieve(
-            $form_input_path . '/' . Properties::FORM_KEY_IDENTICAL_SCORING,
-            $refinery->custom()->transformation(
-                static fn(string $v): ScoringIdentical => ScoringIdentical::tryFrom($v) ?? $default_scoring_identical
-            )
-        );
-
-        $combinations_enabled = $post_wrapper->retrieve(
-            $form_input_path . '/' . Properties::FORM_KEY_ENABLE_COMBINATIONS,
-            $refinery->kindlyTo()->bool()
-        );
-
-        return new Properties(
-            $answer_form_id,
-            $cloze_text,
-            $cloze_text->updateGapsFromMarkdown($gaps),
-            $legacy_cloze_text,
+            $properties->getAnswerFormId(),
+            $cloze_text->withIdsOfNewGapsInClozeText($updated_gaps->getUndefinedGaps()),
+            $updated_gaps,
             $scoring_of_identical_responses,
-            $combinations_enabled
+            $combinations_enabled,
+            $legacy_cloze_text
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
index b39e28393c4a..ee00fadf5f0b 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
@@ -24,7 +24,6 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
-use ILIAS\Questions\Question\Persistence\ManipulateQuery;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -34,10 +33,11 @@
 
 class Properties
 {
-    public const string FORM_KEY_CLOZE_TEXT = 'cloze_text';
-    public const string FORM_KEY_IDENTICAL_SCORING = 'identical_scoring';
-    public const string FORM_KEY_ENABLE_COMBINATIONS = 'enable_combinations';
-    public const string FORM_KEY_GAPS_TO_EDIT = 'gaps';
+    private const string FORM_KEY_ID = 'id';
+    private const string FORM_KEY_CLOZE_TEXT = 'cloze_text';
+    private const string FORM_KEY_IDENTICAL_SCORING = 'identical_scoring';
+    private const string FORM_KEY_ENABLE_COMBINATIONS = 'enable_combinations';
+    private const string FORM_KEY_GAPS_TO_EDIT = 'gaps';
 
     /**
      * @param array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Gap> $gaps
@@ -46,9 +46,9 @@ public function __construct(
         private readonly ?Uuid $answer_form_id,
         private Text $cloze_text,
         private Gaps $gaps,
-        private readonly string $legacy_cloze_text = '',
-        private readonly ScoringIdentical $scoring_identical = ScoringIdentical::ScoreAll,
-        private readonly bool $combinations_activated = false
+        private ScoringIdentical $scoring_identical = ScoringIdentical::ScoreAll,
+        private bool $combinations_enabled = false,
+        private readonly string $legacy_cloze_text = ''
     ) {
     }
 
@@ -65,7 +65,7 @@ public function getClozeText(): Text
     public function withClozeText(Text $cloze_text): self
     {
         $clone = clone $this;
-        $clone->cloze_text = $this->cloze_text;
+        $clone->cloze_text = $cloze_text;
         return $clone;
     }
 
@@ -79,31 +79,34 @@ public function getScoringOfIdenticalResponses(): ScoringIdentical
         return $this->scoring_identical;
     }
 
-    public function areCombinationsActivated(): bool
+    public function withScoringOfIdenticalResponses(ScoringIdentical $scoring_identical): self
     {
-        return $this->combinations_activated;
+        $clone = clone $this;
+        $clone->scoring_identical = $scoring_identical;
+        return $clone;
     }
 
-    public function getGaps(): Gaps
+    public function areCombinationsEnabled(): bool
     {
-        return $this->gaps;
+        return $this->combinations_enabled;
     }
 
-    public function withGaps(array $gaps): self
+    public function withCombinationsEnabled(bool $combinations_enabled): self
     {
         $clone = clone $this;
-        $clone->gaps = $gaps;
+        $clone->combinations_enabled = $combinations_enabled;
         return $clone;
     }
 
-    public function withNewGapsFromClozeText(): self
+    public function getGaps(): Gaps
+    {
+        return $this->gaps;
+    }
+
+    public function withGaps(Gaps $gaps): self
     {
         $clone = clone $this;
-        $clone->gaps = $clone->cloze_text->updateGapsFromMarkdown($this->gaps);
-        $clone->cloze_text = $this->addIdsOfNewGapsToClozeText(
-            $clone->cloze_text,
-            $clone->gaps->getUndefinedGaps()
-        );
+        $clone->gaps = $gaps;
         return $clone;
     }
 
@@ -128,7 +131,7 @@ public function buildBasicEditingInputs(
                     $this->scoring_identical
                 )->withValue($this->getScoringOfIdenticalResponses()->value),
                 self::FORM_KEY_ENABLE_COMBINATIONS => $ff->checkbox($lng->txt('cloze_enable_combinations'))
-                    ->withValue($this->areCombinationsActivated())
+                    ->withValue($this->areCombinationsEnabled())
             ],
             $lng->txt('create_answer_form')
         )->withAdditionalTransformation(
@@ -149,6 +152,7 @@ public function buildBasicEditingInputsHidden(
     ): Group {
         return $ff->group(
             [
+                self::FORM_KEY_ID => $ff->hidden()->withValue($this->answer_form_id->toString()),
                 self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getHiddenInput($ff)
                     ->withDedicatedName(self::FORM_KEY_CLOZE_TEXT),
                 self::FORM_KEY_GAPS_TO_EDIT => $this->gaps->getHiddenInput($ff)
@@ -158,8 +162,48 @@ public function buildBasicEditingInputsHidden(
                     ->withValue($this->getScoringOfIdenticalResponses()->value),
                 self::FORM_KEY_ENABLE_COMBINATIONS => $ff->hidden()
                     ->withDedicatedName(self::FORM_KEY_ENABLE_COMBINATIONS)
-                    ->withValue($this->areCombinationsActivated() ? 1 : 0)
+                    ->withValue($this->areCombinationsEnabled() ? 1 : 0)
             ]
         );
     }
+
+    public function withValuesFromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        string $form_input_path
+    ): Properties {
+        $cloze_text = $post_wrapper->retrieve(
+            $form_input_path . '/' . self::FORM_KEY_CLOZE_TEXT,
+            $refinery->custom()->transformation(
+                fn(string $v): ClozeText => $this->cloze_text_factory->buildFromHiddenInputString($v)
+            )
+        );
+
+        $scoring_of_identical_responses = $post_wrapper->retrieve(
+            $form_input_path . '/' . self::FORM_KEY_IDENTICAL_SCORING,
+            $refinery->custom()->transformation(
+                static fn(string $v): ScoringIdentical => ScoringIdentical::tryFrom($v)
+                    ?? $properties->getScoringOfIdenticalResponses()
+            )
+        );
+
+        $combinations_enabled = $post_wrapper->retrieve(
+            $form_input_path . '/' . self::FORM_KEY_ENABLE_COMBINATIONS,
+            $refinery->kindlyTo()->bool()
+        );
+
+        $gaps = $cloze_text->updateGapsFromMarkdown($properties->getGaps())
+            ->withValuesFromPost(
+                $refinery,
+                $post_wrapper,
+                $this->gaps_factory,
+                $form_input_path . '/' . self::FORM_KEY_GAPS_TO_EDIT
+            );
+
+        return $properties
+            ->withClozeText($cloze_text)
+            ->withScoringOfIdenticalResponses($scoring_of_identical_responses)
+            ->withCombinationsEnabled($combinations_enabled)
+            ->withGaps($gaps);
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 5390c8b572a1..18a88367956d 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -95,36 +95,37 @@ function (Gaps $c, array $v) use (&$position): Gaps {
                 }
 
                 if ($v['name'] === Gap::GAP_PLACEHOLDER_NAME) {
-                    return $c->withNewGap();
+                    return $c->withNewGap($position++);
                 }
 
-                $gap = $c->getGapByTagName($v['name'])?->withPosition($position);
-
-                if ($gap === null) {
-                    return $c;
+                $gap = $c->getGapByTagName($v['name']);
+                if ($gap !== null) {
+                    return $c->withPosition($position++);
                 }
 
-                return $c->withUpdatedGap($gap);
+                return $c->withAdditionalGapFromTagName($v['name'], $position++);
             },
             $pre_existing_gaps
         );
     }
 
-    public function addIdsOfNewGapsToClozeText(Markdown $cloze_text, array $new_gaps): Markdown
+    public function withIdsOfNewGapsInClozeText(array $new_gaps): self
     {
         if ($new_gaps === []) {
-            return $cloze_text;
+            return self;
         }
 
-        return $this->text_factory->markdown(
+        $clone = clone $this;
+        $clone->cloze_text = $this->text_factory->markdown(
             mb_ereg_replace_callback(
                 '{{' . Gap::GAP_PLACEHOLDER_NAME . '}}',
                 function (array $matches) use (&$new_gaps): string {
                     return array_shift($new_gaps)->getGapPlaceholder();
                 },
-                $cloze_text->getRawRepresentation()
+                $this->cloze_text->getRawRepresentation()
             )
         );
+        return $clone;
     }
 
     private function hasAtLeastOneGap(): bool
@@ -136,7 +137,7 @@ private function hasAtLeastOneGap(): bool
         foreach ($this->mustache_engine->getTokenizer()
             ->scan($this->cloze_text->getRawRepresentation()) as $token) {
             if ($token['type'] === '_v'
-                || str_starts_with($token['name'], Gap::GAP_PLACEHOLDER_NAME)) {
+                && str_starts_with($token['name'], Gap::GAP_PLACEHOLDER_NAME)) {
                 return true;
             }
         }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOption.php
deleted file mode 100644
index 08156d56a6a1..000000000000
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOption.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
-
-use ILIAS\Questions\Question\Persistence\ManipulateQuery;
-use ILIAS\Data\UUID\Uuid;
-
-class AnswerOption
-{
-    public function __construct(
-        private readonly ?Uuid $answer_option_id = null,
-        private readonly ?int $position = null,
-        private readonly string|float $value = '',
-        private readonly ?float $available_points = null
-    ) {
-    }
-
-    public function getPosition(): ?int
-    {
-        return $this->position;
-    }
-
-    public function getValue(): string|float|null
-    {
-        return $this->value;
-    }
-
-    public function getAvailablePoints(): ?float
-    {
-        return $this->available_points;
-    }
-
-    public function toPersistence(ManipulateQuery $query): ManipulateQuery
-    {
-
-    }
-}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data.php
deleted file mode 100644
index 05879bded9bc..000000000000
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
-
-use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
-use ILIAS\Data\UUID\Uuid;
-
-class Data
-{
-    public function __construct(
-        private readonly Uuid $answer_input_id,
-        private ?int $max_chars,
-        private ?float $step_size,
-        private ?TextMatchingOptions $text_matching_method,
-        private ?int $min_autocomplete,
-        private ?bool $shuffle_answer_options,
-        private ?float $lower_limit,
-        private ?float $upper_limit
-    ) {
-    }
-
-    public function getAnswerInputId(): Uuid
-    {
-        return $this->answer_input_id;
-    }
-
-    public function getMaxChars(): ?int
-    {
-        return $this->max_chars;
-    }
-
-    public function withMaxChars(int $max_chars): self
-    {
-        $clone = clone $this;
-        $clone->max_chars = $max_chars;
-        return $clone;
-    }
-
-    public function getStepSize(): ?int
-    {
-        return $this->step_size;
-    }
-
-    public function withStepSize(int $step_size): self
-    {
-        $clone = clone $this;
-        $clone->step_size = $step_size;
-        return $clone;
-    }
-
-    public function getTextMatchingMethod(): ?TextMatchingOptions
-    {
-        return $this->text_matching_method;
-    }
-
-    public function withTextMatchingMethod(TextMatchingOptions $matching_method): self
-    {
-        $clone = clone $this;
-        $clone->text_matching_method = $matching_method;
-        return $clone;
-    }
-
-    public function getMinAutocomplete(): ?int
-    {
-        return $this->min_autocomplete;
-    }
-
-    public function withMinAutocomplete(int $min_autocomplete): self
-    {
-        $clone = clone $this;
-        $clone->min_autocomplete = $min_autocomplete;
-        return $clone;
-    }
-
-    public function getShuffleAnswerOptions(): ?bool
-    {
-        return $this->shuffle_answer_options;
-    }
-
-    public function withShuffleAnswerOptions(bool $shuffle_answer_options): self
-    {
-        $clone = clone $this;
-        $clone->shuffle_answer_options = $shuffle_answer_options;
-        return $clone;
-    }
-
-    public function getLowerLimit(): ?float
-    {
-        return $this->lower_limit;
-    }
-
-    public function withLowerLimit(float $lower_limit): self
-    {
-        $clone = clone $this;
-        $clone->lower_limit = $lower_limit;
-        return $clone;
-    }
-
-    public function getUpperLimit(): ?float
-    {
-        return $this->upper_limit;
-    }
-
-    public function withUpperLimit(float $upper_limit): self
-    {
-        $clone = clone $this;
-        $clone->upper_limit = $upper_limit;
-        return $clone;
-    }
-}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOption.php
new file mode 100644
index 000000000000..655760c8418c
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOption.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data;
+
+use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Data\UUID\Uuid;
+
+class AnswerOption
+{
+    public const string KEY_ID = 'id';
+    public const string KEY_POSITION = 'position';
+    public const string KEY_TEXT_VALUE = 'text_value';
+    public const string KEY_LOWER_LIMIT = 'lower_limit';
+    public const string KEY_UPPER_LIMIT = 'upper_limit';
+    public const string KEY_AVAILABLE_POINTS = 'points';
+
+    public function __construct(
+        private readonly Uuid $answer_option_id,
+        private int $position,
+        private string $text_value = '',
+        private ?float $lower_limit = null,
+        private ?float $upper_limit = null,
+        private ?float $available_points = null
+    ) {
+    }
+
+    public function getAnswerOptionId(): Uuid
+    {
+        return $this->answer_option_id;
+    }
+
+    public function getPosition(): ?int
+    {
+        return $this->position;
+    }
+
+    public function withPosition(int $position): self
+    {
+        $clone = clone $this;
+        $clone->position = $position;
+        return $clone;
+    }
+
+    public function getTextValue(): string
+    {
+        return $this->text_value;
+    }
+
+    public function withTextValue(string $text_value): self
+    {
+        $clone = clone $this;
+        $clone->text_value = $text_value;
+        return $clone;
+    }
+
+    public function getLowerLimit(): ?float
+    {
+        return $this->lower_limit;
+    }
+
+    public function withLowerLimit(float $lower_limit): self
+    {
+        $clone = clone $this;
+        $clone->lower_limit = $lower_limit;
+        return $clone;
+    }
+
+    public function getUpperLimit(): ?float
+    {
+        return $this->upper_limit;
+    }
+
+    public function withUpperLimit(?float $upper_limit): self
+    {
+        $clone = clone $this;
+        $clone->upper_limit = $upper_limit;
+        return $clone;
+    }
+
+    public function getAvailablePoints(): ?float
+    {
+        return $this->available_points;
+    }
+
+    public function withAvailablePoints(?float $available_points): self
+    {
+        $clone = clone $this;
+        $clone->available_points = $available_points;
+        return $clone;
+    }
+
+    public function buildArrayForHiddenInput(): array
+    {
+        $values = [
+            self::FORM_KEY_ID => $this->getAnswerOptionId()->toString(),
+            self::FORM_KEY_POSITION => $this->getPosition(),
+            self::FORM_KEY_TEXT_VALUE => $this->getTextValue()
+        ];
+
+        if ($this->getUpperLimit() !== null) {
+            $values[self::FORM_KEY_LOWER_LIMIT] = (string) $this->getLowerLimit();
+        }
+
+        if ($this->getUpperLimit() !== null) {
+            $values[self::FORM_KEY_UPPER_LIMIT] = (string) $this->getUpperLimit();
+        }
+
+        if ($this->getUpperLimit() !== null) {
+            $values[self::FORM_KEY_AVAILABLE_POINTS] = (string) $this->getAvailablePoints();
+        }
+
+        return $values;
+    }
+
+    public function toPersistence(ManipulateQuery $query): ManipulateQuery
+    {
+
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOptions.php
new file mode 100644
index 000000000000..73622d6f9bd4
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOptions.php
@@ -0,0 +1,223 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data;
+
+use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+
+class AnswerOptions
+{
+    private array $answer_options_awarding_points;
+
+    public function __construct(
+        private readonly Factory $factory,
+        private array $answer_options
+    ) {
+        $this->answer_options_awarding_points = $this->buildAnswerOptionsAwardingPointsFromAnswerOptions($answer_options);
+    }
+
+    public function getAnswerOptionForPositionOrNew(int $position): AnswerOption
+    {
+        return $this->answer_options[$position]
+            ?? $this->factory->getDefaultAnswerOptionForPosition($position);
+    }
+
+    public function getTagsArrayFromAnswerOptions(): array
+    {
+        return array_map(
+            fn(AnswerOption $v): string => $v->getTextValue(),
+            $this->answer_options
+        );
+    }
+
+    public function getAnswerOptionsAwardingPoints(): array
+    {
+        return $this->answer_options_awarding_points;
+    }
+
+    public function withAnswerOptionsAwardingPoints(array $options): self
+    {
+        $clone = clone $this;
+        $clone->answer_options_awarding_points = array_reduce(
+            $options,
+            function (array $c, string $v): array {
+                $answer_option = $this->retrieveAnswerOptionByTextValue($v);
+                if ($answer_option !== null) {
+                    $c[] = $answer_option;
+                }
+                return $c;
+            },
+            []
+        );
+        return $clone;
+    }
+
+    public function withAnswerOptions(array $answer_options): self
+    {
+        $clone = clone $this;
+        $clone->answer_options = $answer_options;
+        return $clone;
+    }
+
+    public function withValuesFromHiddenInputValue(
+        ?string $value
+    ): self {
+        if ($value === null
+            || !is_array(
+                ($decoded_value = json_decode($value, true))
+            )
+        ) {
+            return $this;
+        }
+
+        $clone = clone $this;
+        $clone->answer_options = array_map(
+            fn(array $vs): AnswerOption => $this->factory->buildAnswerOption(
+                $vs[AnswerOption::FORM_KEY_ID],
+                $vs[AnswerOption::FORM_KEY_POSITION],
+                $vs[AnswerOption::FORM_KEY_TEXT_VALUE],
+                $vs[AnswerOption::FORM_KEY_LOWER_LIMIT] ?? null,
+                $vs[AnswerOption::FORM_KEY_UPPER_LIMIT] ?? null,
+                $vs[AnswerOption::FORM_KEY_AVAILABLE_POINTS] ?? null
+            ),
+            $decoded_value['answer_options'] ?? []
+        );
+
+        $answer_inputs_awarding_points = $decoded_value['answer_options_awarding_points'] ?? [];
+        $clone->answer_options_awarding_points = array_filter(
+            $clone->answer_options,
+            fn(AnswerOption $v): bool => in_array(
+                $v->getAnswerOptionId()->toString(),
+                $answer_inputs_awarding_points
+            )
+        );
+        return $clone;
+    }
+
+    public function withAnswerOptionsFromTags(
+        array $tags
+    ): self {
+        $clone = clone $this;
+        $position = 0;
+        $clone->answer_options = array_map(
+            function (string $v) use (&$position): AnswerOption {
+                return $this->buildAnswerOptionFromTag(
+                    $position++,
+                    $v
+                );
+            },
+            $tags
+        );
+        return $clone;
+    }
+
+    public function withAnswerOptionsWithAddedPointsFromForm(
+        Refinery $refinery,
+        array $values_from_form
+    ): self {
+        $clone = clone $this;
+        $clone->answer_options = array_map(
+            function (AnswerOption $v) use ($refinery, $values_from_form): AnswerOption {
+                $answer_option_id = $v->getAnswerOptionId()->toString();
+                if (array_key_exists($answer_option_id, $values_from_form)) {
+                    return $v->withAvailablePoints(
+                        $refinery->byTrying([
+                            $refinery->kindlyTo()->float(),
+                            $refinery->always(null)
+                        ])->transform($values_from_form[$answer_option_id])
+                    );
+                }
+
+                return $v;
+            },
+            $this->answer_options
+        );
+        $this->answer_options_awarding_points = $this->buildAnswerOptionsAwardingPointsFromAnswerOptions($this->answer_options);
+        return $clone;
+    }
+
+    public function buildHiddenInputValue(): string
+    {
+        return json_encode([
+            'answer_options' => array_map(
+                fn(AnswerOption $v): array => $v->buildArrayForHiddenInput(),
+                $this->answer_options
+            ),
+            'answer_options_awarding_points' => array_map(
+                fn(AnswerOption $v): string => $v->getAnswerOptionId()->toString(),
+                $this->answer_options_awarding_points
+            )
+        ]);
+    }
+
+    public function getEditPointsInputs(
+        FieldFactory $ff,
+        \Closure $build_label,
+        ?array $answer_options_awarding_points = null
+    ): array {
+        return array_reduce(
+            $answer_options_awarding_points ?? $this->answer_options,
+            function (array $c, AnswerOption $v) use ($ff, $build_label): array {
+                $c[$v->getAnswerOptionId()->toString()] = $ff->numeric($build_label($v))
+                    ->withStepSize(0.0001)
+                    ->withValue($v->getAvailablePoints());
+                return $c;
+            },
+            []
+        );
+    }
+
+    public function toPersistence(ManipulateQuery $query): ManipulateQuery
+    {
+
+    }
+
+    private function buildAnswerOptionsAwardingPointsFromAnswerOptions(
+        array $answer_options
+    ): array {
+        return array_filter(
+            $answer_options,
+            fn(AnswerOption $v): bool => $v->getAvailablePoints() > 0.0
+        );
+    }
+
+    private function buildAnswerOptionFromTag(
+        int $position,
+        string $text_value
+    ): AnswerOption {
+        $answer_option = $this->retrieveAnswerOptionByTextValue($text_value)
+            ?? $this->factory->getDefaultAnswerOptionForPosition($position);
+        return $answer_option
+            ->withPosition($position)
+            ->withTextValue($text_value);
+    }
+
+    private function retrieveAnswerOptionByTextValue(
+        string $value
+    ): ?AnswerOption {
+        $filtered_array = array_filter(
+            $this->answer_options,
+            fn(AnswerOption $v): bool => $v->getTextValue() === $value
+        );
+        return array_shift($filtered_array) ?? null;
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Data.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Data.php
new file mode 100644
index 000000000000..b4fe36d1a9d6
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Data.php
@@ -0,0 +1,267 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data;
+
+use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
+use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Implementation\Component\Input\Field\Group;
+
+class Data
+{
+    private const string FORM_KEY_MAX_CHARS = 'max_chars';
+    private const string FORM_KEY_STEP_SIZE = 'step_size';
+    private const string FORM_KEY_TEXT_MATCHING_METHOD = 'matching_method';
+    private const string FORM_KEY_MIN_AUTOCOMPLETE = 'min_autocomplete';
+    private const string FORM_KEY_SHUFFLE_ANSWER_OPTIONS = 'shuffle';
+    private const string FORM_KEY_ANSWER_OPTIONS = 'answer_options';
+
+    /**
+     * @param array<ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOption> $answer_options
+     */
+    public function __construct(
+        private readonly Uuid $answer_input_id,
+        private AnswerOptions $answer_options,
+        private ?int $max_chars = null,
+        private ?float $step_size = null,
+        private ?TextMatchingOptions $text_matching_method = null,
+        private ?int $min_autocomplete = null,
+        private ?bool $shuffle_answer_options = null
+    ) {
+    }
+
+    public function getAnswerInputId(): Uuid
+    {
+        return $this->answer_input_id;
+    }
+
+    public function getMaxChars(): ?int
+    {
+        return $this->max_chars;
+    }
+
+    public function withMaxChars(?int $max_chars): self
+    {
+        $clone = clone $this;
+        $clone->max_chars = $max_chars;
+        return $clone;
+    }
+
+    public function getStepSize(): ?float
+    {
+        return $this->step_size;
+    }
+
+    public function withStepSize(float $step_size): self
+    {
+        $clone = clone $this;
+        $clone->step_size = $step_size;
+        return $clone;
+    }
+
+    public function getTextMatchingMethod(): ?TextMatchingOptions
+    {
+        return $this->text_matching_method;
+    }
+
+    public function withTextMatchingMethod(TextMatchingOptions $matching_method): self
+    {
+        $clone = clone $this;
+        $clone->text_matching_method = $matching_method;
+        return $clone;
+    }
+
+    public function getMinAutocomplete(): ?int
+    {
+        return $this->min_autocomplete;
+    }
+
+    public function withMinAutocomplete(int $min_autocomplete): self
+    {
+        $clone = clone $this;
+        $clone->min_autocomplete = $min_autocomplete;
+        return $clone;
+    }
+
+    public function getShuffleAnswerOptions(): ?bool
+    {
+        return $this->shuffle_answer_options;
+    }
+
+    public function withShuffleAnswerOptions(bool $shuffle_answer_options): self
+    {
+        $clone = clone $this;
+        $clone->shuffle_answer_options = $shuffle_answer_options;
+        return $clone;
+    }
+
+    public function getAnswerOptions(): AnswerOptions
+    {
+        return $this->answer_options;
+    }
+
+    public function withAnswerOptions(AnswerOptions $answer_options): self
+    {
+        $clone = clone $this;
+        $clone->answer_options = $answer_options;
+        return $clone;
+    }
+
+    public function getHiddenInput(FieldFactory $ff): Group
+    {
+        $inputs = [];
+        if ($this->max_chars !== null) {
+            $inputs[self::FORM_KEY_MAX_CHARS] = $ff->hidden()->withValue($this->getMaxChars())
+                ->withDedicatedName(self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId());
+        }
+
+        if ($this->step_size !== null) {
+            $inputs[self::FORM_KEY_STEP_SIZE] = $ff->hidden()->withValue($this->getStepSize())
+                ->withDedicatedName(self::FORM_KEY_STEP_SIZE . $this->getShortenedAnswerInputId());
+        }
+
+        if ($this->text_matching_method !== null) {
+            $inputs[self::FORM_KEY_TEXT_MATCHING_METHOD] = $ff->hidden()->withValue($this->getTextMatchingMethod()->value)
+                ->withDedicatedName(self::FORM_KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId());
+        }
+
+        if ($this->min_autocomplete !== null) {
+            $inputs[self::FORM_KEY_MIN_AUTOCOMPLETE] = $ff->hidden()->withValue($this->getMinAutocomplete())
+                ->withDedicatedName(self::FORM_KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId());
+        }
+
+        if ($this->shuffle_answer_options !== null) {
+            $inputs[self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->getShuffleAnswerOptions() ? '1' : '0')
+                ->withDedicatedName(self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId());
+        }
+
+        $inputs[self::FORM_KEY_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->answer_options->buildHiddenInputValue())
+            ->withDedicatedName(self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId());
+
+        return $ff->group($inputs);
+    }
+
+    public function withValuesFromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        string $form_input_path
+    ): Data {
+        $clone = clone $this;
+        $clone->max_chars = $this->retrieveMaxCharsFromPost($refinery, $post_wrapper, $form_input_path);
+        $clone->step_size = $this->retrieveStepSizeFromPost($refinery, $post_wrapper, $form_input_path);
+        $clone->text_matching_method = $this->retrieveTextMatchingMethodFromPost($refinery, $post_wrapper, $form_input_path);
+        $clone->min_autocomplete = $this->retrieveMinAutocompleteFromPost($refinery, $post_wrapper, $form_input_path);
+        $clone->shuffle_answer_options = $this->retrieveShuffleAnswerOptionsFromPost($refinery, $post_wrapper, $form_input_path);
+        $clone->answer_options = $this->retrieveAnswerOptionsFromPost($refinery, $post_wrapper, $form_input_path);
+        return $clone;
+    }
+
+    private function retrieveMaxCharsFromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        string $form_input_path
+    ): ?int {
+        return $post_wrapper->retrieve(
+            $form_input_path . '/' . self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId(),
+            $refinery->byTrying([
+                $refinery->kindlyTo()->int(),
+                $refinery->always($this->getMaxChars())
+            ])
+        );
+    }
+
+    private function retrieveStepSizeFromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        string $form_input_path
+    ): ?float {
+        return $post_wrapper->retrieve(
+            $form_input_path . '/' . self::FORM_KEY_STEP_SIZE . $this->getShortenedAnswerInputId(),
+            $refinery->byTrying([
+                $refinery->kindlyTo()->float(),
+                $refinery->always($this->getStepSize())
+            ])
+        );
+    }
+
+    private function retrieveTextMatchingMethodFromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        string $form_input_path
+    ): ?TextMatchingOptions {
+        return $post_wrapper->retrieve(
+            $form_input_path . '/' . self::FORM_KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId(),
+            $refinery->custom()->transformation(
+                fn(?string $v): ?TextMatchingOptions => $v !== null
+                    ? TextMatchingOptions::tryFrom($v)
+                    : $this->getTextMatchingMethod()
+            )
+        );
+    }
+
+    private function retrieveMinAutocompleteFromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        string $form_input_path
+    ): ?int {
+        return $post_wrapper->retrieve(
+            $form_input_path . '/' . self::FORM_KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId(),
+            $refinery->byTrying([
+                $refinery->kindlyTo()->int(),
+                $refinery->always($this->getMinAutocomplete())
+            ])
+        );
+    }
+
+    private function retrieveShuffleAnswerOptionsFromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        string $form_input_path
+    ): ?bool {
+        return $post_wrapper->retrieve(
+            $form_input_path . '/' . self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
+            $refinery->byTrying([
+                $refinery->kindlyTo()->bool(),
+                $refinery->always($this->getShuffleAnswerOptions())
+            ])
+        );
+    }
+
+    private function retrieveAnswerOptionsFromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        string $form_input_path
+    ): AnswerOptions {
+        return $post_wrapper->retrieve(
+            $form_input_path . '/' . self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
+            $refinery->custom()->transformation(
+                fn(?string $v): AnswerOptions => $this->answer_options->withValuesFromHiddenInputValue($v)
+            )
+        );
+    }
+
+    private function getShortenedAnswerInputId(): string
+    {
+        return mb_substr($this->answer_input_id->toString(), 0, 4);
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Factory.php
new file mode 100644
index 000000000000..d3a7b4ead468
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Factory.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data;
+
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Refinery\Factory as Refinery;
+
+class Factory
+{
+    public function __construct(
+        private readonly UuidFactory $uuid_factory,
+        private readonly Refinery $refinery
+    ) {
+    }
+
+    public function getDefaultDataObject(
+        Uuid $answer_input_id
+    ): Data {
+        return new Data(
+            $answer_input_id,
+            new AnswerOptions(
+                $this,
+                []
+            )
+        );
+    }
+
+    public function getDefaultAnswerOptionForPosition(int $position): AnswerOption
+    {
+        return new AnswerOption(
+            $this->uuid_factory->uuid4(),
+            $position
+        );
+    }
+
+    public function buildAnswerOption(
+        string $answer_option_id,
+        int $position,
+        string $text_value,
+        ?string $lower_limit,
+        ?string $upper_limit,
+        ?string $points
+    ): AnswerOption {
+        return new AnswerOption(
+            $this->uuid_factory->fromString($answer_option_id),
+            $position,
+            $text_value,
+            $this->convertToFloatOrNull($lower_limit),
+            $this->convertToFloatOrNull($upper_limit),
+            $this->convertToFloatOrNull($points)
+        );
+    }
+
+    public function fromDatabase(
+        array $data
+    ): Gaps {
+
+    }
+
+    private function convertToFloatOrNull(?string $value): ?float
+    {
+        return $this->refinery->byTrying([
+            $this->refinery->kindlyTo()->float(),
+            $this->refinery->always(null)
+        ])->transform($value);
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index 3585dc7849a1..06b38b1f56dd 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Factory as DataFactory;
 use ILIAS\Language\Language;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 
@@ -29,6 +30,7 @@ class Factory
 
     public function __construct(
         private readonly UuidFactory $uuid_factory,
+        private readonly DataFactory $data_factory,
         array $available_gap_types
     ) {
         foreach ($available_gap_types as $type) {
@@ -36,32 +38,31 @@ public function __construct(
         }
     }
 
+    public function getAvailableGapTypes(): array
+    {
+        return $this->available_gap_types;
+    }
+
     public function getAvailableGapTypesOptionsArray(
         Language $lng
     ): array {
         return array_map(
-            fn(string $v) => $lng->txt("{$v}_gap"),
-            array_keys($this->available_gap_types)
+            fn(Type $v) => $lng->txt("{$v->getIdentifier()}_gap"),
+            $this->available_gap_types
         );
     }
 
-    public function getNewGap(): Gap
-    {
+    public function getNewGap(
+        int $position,
+        string $id = ''
+    ): Gap {
+        $answer_input_id = $id !== ''
+            ? $this->uuid_factory->fromString($id)
+            : $this->uuid_factory->uuid4();
         return new Gap(
-            $this->uuid_factory->uuid4()
-        );
-    }
-
-    public function getGapOfType(
-        string $type_identifier,
-        string $answer_input_id
-    ): ?Gap {
-        $class = $this->available_gap_type_classes[$type_identifier];
-        if ($class === null) {
-            return $class;
-        }
-        return (new $class())->withAnswerInputId(
-            $this->uuid_factory->fromString($answer_input_id)
+            $answer_input_id,
+            $position,
+            $this->data_factory->getDefaultDataObject($answer_input_id)
         );
     }
 
@@ -73,12 +74,17 @@ public function getEmptyGapsObject(): Gaps
         );
     }
 
-    /**
-     * @return array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap>
-     */
+    public function getGapTypeByIdentifier(string $identifier): Type
+    {
+        if (!array_key_exists($identifier, $this->available_gap_types)) {
+            throw new \InvalidArgumentException('Gap type does not exist.');
+        }
+        return $this->available_gap_types[$identifier];
+    }
+
     public function fromDatabase(
         array $data
-    ): array {
+    ): Gaps {
 
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index ef4046cb890f..dc0be37e81e3 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -20,28 +20,28 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
+use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\Component\Input\Field\Group;
 
 class Gap
 {
     public const string GAP_PLACEHOLDER_NAME = 'GAP';
 
-    private const string FORM_KEY_INPUT_ID = 'input_id';
     private const string FORM_KEY_TYPE = 'type';
+    private const string FORM_KEY_DATA = 'data';
 
     public function __construct(
         private Uuid $answer_input_id,
-        private ?Type $type = null,
-        ?ManipulateQuery $data = null
+        private int $position,
+        private Data $data,
+        private ?Type $type = null
     ) {
-        if ($this->type !== null && $data !== null) {
-            $this->type = $this->type->withData($data);
-        }
     }
 
     public function getAnswerInputId(): ?Uuid
@@ -56,6 +56,37 @@ public function withAnswerInputId(Uuid $answer_input_id): self
         return $clone;
     }
 
+    public function getPosition(): int
+    {
+        return $this->position;
+    }
+
+    public function withPosition(int $position): self
+    {
+        $clone = clone $this;
+        $clone->position = $position;
+        return $clone;
+    }
+
+    public function withType(Type $type): self
+    {
+        $clone = clone $this;
+        $clone->type = $type;
+        return $clone;
+    }
+
+    public function getData(): Data
+    {
+        return $this->data;
+    }
+
+    public function withData(Data $data): self
+    {
+        $clone = clone $this;
+        $clone->data = $data;
+        return $clone;
+    }
+
     public function isUndefined(): bool
     {
         return $this->type === null;
@@ -68,7 +99,7 @@ public function getGapPlaceholder(): string
 
     public function buildShortenedGapName(): string
     {
-        return self::GAP_PLACEHOLDER_NAME . '_' . mb_substr($this->answer_input_id->toString(), 0, 4);
+        return self::GAP_PLACEHOLDER_NAME . '_' . $this->getShortenedAnswerInputId();
     }
 
     public function buildShortenedGapRepresentation(): string
@@ -81,34 +112,85 @@ public function buildGapPlaceholderNameWithId(): string
         return self::GAP_PLACEHOLDER_NAME . '_' . $this->answer_input_id->toString();
     }
 
-    public function getEditSection(
+    public function getEditAnswerOptionsSection(
         Language $lng,
-        FieldFactory $ff,
-        Refinery $refinery
+        FieldFactory $ff
     ): Section {
         $section = $ff->section(
-            $this->type->getEditInputs($lng, $ff, $refinery),
-            "{$this->buildShortenedGapName()} ({$lng->txt("{$this->getIdentifier()}_gap")})"
+            $this->type->getEditAnswerOptionsInputs($this->data),
+            "{$this->buildShortenedGapName()} ({$lng->txt("{$this->type->getIdentifier()}_gap")})"
         );
 
-        $edit_section_constraint = $this->type->getEditSectionConstraint($refinery, $lng);
+        $edit_section_constraint = $this->type->getEditAnswerOptionsSectionConstraint();
         if ($edit_section_constraint !== null) {
             $section = $section->withAdditionalTransformation($edit_section_constraint);
         }
 
 
         return $section->withAdditionalTransformation(
-            $this->type->getBuildGapTransformation($refinery, $this->answer_input_id)
+            $this->type->getBuildGapTransformation($this)
+        );
+    }
+
+    public function getEditPointsSection(
+        Language $lng,
+        FieldFactory $ff
+    ): Section {
+        $section = $ff->section(
+            $this->type->getEditPointsInputs($this->data->getAnswerOptions()),
+            "{$this->buildShortenedGapName()} ({$lng->txt("{$this->type->getIdentifier()}_gap")})"
+        );
+
+        $edit_section_constraint = $this->type->getEditPointsSectionConstraint();
+        if ($edit_section_constraint !== null) {
+            $section = $section->withAdditionalTransformation($edit_section_constraint);
+        }
+
+
+        return $section->withAdditionalTransformation(
+            $this->type->getAddPointsTransformation($this)
         );
     }
 
     public function getHiddenInput(
-        FieldFactory $ff,
-        Refinery $refinery
+        FieldFactory $ff
     ): Group {
         return $ff->group([
-            self::FORM_KEY_INPUT_ID => $this->answer_input_id->toString(),
-            self::FORM_KEY_TYPE => $this->type?->getIdentifier() ?? ''
+            self::FORM_KEY_TYPE => $ff->hidden()->withValue($this->type?->getIdentifier() ?? '')
+                ->withDedicatedName(self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId()),
+            self::FORM_KEY_DATA => $this->data->getHiddenInput($ff)
+            ->withDedicatedName(self::FORM_KEY_DATA . $this->getShortenedAnswerInputId())
         ]);
     }
+
+    public function withValuesFromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        Factory $gaps_factory,
+        string $form_input_path
+    ): self {
+        $available_gap_types = $gaps_factory->getAvailableGapTypes();
+        return $post_wrapper->retrieve(
+            $form_input_path . '/' . self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId(),
+            $refinery->byTrying([
+                $refinery->custom()->transformation(
+                    fn(?string $v): self => $available_gap_types[$v]
+                        ? $this->withType($available_gap_types[$v])
+                        : $this
+                ),
+                $refinery->always($this)
+            ])
+        )->withData(
+            $this->data->withValuesFromPost(
+                $refinery,
+                $post_wrapper,
+                $form_input_path . '/' . self::FORM_KEY_DATA . $this->getShortenedAnswerInputId()
+            )
+        );
+    }
+
+    private function getShortenedAnswerInputId(): string
+    {
+        return mb_substr($this->answer_input_id->toString(), 0, 4);
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 94ef7f6660dd..1e93f6b0b341 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -22,9 +22,11 @@
 
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
+use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\Component\Input\Field\Group;
 
 class Gaps
 {
@@ -41,7 +43,7 @@ public function getGapById(Uuid $gap_id): ?Gap
 
     public function getGapByTagName(string $tag_name): ?Gap
     {
-        return $this->gaps[mb_substr($tag_name, 4)] ?? null;
+        return $this->gaps[$this->extractIdFromTagName($tag_name)] ?? null;
     }
 
     public function hasAtLeastOneGap(): bool
@@ -56,14 +58,22 @@ public function withGap(Gap $gap): self
         return $clone;
     }
 
-    public function withNewGap(): self
+    public function withNewGap(int $position): self
     {
-        $new_gap = $this->factory->getNewGap();
+        $new_gap = $this->factory->getNewGap($position);
         $clone = clone $this;
         $clone->gaps[$new_gap->getAnswerInputId()->toString()] = $new_gap;
         return $clone;
     }
 
+    public function withAdditionalGapFromTagName(string $tag_name, $position): self
+    {
+        $id = $this->extractIdFromTagName($tag_name);
+        $clone = clone $this;
+        $clone->gaps[$id] = $this->factory->getNewGap($position, $id);
+        return $clone;
+    }
+
     public function withResetGaps(): self
     {
         if ($this->gaps === []) {
@@ -119,7 +129,9 @@ function (array $c, Gap $v) use ($ff, $available_gap_types): array {
                 fn(array $vs): self => array_reduce(
                     array_keys($vs),
                     fn(self $c, string $v): self => $c->withGap(
-                        $this->factory->getGapOfType($vs[$v], $v)
+                        $c->gaps[$v]->withType(
+                            $this->factory->getGapTypeByIdentifier($vs[$v])
+                        )
                     ),
                     $this
                 )
@@ -135,11 +147,10 @@ public function buildAnswerOptionsInputs(
         return $ff->section(
             array_reduce(
                 $this->gaps,
-                function (array $c, Gap $v) use ($lng, $ff, $refinery): array {
-                    $c[$v->getAnswerInputId()->toString()] = $v->getEditSection(
+                function (array $c, Gap $v) use ($lng, $ff): array {
+                    $c[$v->getAnswerInputId()->toString()] = $v->getEditAnswerOptionsSection(
                         $lng,
-                        $ff,
-                        $refinery
+                        $ff
                     );
                     return $c;
                 },
@@ -150,7 +161,36 @@ function (array $c, Gap $v) use ($lng, $ff, $refinery): array {
             $refinery->custom()->transformation(
                 fn(array $vs): self => array_reduce(
                     array_keys($vs),
-                    fn(self $c, string $v): self => $c->withGap($v),
+                    fn(self $c, string $v): self => $c->withGap($vs[$v]),
+                    $this
+                )
+            )
+        );
+    }
+
+    public function buildPointInputs(
+        Language $lng,
+        FieldFactory $ff,
+        Refinery $refinery
+    ): Section {
+        return $ff->section(
+            array_reduce(
+                $this->gaps,
+                function (array $c, Gap $v) use ($lng, $ff): array {
+                    $c[$v->getAnswerInputId()->toString()] = $v->getEditPointsSection(
+                        $lng,
+                        $ff
+                    );
+                    return $c;
+                },
+                []
+            ),
+            $lng->txt('add_points')
+        )->withAdditionalTransformation(
+            $refinery->custom()->transformation(
+                fn(array $vs): self => array_reduce(
+                    array_keys($vs),
+                    fn(self $c, string $v): self => $c->withGap($vs[$v]),
                     $this
                 )
             )
@@ -162,13 +202,37 @@ public function getHiddenInput(FieldFactory $ff): Group
         return $ff->group(
             array_reduce(
                 $this->gaps,
-                function (array $c, Gap $v) use ($lng, $ff, $refinery): array {
-                    $c[$v->getAnswerInputId()->toString()] = $v->getHiddenInput($ff);
+                function (array $c, Gap $v) use ($ff): array {
+                    $c[$v->getAnswerInputId()->toString()] = $v->getHiddenInput($ff)
+                        ->withDedicatedName($v->getAnswerInputId()->toString());
                     return $c;
                 },
                 []
+            )
+        );
+    }
+
+    public function withValuesFromPost(
+        Refinery $refinery,
+        ArrayBasedRequestWrapper $post_wrapper,
+        Factory $gaps_factory,
+        string $form_input_path
+    ): self {
+        $clone = clone $this;
+        $clone->gaps = array_map(
+            fn(Gap $v): Gap => $v->withValuesFromPost(
+                $refinery,
+                $post_wrapper,
+                $gaps_factory,
+                $form_input_path . '/' . $v->getAnswerInputId()->toString()
             ),
-            $lng->txt('add_answer_options')
+            $this->gaps
         );
+        return $clone;
+    }
+
+    private function extractIdFromTagName(string $tag_name): string
+    {
+        return mb_substr($tag_name, mb_strlen(Gap::GAP_PLACEHOLDER_NAME) + 1);
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
index 3705ff41969e..9295f0129a63 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
@@ -20,95 +20,139 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Data\UUID\Uuid;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
+use ILIAS\FileUpload\MimeType;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
 use ILIAS\Refinery\Transformation;
-use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Factory as UIFactory;
 
-class LongMenu implements Type
+class LongMenu extends Type
 {
-    private int $min_autocomplete = 3;
+    private const int DEFAULT_MIN_AUTOCOMPLETE = 3;
+    private const array ACCEPTED_MIME_TYPES = [MimeType::TEXT__PLAIN];
+
+    public function __construct(
+        Refinery $refinery,
+        private readonly Language $lng,
+        private readonly UIFactory $ui_factory
+    ) {
+        parent::__construct($refinery);
+    }
 
     public function getIdentifier(): string
     {
         return 'long_menu';
     }
 
-    public function withData(Data $data): self
+    public function getEditAnswerOptionsInputs(Data $data): array
     {
-        if ($data->getMinAutocomplete() === null) {
-            return $this;
-        }
-
-        $clone = clone $this;
-        $clone->min_autocomplete = $data->getMinAutocomplete();
-        return $clone;
-    }
-
-    public function getEditInputs(
-        Language $lng,
-        FieldFactory $ff,
-        Refinery $refinery
-    ): array {
+        $ff = $this->ui_factory->input()->field();
         return [
             'answer_options' => $ff->tag(
-                $lng->txt('answer_options'),
+                $this->lng->txt('answer_options'),
                 []
-            )->withValue($this->buildTagsArrayFromAnswerOptions($this->answer_options)),
+            )->withValue($data->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
+            'upload_answer_options' => $ff->file(
+                new UploadAnswerOptionsGUI(),
+                $this->lng->txt('upload_answer_options'),
+                $this->lng->txt('upload_answer_options_info')
+            )->withAcceptedMimeTypes(self::ACCEPTED_MIME_TYPES),
             'min_autocomplete' => $ff->numeric(
-                $lng->txt('min_autocomplete')
+                $this->lng->txt('min_autocomplete')
             )->withRequired(true)
-            ->withValue($this->min_autocomplete),
+            ->withValue($data->getMinAutocomplete() ?? self::DEFAULT_MIN_AUTOCOMPLETE),
             'options_awarding_points' => $ff->tag(
-                $lng->txt('answer_options'),
-                []
-            )->withValue(
-                array_reduce(
-                    $this->answer_options,
-                    static function (array $c, AnswerOption $v): array {
-                        if ($v->getAvailablePoints() > 0.0) {
-                            $c[] = $v->getValue();
-                        }
-                        return $c;
-                    },
-                    []
+                $this->lng->txt('answer_options'),
+                $data->getAnswerOptions()->getTagsArrayFromAnswerOptions()
+            )
+            ->withRequired(true)
+            ->withValue(
+                array_map(
+                    fn(AnswerOption $v): string => $v->getTextValue(),
+                    $data->getAnswerOptions()->getAnswerOptionsAwardingPoints()
                 )
             )
         ];
     }
 
-    public function getEditSectionConstraint(
-        Refinery $refinery,
-        Language $lng
-    ): ?Constraint {
-        return $refinery->custom()->constraint(
-            fn(array $v): bool => $vs['answer_options'] !== [],
-            $lng->txt('error')
+    public function getEditAnswerOptionsSectionConstraint(): ?Constraint
+    {
+        return $this->refinery->custom()->constraint(
+            function (array $vs): bool {
+                $values = array_merge(
+                    $vs['answer_options'],
+                    $this->retrieveAnswerOptionsArrayFromUpload($vs['upload_answer_options'])
+                );
+
+                return $values !== [] && array_filter(
+                    $vs['options_awarding_points'],
+                    fn(string $v): bool => !in_array($v, $values)
+                ) === [];
+            },
+            $this->lng->txt('error')
         );
     }
 
-    public function getBuildGapTransformation(
-        Refinery $refinery,
-        Uuid $answer_input_id
-    ): Transformation {
-        return $refinery->custom()->transformation(
-            fn(array $vs): self => new self(
-                $answer_input_id,
-                $vs['min_autocomplete'],
-                $vs['answer_options']
-            )
+    public function getEditPointsInputs(AnswerOptions $answer_options): array
+    {
+        return $answer_options->getEditPointsInputs(
+            $this->ui_factory->input()->field(),
+            fn(AnswerOption $v): string => $v->getTextValue(),
+            $answer_options->getAnswerOptionsAwardingPoints()
         );
     }
 
-    public function addValuesToData(Data $data): Data
+    public function getEditPointsSectionConstraint(): ?Constraint
     {
-        return $data->withMinAutocomplete($this->min_autocomplete);
+        return $this->refinery->custom()->constraint(
+            function (array $vs): bool {
+                foreach ($vs as $v) {
+                    if ($v > 0.0) {
+                        return true;
+                    }
+                }
+                return false;
+            },
+            $this->lng->txt('at_least_one_gap_positiv_points')
+        );
+    }
+
+    public function getBuildGapTransformation(Gap $gap): Transformation
+    {
+        return $this->refinery->custom()->transformation(
+            fn(array $vs): Gap => $gap->withData(
+                $gap->getData()
+                    ->withMinAutocomplete($vs['min_autocomplete'])
+                    ->withAnswerOptions(
+                        $gap->getData()->getAnswerOptions()->withAnswerOptionsFromTags(
+                            array_merge(
+                                $vs['answer_options'],
+                                $this->retrieveAnswerOptionsArrayFromUpload($vs['upload_answer_options'])
+                            )
+                        )->withAnswerOptionsAwardingPoints($vs['options_awarding_points'])
+                    )
+            )
+        );
     }
 
     public function getAnswerInput(): \ilFormPropertyGUI
     {
         ;
     }
+
+    private function retrieveAnswerOptionsArrayFromUpload(?array $upload_value): array
+    {
+        if ($upload_value === null
+            || ($decoded_value = base64_decode($upload_value[0] ?? '')) === '') {
+            return [];
+        }
+
+        return array_filter(
+            mb_split('\R', $decoded_value)
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
index e8d82f6bd9c3..52302d45edfd 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
@@ -20,86 +20,106 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Data\UUID\Uuid;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
 use ILIAS\Refinery\Transformation;
-use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Input\Field\Numeric as NumericInput;
 
-class Numeric implements Type
+class Numeric extends Type
 {
-    private float $step_size = 0.0001;
-    private ?float $lower_limit = null;
-    private ?float $upper_limit = null;
+    private const float DEFAULT_STEP_SIZE = 0.0001;
+
+    public function __construct(
+        Refinery $refinery,
+        private readonly Language $lng,
+        private readonly UIFactory $ui_factory
+    ) {
+        parent::__construct($refinery);
+    }
 
     public function getIdentifier(): string
     {
         return 'numeric';
     }
 
-    public function withData(Data $data): Type
+    public function getEditAnswerOptionsInputs(Data $data): array
     {
-        $clone = clone $this;
-        $clone->lower_limit = $data->getLowerLimit();
-        $clone->upper_limit = $data->getUpperLimit();
-        if ($data->getStepSize() !== null) {
-            return $this->step_size = $data->getStepSize();
-        }
-        return $clone;
-    }
-
-    public function getEditInputs(
-        Language $lng,
-        FieldFactory $ff,
-        Refinery $refinery
-    ): array {
+        $answer_option = $data->getAnswerOptions()->getAnswerOptionForPositionOrNew(0);
+        $ff = $this->ui_factory->input()->field();
         return [
-            'lower_limit' => $ff->numeric('lower_limit')
-                ->withStepSize($this->step_size)
+            'lower_limit' => $ff->numeric($this->lng->txt('lower_limit'))
+                ->withStepSize($data->getStepSize() ?? self::DEFAULT_STEP_SIZE)
                 ->withRequired(true)
-                ->withValue($this->lower_limit),
-            'upper_limit' => $ff->numeric('upper_limit')
-                ->withStepSize(0.00000001)
-                ->withValue($this->upper_limit),
-            'step_size' => $ff->numeric('step_size')
-                ->withStepSize($this->step_size)
+                ->withValue($answer_option->getLowerLimit()),
+            'upper_limit' => $ff->numeric($this->lng->txt('upper_limit'))
+                ->withStepSize($data->getStepSize() ?? self::DEFAULT_STEP_SIZE)
+                ->withValue($answer_option->getUpperLimit()),
+            'step_size' => $ff->numeric($this->lng->txt('step_size'))
+                ->withStepSize(0.000001)
                 ->withRequired(true)
-                ->withValue($this->step_size)
+                ->withValue($data->getStepSize() ?? self::DEFAULT_STEP_SIZE)
         ];
     }
 
-    public function getEditSectionConstraint(
-        Refinery $refinery,
-        Language $lng
-    ): ?Constraint {
-        return $refinery->custom()->constraint(
-            fn(array $v): bool => $vs['upper_limit'] === null
+    public function getEditAnswerOptionsSectionConstraint(): ?Constraint
+    {
+        return $this->refinery->custom()->constraint(
+            fn(array $vs): bool => $vs['upper_limit'] === null
                 || $vs['upper_limit'] >= $vs['lower_limit']
                     && $vs['upper_limit'] >= $vs['step_size'],
-            $lng->txt('error')
+            $this->lng->txt('upper_limit_bigger_than_lower')
         );
     }
 
-    public function getBuildGapTransformation(
-        Refinery $refinery,
-        Uuid $answer_input_id
-    ): Transformation {
-        return $refinery->custom()->transformation(
-            fn(array $vs): self => new self(
-                $answer_input_id,
-                $vs['lower_limit'],
-                $vs['upper_limit'],
-                $vs['step_size']
-            )
+    public function getEditPointsInputs(AnswerOptions $answer_options): array
+    {
+        $inputs = $answer_options->getEditPointsInputs(
+            $this->ui_factory->input()->field(),
+            function (AnswerOption $v): string {
+                if ($v->getUpperLimit() === null) {
+                    return sprintf(
+                        $this->lng->txt('equal'),
+                        $v->getLowerLimit()
+                    );
+                }
+
+                return sprintf(
+                    $this->lng->txt('between'),
+                    $v->getLowerLimit(),
+                    $v->getUpperLimit()
+                );
+            }
         );
+        return array_map(
+            fn(NumericInput $v): NumericInput => $v->withRequired(true),
+            $inputs
+        );
+    }
+
+    public function getEditPointsSectionConstraint(): ?Constraint
+    {
+        return null;
     }
 
-    public function addValuesToData(Data $data): Data
+    public function getBuildGapTransformation(Gap $gap): Transformation
     {
-        return $data->withLowerLimit($this->lower_limit)
-            ->withUpperLimit($this->upper_limit)
-            ->withStepSize($this->step_size);
+        $data = $gap->getData();
+        return $this->refinery->custom()->transformation(
+            fn(array $vs): Gap => $gap->withData(
+                $data->withAnswerOptions(
+                    $data->getAnswerOptions()->withAnswerOptions([
+                        $data->getAnswerOptions()->getAnswerOptionForPositionOrNew(0)
+                            ->withLowerLimit($vs['lower_limit'])
+                            ->withUpperLimit($vs['upper_limit'])
+                        ])
+                )->withStepSize($vs['step_size'])
+            )
+        );
     }
 
     public function getAnswerInput(): \ilFormPropertyGUI
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
index b959bc8b26ea..220902079652 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
@@ -20,69 +20,85 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Data\UUID\Uuid;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
 use ILIAS\Refinery\Transformation;
-use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Factory as UIFactory;
 
-class Select implements Type
+class Select extends Type
 {
-    private bool $shuffle_answer_options = false;
+    private const bool DEFAULT_SHUFFLE_ANSWER_OPTIONS = false;
+
+    public function __construct(
+        Refinery $refinery,
+        private readonly Language $lng,
+        private readonly UIFactory $ui_factory
+    ) {
+        parent::__construct($refinery);
+    }
 
     public function getIdentifier(): string
     {
         return 'select';
     }
 
-    public function withData(Data $data): self
+    public function getEditAnswerOptionsInputs(Data $data): array
     {
-        if ($data->getShuffleAnswerOptions() === null) {
-            return $this;
-        }
-
-        $clone = clone $this;
-        $clone->shuffle_answer_options = $data->getShuffleAnswerOptions();
-        return $clone;
-    }
-
-    public function getEditInputs(
-        Language $lng,
-        FieldFactory $ff,
-        Refinery $refinery
-    ): array {
+        $ff = $this->ui_factory->input()->field();
         return [
             'answer_options' => $ff->tag(
-                $lng->txt('answer_options'),
+                $this->lng->txt('answer_options'),
                 []
             )->withRequired(true)
-            ->withValue($this->buildTagsArrayFromAnswerOptions($this->answer_options))
+            ->withValue($data->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
+            'shuffle_answer_options' => $ff->checkbox(
+                $this->lng->txt('shuffle_answers')
+            )->withValue($data?->getShuffleAnswerOptions() ?? self::DEFAULT_SHUFFLE_ANSWER_OPTIONS)
         ];
     }
 
-    public function getEditSectionConstraint(
-        Refinery $refinery,
-        Language $lng
-    ): ?Constraint {
+    public function getEditAnswerOptionsSectionConstraint(): ?Constraint
+    {
         return null;
     }
 
-    public function getBuildGapTransformation(
-        Refinery $refinery,
-        Uuid $answer_input_id
-    ): Transformation {
-        return $refinery->custom()->transformation(
-            fn(array $vs): self => new self(
-                $answer_input_id,
-                $vs['answer_options']
-            )
+    public function getEditPointsInputs(AnswerOptions $answer_options): array
+    {
+        return $answer_options->getEditPointsInputs(
+            $this->ui_factory->input()->field(),
+            fn(AnswerOption $v): string => $v->getTextValue()
+        );
+    }
+
+    public function getEditPointsSectionConstraint(): ?Constraint
+    {
+        return $this->refinery->custom()->constraint(
+            function (array $vs): bool {
+                foreach ($vs as $v) {
+                    if ($v > 0.0) {
+                        return true;
+                    }
+                }
+                return false;
+            },
+            $this->lng->txt('at_least_one_gap_positiv_points')
         );
     }
 
-    public function addValuesToData(Data $data): Data
+    public function getBuildGapTransformation(Gap $gap): Transformation
     {
-        return $data->withShuffleAnswerOptions($this->shuffle_answer_options);
+        $data = $gap->getData();
+        return $this->refinery->custom()->transformation(
+            fn(array $vs): Gap => $gap->withData(
+                $data->withAnswerOptions(
+                    $data->getAnswerOptions()->withAnswerOptionsFromTags($vs['answer_options'])
+                )
+            )
+        );
     }
 
     public function getAnswerInput(): \ilFormPropertyGUI
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
index e306ac61918b..1e0bcb93c136 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
@@ -20,81 +20,99 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
 use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
-use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
 use ILIAS\Refinery\Transformation;
-use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Factory as UIFactory;
 
-class Text implements Type
+class Text extends Type
 {
-    private ?int $max_chars = null;
-    private TextMatchingOptions $text_matching_method = TextMatchingOptions::CaseInsensitive;
+    private const TextMatchingOptions DEFAULT_TECT_MATCHING_METHOD = TextMatchingOptions::CaseInsensitive;
+
+    public function __construct(
+        Refinery $refinery,
+        private readonly Language $lng,
+        private readonly UIFactory $ui_factory
+    ) {
+        parent::__construct($refinery);
+    }
 
     public function getIdentifier(): string
     {
         return 'text';
     }
 
-    public function withData(Data $data): self
+    public function getEditAnswerOptionsInputs(Data $data): array
     {
-        $clone = clone $this;
-        $clone->max_chars = $data->getMaxChars();
-        if ($data->getTextMatchingMethod() !== null) {
-            return $clone->text_matching_method = $data->getTextMatchingMethod();
-        }
-        return $clone;
-    }
-
-    public function getEditInputs(
-        Language $lng,
-        FieldFactory $ff,
-        Refinery $refinery
-    ): array {
+        $ff = $this->ui_factory->input()->field();
         return [
             'answer_options' => $ff->tag(
-                $lng->txt('answer_options'),
+                $this->lng->txt('answer_options'),
                 []
             )->withRequired(true)
-            ->withValue($this->buildTagsArrayFromAnswerOptions($this->answer_options)),
+            ->withValue($data->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
             'matching_method' => $ff->select(
-                $lng->txt('matching_method'),
-                TextMatchingOptions::buildOptionsList($lng)
+                $this->lng->txt('matching_method'),
+                TextMatchingOptions::buildOptionsList($this->lng)
             )->withRequired(true)
-            ->withValue($this->text_matching_method->value),
+            ->withValue($data->getTextMatchingMethod()?->value ?? self::DEFAULT_TECT_MATCHING_METHOD->value),
             'max_chars' => $ff->numeric(
-                $lng->txt('max_chars'),
-            )->withValue($this->max_chars)
+                $this->lng->txt('max_chars'),
+            )->withValue($data->getMaxChars())
         ];
     }
 
-    public function getEditSectionConstraint(
-        Refinery $refinery,
-        Language $lng
-    ): ?Constraint {
-        return null;
+    public function getEditAnswerOptionsSectionConstraint(): ?Constraint
+    {
+        return $this->refinery->custom()->constraint(
+            fn(array $vs): bool => array_filter(
+                $vs['answer_options'],
+                fn(string $v): bool => in_array($v, $vs['answer_options'])
+            ) !== [],
+            $this->lng->txt('answer_options_must_be_unique')
+        );
     }
 
-    public function getBuildGapTransformation(
-        Refinery $refinery,
-        Uuid $answer_input_id
-    ): Transformation {
-        return $refinery->custom()->transformation(
-            fn(array $vs): self => new self(
-                $answer_input_id,
-                $vs['max_chars'],
-                $vs['matching_method'],
-                $vs['answer_options']
-            )
+    public function getEditPointsInputs(AnswerOptions $answer_options): array
+    {
+        return $answer_options->getEditPointsInputs(
+            $this->ui_factory->input()->field(),
+            fn(AnswerOption $v): string => $v->getTextValue()
+        );
+    }
+
+    public function getEditPointsSectionConstraint(): ?Constraint
+    {
+        return $this->refinery->custom()->constraint(
+            function (array $vs): bool {
+                foreach ($vs as $v) {
+                    if ($v > 0.0) {
+                        return true;
+                    }
+                }
+                return false;
+            },
+            $this->lng->txt('at_least_one_gap_positiv_points')
         );
     }
 
-    public function addValuesToData(Data $data): Data
+    public function getBuildGapTransformation(Gap $gap): Transformation
     {
-        return $data->withMaxChars($this->max_chars)
-            ->withTextMatchingMethods($this->text_matching_method);
+        $data = $gap->getData();
+        return $this->refinery->custom()->transformation(
+            fn(array $vs): Gap => $gap->withData(
+                $data->withMaxChars($vs['max_chars'])
+                    ->withTextMatchingMethod(TextMatchingOptions::tryFrom($vs['matching_method']) ?? self::DEFAULT_TECT_MATCHING_METHOD)
+                    ->withAnswerOptions(
+                        $data->getAnswerOptions()->withAnswerOptionsFromTags($vs['answer_options'])
+                    )
+            )
+        );
     }
 
     public function getAnswerInput(): \ilFormPropertyGUI
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
index 1b1d489c47bc..181649f153ca 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
@@ -20,34 +20,37 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Data\UUID\Uuid;
-use ILIAS\Language\Language;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
 use ILIAS\Refinery\Transformation;
-use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 
-interface Type
+abstract class Type
 {
-    public function getIdentifier(): string;
-    public function withData(Data $data): self;
-    public function getEditInputs(
-        Language $lng,
-        FieldFactory $ff,
-        Refinery $refinery
-    ): array;
-
-    public function getEditSectionConstraint(
-        Refinery $refinery,
-        Language $lng
-    ): ?Constraint;
-
-    public function getBuildGapTransformation(
-        Refinery $refinery,
-        Uuid $answer_input_id
-    ): Transformation;
-
-    public function addValuesToData(Data $data): Data;
-
-    public function getAnswerInput(): \ilFormPropertyGUI;
+    public function __construct(
+        protected readonly Refinery $refinery
+    ) {
+    }
+
+    abstract public function getIdentifier(): string;
+    abstract public function getEditAnswerOptionsInputs(Data $data): array;
+    abstract public function getEditAnswerOptionsSectionConstraint(): ?Constraint;
+    abstract public function getEditPointsInputs(AnswerOptions $answer_options): array;
+    abstract public function getEditPointsSectionConstraint(): ?Constraint;
+    abstract public function getBuildGapTransformation(Gap $gap): Transformation;
+    abstract public function getAnswerInput(): \ilFormPropertyGUI;
+
+    public function getAddPointsTransformation(Gap $gap): Transformation
+    {
+        $data = $gap->getData();
+        return $this->refinery->custom()->transformation(
+            fn(array $vs): Gap => $gap->withData(
+                $data->withAnswerOptions(
+                    $data->getAnswerOptions()
+                        ->withAnswerOptionsWithAddedPointsFromForm($this->refinery, $vs)
+                )
+            )
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/class.UploadAnswerOptionsGUI.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/class.UploadAnswerOptionsGUI.php
new file mode 100755
index 000000000000..99ab4d033dc2
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/class.UploadAnswerOptionsGUI.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
+
+use ILIAS\FileUpload\Handler\AbstractCtrlAwareUploadHandler;
+use ILIAS\FileUpload\Handler\BasicFileInfoResult;
+use ILIAS\FileUpload\Handler\BasicHandlerResult;
+use ILIAS\FileUpload\Handler\FileInfoResult;
+use ILIAS\FileUpload\Handler\HandlerResult;
+use ILIAS\FileUpload\DTO\UploadResult;
+
+/**
+ *
+ * @author Stephan Kergomard <webmaster@kergomard.ch>
+ * @ilCtrl_isCalledBy ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\UploadAnswerOptionsGUI: ilObjQuestionsGUI
+ */
+class UploadAnswerOptionsGUI extends AbstractCtrlAwareUploadHandler
+{
+    protected function getUploadResult(): HandlerResult
+    {
+        $this->upload->process();
+
+        $result_array = $this->upload->getResults();
+        $result = end($result_array);
+
+        if (!($result instanceof UploadResult) || !$result->isOK()) {
+            return new BasicHandlerResult(
+                $this->getFileIdentifierParameterName(),
+                HandlerResult::STATUS_FAILED,
+                '',
+                $result->getStatus()->getMessage()
+            );
+        }
+
+        $content = base64_encode(file_get_contents($result->getPath()));
+        unlink($result->getPath());
+
+        return new BasicHandlerResult(
+            $this->getFileIdentifierParameterName(),
+            HandlerResult::STATUS_OK,
+            $content,
+            'file upload OK'
+        );
+    }
+
+    protected function getRemoveResult(string $identifier): HandlerResult
+    {
+        return new BasicHandlerResult(
+            $this->getFileIdentifierParameterName(),
+            HandlerResult::STATUS_OK,
+            $identifier,
+            'We just don\'t do anything here.'
+        );
+    }
+
+    public function getInfoResult(string $identifier): ?FileInfoResult
+    {
+        return new BasicFileInfoResult(
+            $this->getFileIdentifierParameterName(),
+            $identifier,
+            'unknown',
+            0,
+            'unknown'
+        );
+    }
+
+    /**
+     * @return \ILIAS\FileUpload\Handler\BasicFileInfoResult[]
+     */
+    public function getInfoForExistingFiles(array $file_ids): array
+    {
+        $info_results = [];
+        foreach ($file_ids as $identifier) {
+            $info_results[] = $this->getInfoResult($identifier);
+        }
+
+        return $info_results;
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 96a36ae04318..50d9f76982d2 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -24,14 +24,10 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Type;
 use ILIAS\Questions\Question\Persistence\ManipulateQuery;
 use ILIAS\HTTP\Services as HTTPServices;
-use ILIAS\Data\Factory as DataFactory;
-use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Language\Language;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
@@ -56,8 +52,6 @@ public function __construct(
         private readonly UIFactory $ui_factory,
         private readonly Refinery $refinery,
         private readonly HTTPServices $http,
-        private readonly UuidFactory $uuid_factory,
-        private readonly DataFactory $data_factory,
         private readonly PropertiesFactory $properties_factory,
         private readonly ClozeTextFactory $cloze_text_factory,
         private readonly GapFactory $gap_factory
@@ -73,6 +67,7 @@ public function create(
             self::STEP_SET_GAP_TYPES => $this->processBasicEditingForm($url_builder, $step_token),
             self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm($url_builder, $step_token),
             self::STEP_SET_POINTS => $this->processAnswerOptionsForm($url_builder, $step_token),
+            self::STEP_SAVE => $this->processAssignPointsForm($url_builder, $step_token),
             default => [$this->buildBasicEditingForm($url_builder, $step_token)]
         };
     }
@@ -132,30 +127,12 @@ private function processBasicEditingForm(
             $this->buildGapTypesForm(
                 $url_builder,
                 $step_token,
-                $data['form']->withNewGapsFromClozeText()
+                $data[self::MAIN_SECTION_NAME]
             ),
-            $data[self::MAIN_SECTION_NAME]->getClozeText()
+            $data[self::MAIN_SECTION_NAME]
         );
     }
 
-    private function buildOutputWithPanel(
-        StandardForm $form,
-        ClozeText $cloze_text,
-        ?Gaps $gaps = null
-    ): array {
-        return [
-            $this->ui_factory->panel()->standard(
-                $this->lng->txt('cloze_text'),
-                $this->ui_factory->legacy()->content(
-                    $cloze_text->getRenderedMarkdown(
-                        $gaps ?? $cloze_text->getGaps()
-                    )
-                )
-            ),
-            $form
-        ];
-    }
-
     private function buildGapTypesForm(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
@@ -190,23 +167,24 @@ private function processGapTypesForm(
             $step_token,
             $properties
         )->withRequest($this->http->request());
-        $data = $form->getData();
-        if ($data === null) {
-            return [$form];
-        }
 
+        $data = $form->getData();
         return $this->buildOutputWithPanel(
-            $this->buildAnswerOptionsForm($url_builder, $step_token, $properties, $data[self::MAIN_SECTION_NAME]),
-            $properties->getClozeText(),
-            $data
+            $data === null
+                ? $form
+                : $this->buildAnswerOptionsForm(
+                    $url_builder,
+                    $step_token,
+                    $properties->withGaps($data[self::MAIN_SECTION_NAME])
+                ),
+            $properties
         );
     }
 
     private function buildAnswerOptionsForm(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
-        Properties $properties,
-        array $data
+        Properties $properties
     ): StandardForm {
         $ff = $this->ui_factory->input()->field();
         return $this->ui_factory->input()->container()->form()->standard(
@@ -229,18 +207,17 @@ private function processAnswerOptionsForm(
             $step_token,
             $properties
         )->withRequest($this->http->request());
-        $data = $form->getData();
-        if ($data === null) {
-            return [$form];
-        }
 
+        $data = $form->getData();
         return $this->buildOutputWithPanel(
-            $this->buildAssignPointsForm(
-                $url_builder,
-                $step_token,
-                $properties->withGaps(data[self::MAIN_SECTION_NAME])
-            ),
-            $properties->getClozeText()
+            $data === null
+                ? $form
+                : $this->buildAssignPointsForm(
+                    $url_builder,
+                    $step_token,
+                    $properties->withGaps($data[self::MAIN_SECTION_NAME])
+                ),
+            $properties
         );
     }
 
@@ -249,51 +226,65 @@ private function buildAssignPointsForm(
         URLBuilderToken $step_token,
         Properties $properties
     ): StandardForm {
-        $gaps = $properties->getGaps();
         $ff = $this->ui_factory->input()->field();
         return $this->ui_factory->input()->container()->form()->standard(
             $url_builder->withParameter($step_token, self::STEP_SAVE)->buildURI()->__toString(),
             [
-                self::MAIN_SECTION_NAME => $ff->section(
-                    array_reduce(
-                        array_keys($data),
-                        function (array $c, string $v) use ($ff, $cloze_text, $data): array {
-                            $answer_input_id = $this->uuid_factory->fromString($v);
-                            $gap = $this->gap_factory->getEmptyGapByIdentifier($data[$v])
-                                ->withAnswerInputId($answer_input_id);
-                            if ($gap === null) {
-                                return $c;
-                            }
-                            $c[$v] = $gap->getEditSection(
-                                $this->lng,
-                                $this->ui_factory->input()->field(),
-                                $this->refinery,
-                                $cloze_text->buildShortenedGapName($answer_input_id)
-                            );
-                            return $c;
-                        },
-                        []
-                    ),
-                    $this->lng->txt('add_answer_options')
-                ),
+                self::MAIN_SECTION_NAME => $properties->getGaps()->buildPointInputs($this->lng, $ff, $this->refinery),
                 self::PROPERTIES_SECTION_NAME => $properties->buildBasicEditingInputsHidden($ff)
                     ->withDedicatedName(self::PROPERTIES_SECTION_NAME)
             ]
         )->withSubmitLabel($this->lng->txt('save'));
     }
 
+    private function processAssignPointsForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): array|ManipulateQuery {
+        $properties = $this->retrievePropertiesFromPost();
+        $form = $this->buildAssignPointsForm(
+            $url_builder,
+            $step_token,
+            $properties
+        )->withRequest($this->http->request());
+
+        $data = $form->getData();
+        if ($data === null) {
+            return $this->buildOutputWithPanel($form, $properties);
+        }
+
+        return $this->save($properties->withGaps($data[self::MAIN_SECTION_NAME]));
+    }
+
+    private function buildOutputWithPanel(
+        StandardForm $form,
+        Properties $properties
+    ): array {
+        return [
+            $this->ui_factory->panel()->standard(
+                $this->lng->txt('cloze_text'),
+                $this->ui_factory->legacy()->content(
+                    $properties->getClozeText()->getRenderedMarkdown(
+                        $properties->getGaps()
+                    )
+                )
+            ),
+            $form
+        ];
+    }
+
+    private function save(Properties $properties): ManipulateQuery
+    {
+        return $properties->toPersistence();
+    }
+
     private function retrievePropertiesFromPost(): Properties
     {
-        $properties = $this->type->getProperties();
-        return $this->properties_factory->fromPost(
+
+        return $this->type->getProperties()->withValuesFromPost(
             $this->refinery,
             $this->http->wrapper()->post(),
-            'form/' . self::PROPERTIES_SECTION_NAME,
-            $properties->getAnswerFormId(),
-            $properties->getGaps(),
-            $properties->getLegacyClozeText(),
-            $properties->getScoringOfIdenticalResponses(),
-            $properties->areCombinationsActivated()
+            'form/' . self::PROPERTIES_SECTION_NAME
         );
     }
 }
diff --git a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
index 962a6123d8df..1237fd2d08e9 100644
--- a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
@@ -79,6 +79,11 @@ public function step_2(): void
                     'length' => 64,
                     'notnull' => true
                 ],
+                'position' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 2,
+                    'notnull' => true
+                ],
                 'gap_type' => [
                     'type' => \ilDBConstants::T_TEXT,
                     'length' => 32,
@@ -107,14 +112,6 @@ public function step_2(): void
                     'type' => \ilDBConstants::T_INTEGER,
                     'length' => 1,
                     'notnull' => false
-                ],
-                'lower_limit' => [
-                    'type' => \ilDBConstants::T_FLOAT,
-                    'notnull' => false
-                ],
-                'upper_limit' => [
-                    'type' => \ilDBConstants::T_FLOAT,
-                    'notnull' => false
                 ]
             ]);
         }
@@ -148,10 +145,18 @@ public function step_3(): void
                     'length' => 2,
                     'notnull' => true
                 ],
-                 'value' => [
+                'text_value' => [
                     'type' => \ilDBConstants::T_TEXT,
                     'length' => 4000,
-                    'notnull' => true
+                    'notnull' => false
+                ],
+                'lower_limit' => [
+                    'type' => \ilDBConstants::T_FLOAT,
+                    'notnull' => false
+                ],
+                'upper_limit' => [
+                    'type' => \ilDBConstants::T_FLOAT,
+                    'notnull' => false
                 ],
                 'points' => [
                     'type' => \ilDBConstants::T_FLOAT,

From f1b97f29b11ecac10ab36d84e6efc59686f7ba4f Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 5 Dec 2025 14:17:11 +0100
Subject: [PATCH 086/141] Implement Cloze Question

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  8 +--
 components/ILIAS/Questions/Questions.php      | 14 +---
 .../AnswerForm/Capabilities/Capability.php    |  3 -
 .../AnswerForm/{Type.php => Definition.php}   | 13 +---
 .../Factory.php                               | 31 +++++---
 .../ILIAS/Questions/src/AnswerForm/Form.php   |  7 +-
 .../src/AnswerForm/TypeSpecificData.php       | 72 +++++++++++++++++++
 .../Cloze/Capabilities/Feedback.php           | 10 ---
 .../Cloze/Capabilities/Marking.php            |  9 ---
 .../Cloze/Capabilities/Skills.php             | 10 ---
 .../Cloze/{Type.php => Definition.php}        | 10 +--
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 12 +---
 .../Cloze/Views/Participant.php               |  9 ---
 .../ILIAS/Questions/src/Presentation/Edit.php | 21 ++----
 .../src/Question/Persistence/Repository.php   |  2 +-
 15 files changed, 119 insertions(+), 112 deletions(-)
 rename components/ILIAS/Questions/src/AnswerForm/{Type.php => Definition.php} (80%)
 rename components/ILIAS/Questions/src/{AnswerFormTypes => AnswerForm}/Factory.php (54%)
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/TypeSpecificData.php
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/{Type.php => Definition.php} (91%)

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index d09078855e44..59a70f626023 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -23,7 +23,7 @@
 use ILIAS\Questions\Question\Persistence\Repository as QuestionsRepository;
 use ILIAS\Questions\AnswerFormTypes\Cloze;
 use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
-use ILIAS\Questions\AnswerFormTypes\Factory as AnswerFormTypesFactory;
+use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\Presentation\Edit;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Factory as UuidFactory;
@@ -49,8 +49,8 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic[DataFactory::class] = static fn($c): DataFactory => new DataFactory();
         $dic[UuidFactory::class] = static fn($c): UuidFactory => new UuidFactory();
 
-        $dic[AnswerFormTypesFactory::class] = static fn($c): AnswerFormTypesFactory
-            => new AnswerFormTypesFactory([
+        $dic[AnswerFormFactory::class] = static fn($c): AnswerFormFactory
+            => new AnswerFormFactory([
                 $c[Cloze\Type::class]
             ]);
         $dic[QuestionsRepository::class] = static fn($c): QuestionsRepository =>
@@ -70,7 +70,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
             $DIC->uiService(),
             $c[DataFactory::class],
             $c[UuidFactory::class],
-            $c[AnswerFormTypesFactory::class],
+            $c[AnswerFormFactory::class],
             $c[QuestionsRepository::class]
         );
 
diff --git a/components/ILIAS/Questions/Questions.php b/components/ILIAS/Questions/Questions.php
index edc40c9542b5..32633b7e0ae1 100644
--- a/components/ILIAS/Questions/Questions.php
+++ b/components/ILIAS/Questions/Questions.php
@@ -20,9 +20,7 @@
 
 namespace ILIAS;
 
-use ILIAS\Questions\AnswerForm\Type as AnswerFormType;
-use ILIAS\Questions\AnswerFormTypes\Cloze;
-use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
+use ILIAS\Questions\AnswerForm\Definition as AnswerFormDefinition;
 use ILIAS\Questions\Setup\Agent;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Setup\Agent as AgentInterface;
@@ -39,18 +37,10 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        $define[] = AnswerFormType::class;
+        $define[] = AnswerFormDefinition::class;
         $contribute[AgentInterface::class] = static fn() =>
             new Agent(
                 $pull[Refinery::class]
             );
-        /*        $contribute[AnswerFormType::class] = fn() => new Cloze\Type(
-                    new Cloze\Persistence(
-                        new TableNameSpaceCore('cloze')
-                    ),
-                    new Cloze\Marking(),
-                    new Cloze\Views\Edit(),
-                    new Cloze\Views\ParticipantView()
-                ); */
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php
index 856da90dd100..18f055fc1589 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Capability.php
@@ -20,10 +20,7 @@
 
 namespace ILIAS\Questions\AnswerForm\Capabilities;
 
-use ILIAS\Questions\AnswerForm;
-
 interface Capability
 {
     public function isConfigured(): bool;
-    public function withAnswerForm(AnswerForm $answer_form): self;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Type.php b/components/ILIAS/Questions/src/AnswerForm/Definition.php
similarity index 80%
rename from components/ILIAS/Questions/src/AnswerForm/Type.php
rename to components/ILIAS/Questions/src/AnswerForm/Definition.php
index c0fbf81ecbce..fd9458585108 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Type.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Definition.php
@@ -25,20 +25,9 @@
 use ILIAS\Questions\AnswerForm\Views\Participant;
 use ILIAS\Language\Language;
 
-interface Type
+interface Definition
 {
-    public function withData(
-        string $id,
-        ?float $available_points,
-        ?int $image_size,
-        ?bool $shuffle_answer_options,
-        string $additional_text,
-        string $additional_text_legacy,
-        ?array $data
-    ): static;
-
     public function getLabel(Language $lng): string;
-
     public function getPersistence(): Persistence;
     public function hasCapability(string $capability_class_name): bool;
     public function getCapability(string $capability_class_name): ?Capability;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Factory.php b/components/ILIAS/Questions/src/AnswerForm/Factory.php
similarity index 54%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Factory.php
rename to components/ILIAS/Questions/src/AnswerForm/Factory.php
index 4dc0b6dfc17a..7b1e988511a5 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Factory.php
@@ -18,19 +18,19 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes;
+namespace ILIAS\Questions\AnswerForm;
 
-use ILIAS\Questions\AnswerForm\Type;
+use ILIAS\Questions\AnswerForm\Definition;
 
 class Factory
 {
     /**
-     * @var array<string, \ILIAS\Questions\AnswerForm\Type> $available_answer_form_types
+     * @var array<string, \ILIAS\Questions\AnswerForm\Definition> $available_answer_form_types
      */
     private readonly array $available_answer_form_types;
 
     /**
-     * @param array<\ILIAS\Questions\AnswerForm\Type> $available_answer_form_types
+     * @param array<\ILIAS\Questions\AnswerForm\Definition> $available_answer_form_types
      */
     public function __construct(
         array $available_answer_form_types
@@ -46,11 +46,18 @@ function (array $c, Type $v) {
     }
 
     /**
-     * @return array<string, \ILIAS\Questions\AnswerForm\Type>
+     * @return array<string, \ILIAS\Questions\AnswerForm\Definition>
      */
-    public function getAvailableAnswerFormTypes(): array
+    public function getAnswerFormTypesArrayForSelect(): array
     {
-        return $this->available_answer_form_types;
+        return array_reduce(
+            $this->available_answer_form_types,
+            function (array $c, Definition $v): array {
+                $c[$this->getHashedClass($v::class)] = $v->getLabel($this->lng);
+                return $c;
+            },
+            []
+        );
     }
 
     public function getHashedClass(string $class): string
@@ -58,8 +65,14 @@ public function getHashedClass(string $class): string
         return md5($class);
     }
 
-    public function getAnswerFormTypeByClassHash(string $class_hash): ?Type
+    public function buildAnswerFormFromSelectValue(string $value): Form
     {
-        return $this->available_answer_form_types[$class_hash] ?? null;
+        $type = $this->available_answer_form_types[$value] ?? null;
+        if ($type === null) {
+            throw new InvalidArgumentException('This type of answer form does not exist.');
+        }
+        return new Form(
+            $type,
+        );
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Form.php b/components/ILIAS/Questions/src/AnswerForm/Form.php
index 140fb0f12589..b51a5255ad9e 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Form.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Form.php
@@ -25,16 +25,17 @@
 class Form
 {
     public function __construct(
-        private readonly Type $type,
+        private readonly Definition $type_definition,
         private readonly Uuid $question_id,
         private ?Uuid $id = null,
+        private ?TypeSpecificData $type_specific_data = null,
         private ?Skills $skills = null
     ) {
     }
 
-    public function getType(): Type
+    public function getTypeDefinition(): Definition
     {
-        return $this->type;
+        return $this->type_definition;
     }
 
     public function getQuestionId(): Uuid
diff --git a/components/ILIAS/Questions/src/AnswerForm/TypeSpecificData.php b/components/ILIAS/Questions/src/AnswerForm/TypeSpecificData.php
new file mode 100644
index 000000000000..121a35a8ab3b
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/TypeSpecificData.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm;
+
+use ILIAS\Data\UUID\Uuid;
+
+class TypeSpecificData
+{
+    public function __construct(
+        private Uuid $answer_form_id,
+        private ?float $available_points,
+        private ?int $image_size,
+        private ?bool $shuffle_answer_options,
+        private string $additional_text,
+        private string $additional_text_legacy,
+        private array $additional_data,
+    ) {
+    }
+
+    public function getAnswerFormId(): Uuid
+    {
+        return $this->answer_form_id;
+    }
+
+    public function getAvailablePoints(): ?float
+    {
+        return $this->available_points;
+    }
+
+    public function getImageSize(): ?int
+    {
+        return $this->image_size;
+    }
+
+    public function getShuffleAnswerOptions(): ?bool
+    {
+        return $this->shuffle_answer_options;
+    }
+
+    public function getAdditionalText(): string
+    {
+        return $this->additional_text;
+    }
+
+    public function getAdditionalTextLegacy(): string
+    {
+        return $this->additional_text_legacy;
+    }
+
+    public function getAdditionalData(): array
+    {
+        return $this->additional_data;
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
index df2d5ceefd45..f7e6c9176f32 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
@@ -22,24 +22,14 @@
 
 use ILIAS\Questions\AnswerForm\Capabilities\Feedback as FeedbackInterface;
 use ILIAS\Questions\Question\Response;
-use ILIAS\Questions\AnswerForm;
 
 class Feedback implements FeedbackInterface
 {
-    private ?AnswerForm $answer_form = null;
-
     public function isConfigured(): bool
     {
         return false;
     }
 
-    public function withAnswerForm(AnswerForm $answer_form): self
-    {
-        $clone = clone $this;
-        $clone->answer_form = $answer_form;
-        return $clone;
-    }
-
     public function getGeneralFeedback(Response $response): array
     {
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
index 92be39b13791..97a3a1ee3812 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
@@ -26,20 +26,11 @@
 
 class Marking implements MarkingInterface
 {
-    private ?AnswerForm $answer_form = null;
-
     public function isConfigured(): bool
     {
         return false;
     }
 
-    public function withAnswerForm(AnswerForm $answer_form): self
-    {
-        $clone = clone $this;
-        $clone->answer_form = $answer_form;
-        return $clone;
-    }
-
     public function addAchievedPointsToResponse(Response $response): Response
     {
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php
index 1d15759e7ed0..0e3ff7fead41 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php
@@ -22,24 +22,14 @@
 
 use ILIAS\Questions\AnswerForm\Capabilities\Skills as SkillsInterface;
 use ILIAS\Questions\Question\Response;
-use ILIAS\Questions\AnswerForm;
 
 class Skills implements SkillsInterface
 {
-    private ?AnswerForm $answer_form = null;
-
     public function isConfigured(): bool
     {
         return false;
     }
 
-    public function withAnswerForm(AnswerForm $answer_form): self
-    {
-        $clone = clone $this;
-        $clone->answer_form = $answer_form;
-        return $clone;
-    }
-
     public function getSkillPointsForResponse(Response $response): float
     {
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
similarity index 91%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
index 48b8894ebf2e..955051381b3b 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze;
 
-use ILIAS\Questions\AnswerForm\Type as TypeInterface;
+use ILIAS\Questions\AnswerForm\Definition as DefinitionInterface;
 use ILIAS\Questions\AnswerForm\Capabilities\Capability;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
@@ -28,7 +28,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Participant;
 use ILIAS\Language\Language;
 
-class Type implements TypeInterface
+class Definition implements DefinitionInterface
 {
     private Properties $properties;
 
@@ -85,16 +85,16 @@ public function hasCapability(string $capability_class_name): bool
 
     public function getCapability(string $capability_class_name): ?Capability
     {
-        return $this->available_capabilities[$capability_class_name]?->withAnswerForm($this);
+        return $this->available_capabilities[$capability_class_name];
     }
 
     public function getEditView(): Edit
     {
-        return $this->edit_view->withAnswerForm($this);
+        return $this->edit_view;
     }
 
     public function getParticipantView(): Participant
     {
-        return $this->participant_view->withAnswerForm($this);
+        return $this->participant_view;
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 50d9f76982d2..cefb14c14553 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -25,7 +25,6 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Type;
 use ILIAS\Questions\Question\Persistence\ManipulateQuery;
 use ILIAS\HTTP\Services as HTTPServices;
 use ILIAS\Language\Language;
@@ -45,8 +44,6 @@ class Edit implements EditViewInterface
     private const string MAIN_SECTION_NAME = 'form';
     private const string PROPERTIES_SECTION_NAME = 'properties';
 
-    private ?Type $type = null;
-
     public function __construct(
         private readonly Language $lng,
         private readonly UIFactory $ui_factory,
@@ -61,7 +58,7 @@ public function __construct(
     public function create(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
-        string $step
+        string $step,
     ): array|ManipulateQuery {
         return match($step) {
             self::STEP_SET_GAP_TYPES => $this->processBasicEditingForm($url_builder, $step_token),
@@ -88,13 +85,6 @@ public function other(
 
     }
 
-    public function withAnswerForm(Type $type): self
-    {
-        $clone = clone $this;
-        $clone->type = $type;
-        return $clone;
-    }
-
     private function buildBasicEditingForm(
         URLBuilder $url_builder,
         URLBuilderToken $step_token
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
index 19f82ace8cb1..135596235c55 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
@@ -26,8 +26,6 @@
 
 class Participant implements ParticipantViewInterface
 {
-    private ?Type $type = null;
-
     public function isAsyncPresentationAvailable(): bool
     {
         return true;
@@ -38,11 +36,4 @@ public function get(
     ): array {
 
     }
-
-    public function withAnswerForm(Type $type): self
-    {
-        $clone = clone $this;
-        $clone->type = $type;
-        return $clone;
-    }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Edit.php b/components/ILIAS/Questions/src/Presentation/Edit.php
index bcd7978a5f3c..fabd70142a4d 100644
--- a/components/ILIAS/Questions/src/Presentation/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Edit.php
@@ -20,8 +20,8 @@
 
 namespace ILIAS\Questions\Presentation;
 
-use ILIAS\Questions\AnswerForm\Type;
-use ILIAS\Questions\AnswerFormTypes\Factory as AnswerFormTypesFactory;
+use ILIAS\Questions\AnswerForm\Definition;
+use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\Question\Persistence\Repository;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\Factory as DataFactory;
@@ -71,7 +71,7 @@ public function __construct(
         private readonly \ilUIService $ui_services,
         private readonly DataFactory $data_factory,
         private readonly UuidFactory $uuid_factory,
-        private readonly AnswerFormTypesFactory $answer_form_types_factory,
+        private readonly AnswerFormFactory $answer_form_factory,
         private readonly Repository $questions_repository
     ) {
 
@@ -182,7 +182,7 @@ public function createAnswerForm(
         $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
         if ($answer_form_type_class_hash !== '') {
             return $this->forwardCreateAnswerFormCmd(
-                $this->answer_form_types_factory->getAnswerFormTypeByClassHash($answer_form_type_class_hash),
+                $this->answer_form_types_factory->buildAnswerFormFromSelectValue($answer_form_type_class_hash),
                 $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
                 $step_token
             );
@@ -344,7 +344,7 @@ private function processCreateAnswerForm(
     }
 
     private function forwardCreateAnswerFormCmd(
-        Type $type,
+        Definition $type,
         URLBuilder $url_builder,
         URLBuilderToken $step_token
     ): array {
@@ -526,20 +526,13 @@ private function buildCreateAnswerForm(
                     [
                         $if->field()->select(
                             $this->lng->txt('select_answer_form_type'),
-                            array_reduce(
-                                $this->answer_form_types_factory->getAvailableAnswerFormTypes(),
-                                function (array $c, Type $v): array {
-                                    $c[$this->answer_form_types_factory->getHashedClass($v::class)] = $v->getLabel($this->lng);
-                                    return $c;
-                                },
-                                []
-                            )
+                            $this->answer_form_factory->getAnswerFormTypesArrayForSelect()
                         )->withRequired(true)
                     ],
                     $this->lng->txt('create_answer_form')
                 )->withAdditionalTransformation(
                     $this->refinery->custom()->transformation(
-                        fn(array $vs): ?Type => $this->answer_form_types_factory->getAnswerFormTypeByClassHash($vs[0])
+                        fn(array $vs): ?Form => $this->answer_form_factory->buildAnswerFormFromSelectValue($vs[0])
                     )
                 )
             ]
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Repository.php b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
index b8791e9c7c3e..94baea58a872 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\Question\Persistence;
 
-use ILIAS\Questions\AnswerForm\Type;
+use ILIAS\Questions\AnswerForm\Definition;
 use ILIAS\Questions\AnswerFormTypes\Factory as FormTypesFactory;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Questions\Question\QuestionImplementation;

From 459b4e4df418f4464b1f02576bc278bc377df894 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 8 Dec 2025 08:41:38 +0100
Subject: [PATCH 087/141] Question: Implementing Cloze Question

---
 .../Questions/src/AnswerForm/Definition.php   |  4 ++
 .../Questions/src/AnswerForm/Factory.php      | 14 +++-
 .../ILIAS/Questions/src/AnswerForm/Form.php   | 69 -------------------
 .../Questions/src/AnswerForm/Properties.php   | 26 +++++++
 ...ificData.php => TypeGenericProperties.php} | 26 +++----
 .../src/AnswerFormTypes/Cloze/Definition.php  | 29 +++-----
 .../Cloze/Properties/AnswerForm/Factory.php   | 29 ++++----
 .../Properties/AnswerForm/Properties.php      | 19 ++++-
 .../Cloze/Properties/ClozeText/Text.php       |  5 ++
 .../ILIAS/Questions/src/Presentation/Edit.php | 11 ++-
 10 files changed, 105 insertions(+), 127 deletions(-)
 delete mode 100644 components/ILIAS/Questions/src/AnswerForm/Form.php
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Properties.php
 rename components/ILIAS/Questions/src/AnswerForm/{TypeSpecificData.php => TypeGenericProperties.php} (74%)

diff --git a/components/ILIAS/Questions/src/AnswerForm/Definition.php b/components/ILIAS/Questions/src/AnswerForm/Definition.php
index fd9458585108..094c6c7931eb 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Definition.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Definition.php
@@ -28,6 +28,10 @@
 interface Definition
 {
     public function getLabel(Language $lng): string;
+    public function buildProperties(
+        TypeGenericData $type_generic_properties,
+        array $type_specific_data
+    ): Properties;
     public function getPersistence(): Persistence;
     public function hasCapability(string $capability_class_name): bool;
     public function getCapability(string $capability_class_name): ?Capability;
diff --git a/components/ILIAS/Questions/src/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerForm/Factory.php
index 7b1e988511a5..ae0fe0e8853e 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Factory.php
@@ -21,6 +21,7 @@
 namespace ILIAS\Questions\AnswerForm;
 
 use ILIAS\Questions\AnswerForm\Definition;
+use ILIAS\Data\UUID\Factory as UuidFactory;
 
 class Factory
 {
@@ -33,6 +34,7 @@ class Factory
      * @param array<\ILIAS\Questions\AnswerForm\Definition> $available_answer_form_types
      */
     public function __construct(
+        private readonly UuidFactory $uuid_factory,
         array $available_answer_form_types
     ) {
         $this->available_answer_form_types = array_reduce(
@@ -65,14 +67,20 @@ public function getHashedClass(string $class): string
         return md5($class);
     }
 
-    public function buildAnswerFormFromSelectValue(string $value): Form
+    public function buildTypeDefinitionFromSelectValue(string $value): Definition
     {
         $type = $this->available_answer_form_types[$value] ?? null;
         if ($type === null) {
             throw new InvalidArgumentException('This type of answer form does not exist.');
         }
-        return new Form(
-            $type,
+        return $type;
+    }
+
+    public function getDefaultTypeGenericProperties(Uuid $question_id): TypeGenericProperties
+    {
+        return new TypeGenericProperties(
+            $this->uuid_factory->uuid4(),
+            $question_id
         );
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Form.php b/components/ILIAS/Questions/src/AnswerForm/Form.php
deleted file mode 100644
index b51a5255ad9e..000000000000
--- a/components/ILIAS/Questions/src/AnswerForm/Form.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\AnswerForm;
-
-use ILIAS\Data\UUID\Uuid;
-
-class Form
-{
-    public function __construct(
-        private readonly Definition $type_definition,
-        private readonly Uuid $question_id,
-        private ?Uuid $id = null,
-        private ?TypeSpecificData $type_specific_data = null,
-        private ?Skills $skills = null
-    ) {
-    }
-
-    public function getTypeDefinition(): Definition
-    {
-        return $this->type_definition;
-    }
-
-    public function getQuestionId(): Uuid
-    {
-        return $this->question_id;
-    }
-
-    public function getId(): ?Uuid
-    {
-        return $this->id;
-    }
-
-    public function withId(Uuid $id): self
-    {
-        $clone = clone $this;
-        $clone->id = $id;
-        return $clone;
-    }
-
-    public function getSkills(): Skills
-    {
-        return $this->skills;
-    }
-
-    public function withSkills(Skills $skills): self
-    {
-        $clone = clone $this;
-        $clone->skills = $skills;
-        return $clone;
-    }
-}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerForm/Properties.php
new file mode 100644
index 000000000000..28385aee6d83
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Properties.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm;
+
+interface Properties
+{
+    public function getTypeGenericData(): TypeGenericData;
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/TypeSpecificData.php b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
similarity index 74%
rename from components/ILIAS/Questions/src/AnswerForm/TypeSpecificData.php
rename to components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
index 121a35a8ab3b..7a452ad0c979 100644
--- a/components/ILIAS/Questions/src/AnswerForm/TypeSpecificData.php
+++ b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
@@ -22,16 +22,16 @@
 
 use ILIAS\Data\UUID\Uuid;
 
-class TypeSpecificData
+class TypeGenericProperties
 {
     public function __construct(
-        private Uuid $answer_form_id,
-        private ?float $available_points,
-        private ?int $image_size,
-        private ?bool $shuffle_answer_options,
-        private string $additional_text,
-        private string $additional_text_legacy,
-        private array $additional_data,
+        private readonly Uuid $answer_form_id,
+        private readonly Uuid $question_id,
+        private ?float $available_points = null,
+        private ?int $image_size = null,
+        private ?bool $shuffle_answer_options = null,
+        private string $additional_text = '',
+        private string $additional_text_legacy = ''
     ) {
     }
 
@@ -40,6 +40,11 @@ public function getAnswerFormId(): Uuid
         return $this->answer_form_id;
     }
 
+    public function getQuestionId(): Uuid
+    {
+        return $this->question_id;
+    }
+
     public function getAvailablePoints(): ?float
     {
         return $this->available_points;
@@ -64,9 +69,4 @@ public function getAdditionalTextLegacy(): string
     {
         return $this->additional_text_legacy;
     }
-
-    public function getAdditionalData(): array
-    {
-        return $this->additional_data;
-    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
index 955051381b3b..c2bc3f878064 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
@@ -22,6 +22,7 @@
 
 use ILIAS\Questions\AnswerForm\Definition as DefinitionInterface;
 use ILIAS\Questions\AnswerForm\Capabilities\Capability;
+use ILIAS\Questions\AnswerForm\TypeGenericData;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Edit;
@@ -30,8 +31,6 @@
 
 class Definition implements DefinitionInterface
 {
-    private Properties $properties;
-
     /**
      * @param array<string, \ILIAS\Questions\AnswerForm\Capabilities\Capability> $available_capabilities
      */
@@ -42,25 +41,6 @@ public function __construct(
         private readonly Edit $edit_view,
         private readonly Participant $participant_view
     ) {
-        $this->properties = $this->properties_factory->buildDefault();
-    }
-
-    public function withData(
-        string $id,
-        ?float $available_points,
-        ?int $image_size,
-        ?bool $shuffle_answer_options,
-        string $additional_text,
-        string $additional_text_legacy,
-        ?array $data
-    ): static {
-        $this->properties = $this->properties_factory->fromData(
-            $id,
-            $additional_text,
-            $additional_text_legacy,
-            $data
-        );
-
     }
 
     public function getLabel(Language $lng): string
@@ -68,6 +48,13 @@ public function getLabel(Language $lng): string
         return $lng->txt('assClozeTest');
     }
 
+    public function buildProperties(
+        TypeGenericData $type_generic_data,
+        array $type_specific_data
+    ): Properties {
+        return $this->properties_factory->fromData($type_generic_data, $type_specific_data);
+    }
+
     public function getProperties(): Properties
     {
         return $this->properties;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
index 00e6dfaa69b9..6d9e68728760 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm;
 
+use ILIAS\Questions\AnswerForm\TypeGenericProperties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
@@ -38,34 +39,30 @@ public function __construct(
     }
 
     public function fromData(
-        ?string $answer_form_id,
-        string $cloze_text,
-        string $legay_cloze_text,
-        array $data
+        TypeGenericProperties $type_generic_properties,
+        array $type_specific_data
     ): Properties {
         return new Properties(
-            $answer_form_id,
-            $this->cloze_text_factory->buildFromTextString($cloze_text),
-            $legay_cloze_text
+            $type_generic_properties->getAnswerFormId(),
+            $type_generic_properties->getQuestionId(),
+            $this->cloze_text_factory->buildFromTextString($type_generic_properties->getAdditionalText()),
+            $type_generic_properties->getAdditionalTextLegacy()
         );
     }
 
     public function fromForm(
         Properties $properties,
         ClozeText $cloze_text,
-        string $legacy_cloze_text,
         ScoringIdentical $scoring_of_identical_responses,
         bool $combinations_enabled
     ): Properties {
         $updated_gaps = $cloze_text->updateGapsFromMarkdown($properties->getGaps());
-        return new Properties(
-            $properties->getAnswerFormId(),
-            $cloze_text->withIdsOfNewGapsInClozeText($updated_gaps->getUndefinedGaps()),
-            $updated_gaps,
-            $scoring_of_identical_responses,
-            $combinations_enabled,
-            $legacy_cloze_text
-        );
+        return $properties
+            ->withClozeText(
+                $cloze_text->withIdsOfNewGapsInClozeText($updated_gaps->getUndefinedGaps())
+            )->withGaps($updated_gaps)
+            ->withScoringOfIdenticalResponses($scoring_of_identical_responses)
+            ->withCombinationsEnabled($combinations_enabled);
     }
 
     public function buildDefault(): Properties
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
index ee00fadf5f0b..8b40e4edbfce 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
@@ -20,6 +20,8 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm;
 
+use ILIAS\Questions\AnswerForm\Properties as PropertiesInterface;
+use ILIAS\Questions\AnswerForm\TypeGenericProperties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
@@ -31,7 +33,7 @@
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
 
-class Properties
+class Properties implements PropertiesInterface
 {
     private const string FORM_KEY_ID = 'id';
     private const string FORM_KEY_CLOZE_TEXT = 'cloze_text';
@@ -44,6 +46,7 @@ class Properties
      */
     public function __construct(
         private readonly ?Uuid $answer_form_id,
+        private readonly ?Uuid $question_id,
         private Text $cloze_text,
         private Gaps $gaps,
         private ScoringIdentical $scoring_identical = ScoringIdentical::ScoreAll,
@@ -52,6 +55,19 @@ public function __construct(
     ) {
     }
 
+    public function getTypeGenericData(): TypeGenericProperties
+    {
+        return new TypeGenericProperties(
+            $this->answer_form_id,
+            $this->question_id,
+            null,
+            null,
+            null,
+            $this->cloze_text->getRawRepresentationForPersistence(),
+            $this->legacy_cloze_text
+        );
+    }
+
     public function getAnswerFormId(): ?Uuid
     {
         return $this->answer_form_id;
@@ -139,7 +155,6 @@ public function buildBasicEditingInputs(
                 fn(array $vs): self => $propteries_factory->fromForm(
                     $this,
                     $vs[self::FORM_KEY_CLOZE_TEXT],
-                    $this->legacy_cloze_text,
                     $vs[self::FORM_KEY_IDENTICAL_SCORING],
                     $vs[self::FORM_KEY_ENABLE_COMBINATIONS]
                 )
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 18a88367956d..5903fa486fc0 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -69,6 +69,11 @@ public function getHiddenInput(FieldFactory $ff): HiddenInput
         return $ff->hidden()->withValue($this->getTextForOutputInHiddenInput());
     }
 
+    public function getRawRepresentationForPersistence(): string
+    {
+        return $this->cloze_text->getRawRepresentation();
+    }
+
     public function getRenderedMarkdown(
         Gaps $gaps
     ): string {
diff --git a/components/ILIAS/Questions/src/Presentation/Edit.php b/components/ILIAS/Questions/src/Presentation/Edit.php
index fabd70142a4d..14a16b4c6037 100644
--- a/components/ILIAS/Questions/src/Presentation/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Edit.php
@@ -22,6 +22,7 @@
 
 use ILIAS\Questions\AnswerForm\Definition;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\AnswerForm\TypeGenericProperties;
 use ILIAS\Questions\Question\Persistence\Repository;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\Factory as DataFactory;
@@ -174,15 +175,17 @@ public function createAnswerForm(
             $page_id_token,
             $type_hash_token
         ] = $this->acquireURLBuilderAndParameters($base_uri);
+        $question_id = $this->retrieveQuestionId($question_id_token);
         $url_builder_with_params = $url_builder
-                ->withParameter($question_id_token, $this->retrieveQuestionId($question_id_token)->toString())
+                ->withParameter($question_id_token, $question_id->toString())
                 ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
                 ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
 
         $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
         if ($answer_form_type_class_hash !== '') {
             return $this->forwardCreateAnswerFormCmd(
-                $this->answer_form_types_factory->buildAnswerFormFromSelectValue($answer_form_type_class_hash),
+                $this->answer_form_types_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
+                $this->answer_form_factory->getDefaultTypeGenericProperties($question_id),
                 $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
                 $step_token
             );
@@ -345,10 +348,12 @@ private function processCreateAnswerForm(
 
     private function forwardCreateAnswerFormCmd(
         Definition $type,
+        TypeGenericProperties $type_generic_properties,
         URLBuilder $url_builder,
         URLBuilderToken $step_token
     ): array {
         return $type->getEditView()->create(
+            $type->buildProperties($type_generic_properties, []),
             $url_builder,
             $step_token,
             $this->retrieveStringValueForToken($step_token)
@@ -532,7 +537,7 @@ private function buildCreateAnswerForm(
                     $this->lng->txt('create_answer_form')
                 )->withAdditionalTransformation(
                     $this->refinery->custom()->transformation(
-                        fn(array $vs): ?Form => $this->answer_form_factory->buildAnswerFormFromSelectValue($vs[0])
+                        fn(array $vs): ?Form => $this->answer_form_factory->buildTypeDefinitionFromSelectValue($vs[0])
                     )
                 )
             ]

From 2bf37a74bee8c0a116e08dfdb6367d8656173d08 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 15 Dec 2025 07:50:30 +0100
Subject: [PATCH 088/141] Questions: Changes For COPage

---
 .../COPage/classes/class.ilPageObject.php     |   2 +-
 components/ILIAS/COPage/xsl/page.xsl          |   4 +
 components/ILIAS/Export/xml/ilias_pg_12.dtd   | 566 ++++++++++++++++++
 .../{Data => Properties}/AnswerOption.php     |   0
 .../{Data => Properties}/AnswerOptions.php    |   0
 .../Gaps/{Data => Properties}/Factory.php     |   0
 .../Data.php => Properties/Properties.php}    |   0
 .../Presentation/Definitions/CarryWrapper.php |  65 ++
 .../{Edit.php => Definitions/EditForm.php}    |   0
 .../Definitions/EditFormFactory.php           | 555 +++++++++++++++++
 .../Presentation/Definitions/EditOverview.php | 555 +++++++++++++++++
 .../{ => Definitions}/Editability.php         |   0
 .../src/Presentation/Definitions/Leaf.php     |  65 ++
 .../{ => Definitions}/QuestionsTable.php      |   0
 .../{ => Layout}/LayoutProvider.php           |   0
 .../Questions/src/Presentation/Views/Edit.php | 555 +++++++++++++++++
 16 files changed, 2366 insertions(+), 1 deletion(-)
 create mode 100755 components/ILIAS/Export/xml/ilias_pg_12.dtd
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/{Data => Properties}/AnswerOption.php (100%)
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/{Data => Properties}/AnswerOptions.php (100%)
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/{Data => Properties}/Factory.php (100%)
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/{Data/Data.php => Properties/Properties.php} (100%)
 create mode 100755 components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
 rename components/ILIAS/Questions/src/Presentation/{Edit.php => Definitions/EditForm.php} (100%)
 create mode 100644 components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php
 create mode 100644 components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php
 rename components/ILIAS/Questions/src/Presentation/{ => Definitions}/Editability.php (100%)
 create mode 100755 components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
 rename components/ILIAS/Questions/src/Presentation/{ => Definitions}/QuestionsTable.php (100%)
 rename components/ILIAS/Questions/src/Presentation/{ => Layout}/LayoutProvider.php (100%)
 create mode 100644 components/ILIAS/Questions/src/Presentation/Views/Edit.php

diff --git a/components/ILIAS/COPage/classes/class.ilPageObject.php b/components/ILIAS/COPage/classes/class.ilPageObject.php
index 9bdd0fb89a41..92a0d77988ce 100755
--- a/components/ILIAS/COPage/classes/class.ilPageObject.php
+++ b/components/ILIAS/COPage/classes/class.ilPageObject.php
@@ -75,7 +75,7 @@ abstract class ilPageObject
     public string $xml = "";
     public string $encoding = "";
     public DomNode $node;
-    public string $cur_dtd = "ilias_pg_9.dtd";
+    public string $cur_dtd = "ilias_pg_12.dtd";
     public bool $contains_int_link = false;
     public bool $needs_parsing = false;
     public string $parent_type = "";
diff --git a/components/ILIAS/COPage/xsl/page.xsl b/components/ILIAS/COPage/xsl/page.xsl
index ce73de9d56d2..a37c7780498e 100755
--- a/components/ILIAS/COPage/xsl/page.xsl
+++ b/components/ILIAS/COPage/xsl/page.xsl
@@ -3736,6 +3736,10 @@
 	</div>
 </xsl:template>
 
+<xsl:template match="AnswerForm">
+	[[[ANSWER_FORM_<xsl:value-of select="@Uuid"/>]]]
+</xsl:template>
+
 <!-- PlaceHolder -->
 <xsl:template match="PlaceHolder">
 	  <xsl:if test="@ContentClass='Media'">
diff --git a/components/ILIAS/Export/xml/ilias_pg_12.dtd b/components/ILIAS/Export/xml/ilias_pg_12.dtd
new file mode 100755
index 000000000000..0071822931b3
--- /dev/null
+++ b/components/ILIAS/Export/xml/ilias_pg_12.dtd
@@ -0,0 +1,566 @@
+<!-- ilias_pg.dtd for ILIAS Page Objects only -->
+<!-- $Id$ -->
+<!-- Language codes referring to ISO 639-1 Alpha-2 code, see http://www.oasis-open.org/cover/iso639a.html for details -->
+<!ENTITY % langcode "none | aa | ab | af | am | ar | as | ay | az | ba | be | bg | bh | bi | bn | bo | br | ca | co | cs | cy | da | de | dz | el | en | eo | es | et | eu | fa | fi | fj | fo | fr | fy | ga | gd | gl | gn | gu | ha | he | hi | hr | hu | hy | ia | ie | ik | id | is | it | iu | ja | jv | ka | kk | kl | km | kn | ko | ks | ku | ky | la | ln | lo | lt | lv | mg | mi | mk | ml | mn | mo | mr | ms | mt | my | na | ne | nl | no | oc | om | or | pa | pl | ps | pt | qu | rm | rn | ro | ru | rw | sa | sd | sg | sh  | si | sk | sl | sm | sn | so | sq | sr | ss | st | su | sv | sw | ta | te | tg | th | ti | tk | tl | tn | to | tr | ts | tt | tw | ug | uk | ur | uz | vi | vo | wo | xh | yi | yo | za | zh | zu">
+<!-- Types of (textual) content -->
+<!ENTITY % text "#PCDATA | br | Comment | PageTurn | Footnote | Emph | Strong | Accent | Important | Quotation | Anchor | Keyw | Code | ExtLink | IntLink | SimpleBulletList | SimpleNumberedList | Sub | Sup | Marked">
+<!ENTITY % commenttext "#PCDATA | br | Emph | PageTurn | Footnote | Strong | Accent | Important | Quotation | Anchor | Keyw | Code | ExtLink | IntLink | Sub | Su | Marked">
+<!ENTITY % emphtext "#PCDATA | br | Comment | PageTurn | Footnote | Strong | Accent | Important | Quotation | Anchor | Keyw | Code | ExtLink | IntLink | Sub | Sup | Marked">
+<!ENTITY % strongtext "#PCDATA | br | Comment | PageTurn | Footnote | Emph | Accent | Important | Quotation | Anchor | Keyw | Code | ExtLink | IntLink | Sub | Sup | Marked">
+<!ENTITY % acctext "#PCDATA | br | Comment | PageTurn | Footnote | Emph | Important | Strong | Quotation | Anchor | Keyw | Code | ExtLink | IntLink | Sub | Sup | Marked">
+<!ENTITY % imptext "#PCDATA | br | Comment | PageTurn | Footnote | Emph | Accent | Strong | Quotation | Anchor | Keyw | Code | ExtLink | IntLink | Sub | Sup | Marked">
+<!ENTITY % kwtext "#PCDATA | br | Comment | Footnote | Strong | Emph | Accent | Important | Quotation | Code | Sub | Sup | Marked">
+<!ENTITY % linktext "#PCDATA | br | Comment | Emph | Strong | Important | Accent | Quotation | Code | Sub | Sup | Marked">
+<!ENTITY % simpletext "#PCDATA | br | Emph | Strong | Quotation | Code | Anchor | ExtLink | IntLink | Sub | Sup | Marked">
+<!ENTITY % footnotetext "#PCDATA | br | Comment | Emph | Accent | Strong | Anchor | ExtLink | IntLink | Important | Quotation | Code | Sub | Sup | Marked">
+<!ENTITY % titletext "#PCDATA | br | Emph | Strong | Quotation | Code | Sub | Sup | Marked">
+<!ENTITY % codetext "#PCDATA | br | Emph | Strong | Accent | Important | Quotation | Footnote | Sub | Sup | Marked">
+<!ENTITY % supsubtext "#PCDATA | br | Comment | PageTurn | Footnote | Emph | Accent | Strong | Quotation | Anchor | Keyw | Code | Sub | Sup | Marked">
+<!ENTITY % markedtext "#PCDATA | br | Comment | PageTurn | Footnote | Emph | Strong | Accent | Important | Quotation | Anchor | Keyw | Code | ExtLink | IntLink | Sub | Sup | Marked">
+
+<!-- PageObject -->
+<!-- Object for displaying content on a screen and comparable to a page of a book; a PageObject contains MediaObjects (=images, applets, ...) and/or paragraphs of textual content; a PageObject must not include StructureObjects or PageObjects! -->
+<!-- PageObjects are comparable to LOM LearningObjects of aggregation level 2 -->
+<!ELEMENT PageObject (PageContent*, Layout?, InitOpenedContent?)>
+
+<!ELEMENT PageContent ((Paragraph | MediaObject | Table | List | FileList | Question | AnswerForm | PlaceHolder | Section | Resources | LoginPageElement | Map | Plugged | Tabs | ContentInclude | InteractiveImage | Profile | Verification | Blog | QuestionOverview | Skills | LearningHistory | ConsultationHours | MyCourses | AMDPageList | AMDForm | Grid | Curriculum | Launcher | PRGStatusInfo | PRGActionNote), BibItemIdentifier*)>
+
+<!-- enable/disable paragraph elements -->
+<!ATTLIST PageContent
+	PCID CDATA #IMPLIED
+	Enabled (True|False) #IMPLIED
+>
+
+<!-- BibItemIdentifier specify from which BibItem(s) the content comes -->
+<!ELEMENT BibItemIdentifier EMPTY>
+<!ATTLIST BibItemIdentifier
+	Catalog CDATA #IMPLIED
+	Entry CDATA #REQUIRED
+>
+
+
+<!-- PageTurn -->
+<!ELEMENT PageTurn (BibItemIdentifier)>
+<!ATTLIST PageTurn
+	NumberingType (Roman | Arabic | Alphanumeric) #REQUIRED
+	Number CDATA #IMPLIED
+>
+
+<!-- Identifier -->
+<!ELEMENT Identifier EMPTY>
+<!ATTLIST Identifier
+	Catalog CDATA #IMPLIED
+	Entry CDATA #REQUIRED
+>
+
+<!-- Title -->
+<!ELEMENT Title (%titletext;)*>
+<!ATTLIST Title
+	Language (%langcode;) #REQUIRED
+>
+
+<!-- MediaObject -->
+<!-- Object of lowest complexity that contains only raw media data or fragments (e.g. an image or applet); Textual content cannot be a MediaObject! -->
+<!-- MediaObjects are comparable to LOM LearningObjects of aggregation level 1 -->
+<!ELEMENT MediaObject (MediaAlias, MediaAliasItem+)>
+<!-- MediaAlias -->
+<!-- Alias for an already existing MediaObject; this allows an easy reuse of existing MediaObjects; an alias is not a copy but only a reference to the original object-->
+<!ELEMENT MediaAlias EMPTY>
+<!ATTLIST MediaAlias
+	OriginId CDATA #REQUIRED
+	Class CDATA #IMPLIED
+	CaptionClass CDATA #IMPLIED
+>
+<!-- MediaAliasItem -->
+<!ELEMENT MediaAliasItem (Layout?, Caption?, TextRepresentation?, Parameter*, MapArea*)>
+<!ATTLIST MediaAliasItem
+	Purpose (Standard | Fullscreen | Additional) #REQUIRED
+>
+
+<!-- MapAreas should be only defined for image objects with purpose Standard or Fullscreen -->
+<!-- Id has been introduced with 4.2, is optional -->
+<!ELEMENT MapArea (ExtLink | IntLink)>
+<!ATTLIST MapArea
+	Shape (Rect | Circle | Poly | WholePicture) #REQUIRED
+	Coords CDATA #IMPLIED
+	HighlightMode CDATA #IMPLIED
+	HighlightClass CDATA #IMPLIED
+	Id CDATA #IMPLIED
+>
+
+<!-- Text Representation -->
+<!ELEMENT TextRepresentation (#PCDATA)>
+
+<!ELEMENT Format (#PCDATA)>
+
+<!ELEMENT Location (#PCDATA)>
+<!ATTLIST Location
+	Type (LocalFile | Reference) #REQUIRED
+>
+
+<!-- Interactive Image -->
+<!ELEMENT InteractiveImage (MediaAlias, MediaAliasItem+, Trigger*, ContentPopup*)>
+<!ELEMENT Trigger EMPTY>
+<!ATTLIST Trigger
+	Nr CDATA #REQUIRED
+	Type (Area | Marker) #REQUIRED
+	Title CDATA #IMPLIED
+	OverlayX CDATA #IMPLIED
+	OverlayY CDATA #IMPLIED
+	MarkerX CDATA #IMPLIED
+	MarkerY CDATA #IMPLIED
+	Overlay CDATA #IMPLIED
+	PopupNr CDATA #IMPLIED
+	PopupX CDATA #IMPLIED
+	PopupY CDATA #IMPLIED
+	PopupWidth CDATA #IMPLIED
+	PopupHeight CDATA #IMPLIED
+	PopupPosition (Vertical | Horizontal) #IMPLIED
+	PopupSize (sm | md | lg) #IMPLIED
+>
+<!ELEMENT ContentPopup (PageContent*)>
+<!ATTLIST ContentPopup
+	Nr CDATA #REQUIRED
+	PCID CDATA #IMPLIED
+	Title CDATA #IMPLIED
+	ContentWidth CDATA #IMPLIED
+	ContentHeight CDATA #IMPLIED
+>
+
+<!-- Question Overview -->
+<!ELEMENT QuestionOverview EMPTY>
+<!ATTLIST QuestionOverview
+	ShortMessage (y | n) #IMPLIED
+	ListWrongQuestions (y | n) #IMPLIED
+>
+
+<!-- Paragraph -->
+<!-- All textual content of a PageObject has to be divided in single paragraphs -->
+<!ELEMENT Paragraph (%text;)*>
+<!ATTLIST Paragraph
+	Language (%langcode;) #REQUIRED
+	Characteristic CDATA #IMPLIED
+	SubCharacteristic CDATA #IMPLIED
+	AutoIndent (y | n) #IMPLIED
+	ShowLineNumbers (y | n) #IMPLIED
+	DownloadTitle CDATA #IMPLIED
+>
+
+<!-- br -->
+<!ELEMENT br EMPTY>
+
+<!-- Comment, attribute Language is deprecated -->
+<!ELEMENT Comment (%commenttext;)*>
+<!ATTLIST Comment
+	Language (%langcode;) #IMPLIED
+>
+<!-- Emph -->
+<!ELEMENT Emph (%emphtext;)*>
+<!ATTLIST Emph
+	Reason (Intuition | MetaLanguageUse) #IMPLIED
+>
+
+<!-- Footnote -->
+<!ELEMENT Footnote (%footnotetext;)*>
+<!ATTLIST Footnote
+	Creator (Editor | Translator | Author) #IMPLIED
+>
+
+<!-- Strong -->
+<!ELEMENT Strong (%strongtext;)*>
+<!ATTLIST Strong
+	Reason (Intuition | MetaLanguageUse) #IMPLIED
+>
+
+<!-- Marked -->
+<!ELEMENT Marked (%markedtext;)*>
+<!ATTLIST Marked
+	Class CDATA #REQUIRED
+>
+
+<!-- Sub -->
+<!ELEMENT Sub (%supsubtext;)*>
+
+<!-- Sup -->
+<!ELEMENT Sup (%supsubtext;)*>
+
+<!-- Accent -->
+<!ELEMENT Accent (%acctext;)*>
+
+<!-- Important -->
+<!ELEMENT Important (%imptext;)*>
+
+<!-- Quotation, attribute Language is deprecated -->
+<!ELEMENT Quotation (%text;)*>
+<!ATTLIST Quotation
+	Language (%langcode;) #IMPLIED
+	Reference IDREF #IMPLIED
+>
+
+<!-- Keyword -->
+<!ELEMENT Keyw (%kwtext;)*>
+
+<!-- Code -->
+<!ELEMENT Code (%codetext;)*>
+<!ATTLIST Code
+	Id ID #IMPLIED
+	ProgrammingLanguage CDATA #IMPLIED
+>
+
+<!-- Anchor -->
+<!ELEMENT Anchor (%text;)*>
+<!ATTLIST Anchor
+	Name CDATA #IMPLIED
+>
+
+<!-- List -->
+<!ELEMENT List (Title?, ListItem+)>
+<!ATTLIST List
+	Id ID #IMPLIED
+	Type (Ordered | Unordered) #REQUIRED
+	Class CDATA #IMPLIED
+	ItemClass CDATA #IMPLIED
+	NumberingType (Decimal | Roman | roman | Alphabetic | alphabetic | Number) #IMPLIED
+	StartValue CDATA #IMPLIED
+>
+<!ELEMENT ListItem (PageContent*)>
+<!ATTLIST ListItem
+	PCID CDATA #IMPLIED
+>
+
+<!-- Simple Lists -->
+<!ELEMENT SimpleBulletList (SimpleListItem*)>
+<!ATTLIST SimpleBulletList
+	Class CDATA #IMPLIED
+>
+<!ELEMENT SimpleNumberedList (SimpleListItem*)>
+<!ATTLIST SimpleNumberedList
+	Class CDATA #IMPLIED
+>
+<!ELEMENT SimpleListItem (%text;)*>
+<!ATTLIST SimpleListItem
+	Class CDATA #IMPLIED
+>
+
+<!-- FileList -->
+<!ELEMENT FileList (Title?, FileItem*)>
+<!ELEMENT FileItem (Identifier, Location, Format?)>
+<!ATTLIST FileItem
+	PCID CDATA #IMPLIED
+	Class CDATA #IMPLIED
+>
+
+
+<!-- Table -->
+<!-- Table model is some kind of a mixture of mimalized CALS and HTML dtd -->
+<!-- Only a minimum of style elements and attributes defined -->
+<!ELEMENT Table (Title?, Caption?, Summary?, TableRow+)>
+<!ATTLIST Table
+	Language (%langcode;) #REQUIRED
+	Id ID #IMPLIED
+	Width CDATA #IMPLIED
+	Border CDATA #IMPLIED
+	HorizontalAlign (Left | Center | Right | LeftFloat | RightFloat) #IMPLIED
+	CellPadding CDATA #IMPLIED
+	CellSpacing CDATA #IMPLIED
+	Class CDATA #IMPLIED
+	DataTable (y | n) #IMPLIED
+	Template CDATA #IMPLIED
+	HeaderRows CDATA #IMPLIED
+	HeaderCols CDATA #IMPLIED
+	FooterRows CDATA #IMPLIED
+	FooterCols CDATA #IMPLIED
+>
+<!ELEMENT Caption (%titletext;)*>
+<!ATTLIST Caption
+	Align (top | bottom) #REQUIRED
+>
+<!ELEMENT Summary (%simpletext;)*>
+<!ELEMENT TableRow (TableData+)>
+<!ATTLIST TableRow
+	PCID CDATA #IMPLIED
+>
+
+<!-- Table Cell. The Hidden Attribute must be set to "Y", if a cell is hidden due to anothers (non-hidden) cell
+col or row span. -->
+<!ELEMENT TableData (PageContent*)>
+<!ATTLIST TableData
+	Width CDATA #IMPLIED
+	Class CDATA #IMPLIED
+	PCID CDATA #IMPLIED
+	ColSpan CDATA #IMPLIED
+	RowSpan CDATA #IMPLIED
+	HorizontalAlign (Left | Center | Right) #IMPLIED
+	Hidden (Y | N) #IMPLIED
+>
+
+<!-- ExtLink -->
+<!-- An element to link to _external_ resources outside the ILIAS system, e.g. to a web site-->
+<!ELEMENT ExtLink (%linktext;)*>
+<!ATTLIST ExtLink
+	Href CDATA #IMPLIED
+	Title CDATA #IMPLIED
+	TargetFrame (Media | FAQ | Glossary | New) #IMPLIED
+>
+
+<!-- IntLink -->
+<!ELEMENT IntLink (%linktext;)*>
+<!ATTLIST IntLink
+	Target CDATA #REQUIRED
+	Type (StructureObject | PageObject | MediaObject | GlossaryItem | RepositoryItem | File | WikiPage | PortfolioPage | User) #REQUIRED
+	TargetFrame (Media | FAQ | Glossary | New) #IMPLIED
+	Anchor CDATA #IMPLIED
+>
+
+<!-- Question -->
+<!ELEMENT Question EMPTY>
+<!ATTLIST Question
+	QRef CDATA #REQUIRED
+>
+
+<!-- AnswerForm -->
+<!ELEMENT AnswerForm EMPTY>
+<!ATTLIST AnswerForm
+	Uuid CDATA #REQUIRED
+>
+
+<!-- PlaceHolder -->
+<!ELEMENT PlaceHolder EMPTY>
+<!ATTLIST PlaceHolder
+	ContentClass (Media | Text | Question | Verification) #REQUIRED
+	Width CDATA #IMPLIED
+	Height CDATA #IMPLIED
+>
+
+<!-- Section -->
+<!-- il_Block, il_Example, il_Special, il_Additional, il_Excursus -->
+<!ELEMENT Section (PageContent*, (ExtLink | IntLink)?)>
+<!ATTLIST Section
+	Characteristic CDATA #IMPLIED
+	ActiveFrom CDATA #IMPLIED
+	ActiveTo CDATA #IMPLIED
+	Permission CDATA #IMPLIED
+	PermissionRefId CDATA #IMPLIED
+	Protected CDATA #IMPLIED
+	PCID CDATA #IMPLIED
+>
+
+<!-- Resources -->
+<!ELEMENT Resources (ResourceList | ItemGroup)>
+<!ELEMENT ResourceList EMPTY>
+<!ATTLIST ResourceList
+	Type CDATA #REQUIRED
+>
+<!ELEMENT ItemGroup EMPTY>
+<!ATTLIST ItemGroup
+	RefId CDATA #REQUIRED
+>
+
+<!-- LoginPageElement -->
+<!ELEMENT LoginPageElement EMPTY>
+<!ATTLIST LoginPageElement
+	Type CDATA #REQUIRED
+	HorizontalAlign (Left | Center | Right | LeftFloat | RightFloat) #IMPLIED
+>
+
+<!-- Map -->
+<!ELEMENT Map (Layout?, MapCaption?)>
+<!ATTLIST Map
+	Latitude CDATA #REQUIRED
+	Longitude CDATA #REQUIRED
+	Zoom CDATA #REQUIRED
+>
+<!ELEMENT MapCaption (%titletext;)*>
+
+<!-- Plugged Component -->
+<!ELEMENT Plugged (PluggedProperty*)>
+<!ATTLIST Plugged
+	PluginName CDATA #REQUIRED
+	PluginVersion CDATA #REQUIRED
+>
+<!ELEMENT PluggedProperty (#PCDATA)>
+<!-- <!ELEMENT PluggedProperty EMPTY> -->
+<!ATTLIST PluggedProperty
+	Name CDATA #REQUIRED
+>
+
+<!-- TabbedContent -->
+<!ELEMENT Tabs (Tab*)>
+<!ATTLIST Tabs
+	Type (HorizontalAccordion | VerticalAccordion | Carousel) #REQUIRED
+	HorizontalAlign (Left | Center | Right | LeftFloat | RightFloat) #IMPLIED
+	Behavior (AllClosed | FirstOpen | ForceAllOpen) #IMPLIED
+	ContentWidth CDATA #IMPLIED
+	ContentHeight CDATA #IMPLIED
+	Template CDATA #IMPLIED
+	AutoAnimWait CDATA #IMPLIED
+	RandomStart CDATA #IMPLIED
+>
+<!ELEMENT Tab (PageContent*, TabCaption?)>
+<!ATTLIST Tab
+	PCID CDATA #IMPLIED
+>
+<!ELEMENT TabCaption (%titletext;)*>
+
+<!-- Grid -->
+<!ELEMENT Grid (GridCell*)>
+<!ELEMENT GridCell (PageContent*)>
+<!ATTLIST GridCell
+	WIDTH_XS CDATA #REQUIRED
+	WIDTH_S CDATA #REQUIRED
+	WIDTH_M CDATA #REQUIRED
+	WIDTH_L CDATA #REQUIRED
+	WIDTH_XL CDATA #REQUIRED
+	PCID CDATA #IMPLIED>
+
+<!-- ContentInclude: Example: ContentId 13, ContentType: mep, InstId: ''-->
+<!ELEMENT ContentInclude EMPTY>
+<!ATTLIST ContentInclude
+	ContentId CDATA #REQUIRED
+	ContentType CDATA #REQUIRED
+	InstId CDATA #IMPLIED
+>
+
+
+<!-- Layout -->
+<!-- Layout information for formatting content output different from default layout -->
+<!ELEMENT Layout EMPTY>
+<!ATTLIST Layout
+	HorizontalAlign (Left | Center | Right | LeftFloat | RightFloat) #IMPLIED
+	Width CDATA #IMPLIED
+	Height CDATA #IMPLIED
+>
+<!-- Parameter -->
+<!-- Special parameters needed for MediaObjects, e.g. a starting class for Java objects; parameters depend on types of MediaObjects -->
+<!ELEMENT Parameter EMPTY>
+<!ATTLIST Parameter
+	Name CDATA #REQUIRED
+	Value CDATA #REQUIRED
+>
+
+<!-- BibItem -->
+<!ELEMENT BibItem (Identifier, Language+, Author*, Booktitle, CrossRef*, Edition, Editor*, HowPublished, WherePublished*, Institution*, Journal?, Keyword*, Month?, Pages?, Publisher, School*, Series?, Year, (URL | (ISSN?, ISBN?)))>
+<!ATTLIST BibItem
+	Type (book | inbook | journalarticle | proceedings | inproceedings | dissertation | phdthesis | mastersthesis | techreport | manual | newspaperarticle | av | internet | unpublished) #REQUIRED
+	Label ID #REQUIRED
+>
+
+<!ELEMENT Author (FirstName*, MiddleName*, LastName)>
+<!ELEMENT Booktitle (#PCDATA)>
+<!ATTLIST Booktitle
+	Language (%langcode;) #REQUIRED
+>
+<!ELEMENT CrossRef (#PCDATA)>
+<!ELEMENT Edition (#PCDATA)>
+<!ELEMENT Editor (#PCDATA)>
+<!ELEMENT HowPublished EMPTY>
+<!ATTLIST HowPublished
+	Type (GreyLiterature | Print | Internet) #REQUIRED
+>
+<!ELEMENT WherePublished (#PCDATA)>
+<!ELEMENT Institution (#PCDATA)>
+<!ELEMENT Journal (#PCDATA)>
+<!ATTLIST Journal
+	Note CDATA #IMPLIED
+	Number CDATA #REQUIRED
+	Organization CDATA #IMPLIED
+>
+
+<!ELEMENT Month (#PCDATA)>
+<!ELEMENT Pages (#PCDATA)>
+<!ELEMENT Publisher (#PCDATA)>
+<!ELEMENT School (#PCDATA)>
+<!ELEMENT Series (SeriesTitle, SeriesEditor*, SeriesVolume?)>
+<!ELEMENT SeriesTitle (#PCDATA)>
+<!ELEMENT SeriesEditor (#PCDATA)>
+<!ELEMENT SeriesVolume (#PCDATA)>
+<!ELEMENT Volume (#PCDATA)>
+<!ELEMENT Year (#PCDATA)>
+
+<!ELEMENT ISBN (#PCDATA)>
+<!ELEMENT ISSN (#PCDATA)>
+<!ELEMENT URL (#PCDATA)>
+
+<!ELEMENT LastName (#PCDATA)>
+<!ELEMENT FirstName (#PCDATA)>
+<!ELEMENT MiddleName (#PCDATA)>
+
+<!ELEMENT Profile (ProfileField*)>
+<!ATTLIST Profile
+	User CDATA #REQUIRED
+	Mode (manual | inherit) #REQUIRED
+>
+
+<!ELEMENT ProfileField EMPTY>
+<!ATTLIST ProfileField
+	Name CDATA #REQUIRED
+>
+
+<!ELEMENT Verification EMPTY>
+<!ATTLIST Verification
+	Type (excv | tstv | crsv | scov | crta) #REQUIRED
+	Id CDATA #REQUIRED
+	User CDATA #REQUIRED
+>
+
+<!ELEMENT Blog (BlogPosting*)>
+<!ATTLIST Blog
+	User CDATA #REQUIRED
+	Id CDATA #REQUIRED
+>
+
+<!ELEMENT BlogPosting EMPTY>
+<!ATTLIST BlogPosting
+	Id CDATA #REQUIRED
+>
+
+<!ELEMENT Skills EMPTY>
+<!ATTLIST Skills
+	Id CDATA #REQUIRED
+	User CDATA #REQUIRED
+>
+
+<!ELEMENT LearningHistory (LearningHistoryProvider*)>
+<!ATTLIST LearningHistory
+		From CDATA #IMPLIED
+		To CDATA #IMPLIED
+		>
+<!ELEMENT LearningHistoryProvider EMPTY>
+<!ATTLIST LearningHistoryProvider
+		Name CDATA #REQUIRED
+		>
+
+<!ELEMENT ConsultationHours (ConsultationHoursGroup*)>
+<!ATTLIST ConsultationHours
+	Mode (auto | manual) #REQUIRED
+	User CDATA #REQUIRED
+>
+
+<!ELEMENT ConsultationHoursGroup EMPTY>
+<!ATTLIST ConsultationHoursGroup
+	Id CDATA #REQUIRED
+>
+
+<!ELEMENT MyCourses EMPTY>
+<!ATTLIST MyCourses
+	User CDATA #REQUIRED
+	Sort CDATA #REQUIRED
+>
+
+<!ELEMENT AMDPageList EMPTY>
+<!ATTLIST AMDPageList
+	Id CDATA #REQUIRED
+	Mode CDATA #IMPLIED
+>
+
+<!ELEMENT AMDForm EMPTY>
+<!ATTLIST AMDForm
+	RecordIds CDATA #IMPLIED
+>
+
+<!ELEMENT InitOpenedContent (IntLink?)>
+
+<!ELEMENT Curriculum EMPTY>
+<!ELEMENT Launcher EMPTY>
+<!ELEMENT PRGStatusInfo EMPTY>
+<!ELEMENT PRGActionNote EMPTY>
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOption.php
similarity index 100%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOption.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOption.php
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOptions.php
similarity index 100%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/AnswerOptions.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOptions.php
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Factory.php
similarity index 100%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Factory.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Factory.php
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Data.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php
similarity index 100%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Data/Data.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php b/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
new file mode 100755
index 000000000000..e23e4217a684
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\HTTP\Wrapper;
+
+use ILIAS\Refinery\Transformation;
+
+/**
+ * Class ArrayBasedRequestWrapper
+ *
+ * @author Fabian Schmid <fs@studer-raimann.ch>
+ */
+class ArrayBasedRequestWrapper implements RequestWrapper
+{
+    /**
+     * GetRequestWrapper constructor.
+     * @param mixed[] $raw_values
+     */
+    public function __construct(private array $raw_values)
+    {
+    }
+
+
+    /**
+     * @inheritDoc
+     */
+    public function retrieve(string $key, Transformation $transformation)
+    {
+        return $transformation->transform($this->raw_values[$key] ?? null);
+    }
+
+
+    /**
+     * @inheritDoc
+     */
+    public function has(string $key): bool
+    {
+        return isset($this->raw_values[$key]);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function keys(): array
+    {
+        return array_keys($this->raw_values);
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Edit.php b/components/ILIAS/Questions/src/Presentation/Definitions/EditForm.php
similarity index 100%
rename from components/ILIAS/Questions/src/Presentation/Edit.php
rename to components/ILIAS/Questions/src/Presentation/Definitions/EditForm.php
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php b/components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php
new file mode 100644
index 000000000000..14a16b4c6037
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php
@@ -0,0 +1,555 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation;
+
+use ILIAS\Questions\AnswerForm\Definition;
+use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\AnswerForm\TypeGenericProperties;
+use ILIAS\Questions\Question\Persistence\Repository;
+use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Data\Factory as DataFactory;
+use ILIAS\Data\URI;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
+use ILIAS\HTTP\Services as HTTP;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Renderer as UIRenderer;
+use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
+use ILIAS\UI\Component\Item\Standard as StandardItem;
+use ILIAS\UI\Component\Item\Group as ItemGroup;
+use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
+use ILIAS\GlobalScreen\Services as GlobalScreen;
+
+class Edit
+{
+    private const array QUERY_PARAMETER_NAME_SPACE = ['q'];
+    private const string TOKEN_STRING_ACTION = 'a';
+    private const string TOKEN_STRING_STEP = 's';
+    private const string TOKEN_STRING_QUESTION_ID = 'q';
+    private const string TOKEN_STRING_PAGE_ID = 'p';
+    private const string TOKEN_TYPE_HASH = 't';
+    private const string CMD_CREATE_QUESTION = 'create';
+    private const string CMD_EDIT_QUESTION = 'edit';
+    private const string CMD_CREATE_ANSWER_FORM = 'create_af';
+    private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
+
+    private array $required_capabilities = [];
+    private Editability $editability = Editability::Full;
+    private bool $ordering_enabled = false;
+
+    public function __construct(
+        private readonly Language $lng,
+        private readonly \ilObjUser $current_user,
+        private readonly Refinery $refinery,
+        private readonly UIFactory $ui_factory,
+        private readonly UIRenderer $ui_renderer,
+        private readonly GlobalScreen $global_screen,
+        private readonly \ilCtrl $ctrl,
+        private readonly HTTP $http,
+        private readonly \ilUIService $ui_services,
+        private readonly DataFactory $data_factory,
+        private readonly UuidFactory $uuid_factory,
+        private readonly AnswerFormFactory $answer_form_factory,
+        private readonly Repository $questions_repository
+    ) {
+
+    }
+
+    public function withRequiredCapabilities(array $capability_class_names): self
+    {
+        $this->checkCapabilities($capability_class_names);
+        $clone = clone $this;
+        $clone->required_capabilities = $capability_class_names;
+        return $clone;
+    }
+
+    public function withEditable(Editability $editability): self
+    {
+        $clone = clone $this;
+        $clone->editability = $editability;
+        return $clone;
+    }
+
+    public function withOrderingEnabled(bool $enable): self
+    {
+        $clone = clone $this;
+        $clone->ordering_enabled = $enable;
+        return $clone;
+    }
+
+    public function view(
+        \ilToolbarGUI $toolbar,
+        URI $base_uri
+    ): array {
+        [
+            $url_builder,
+            $action_token,
+            $step_token,
+            $question_id_token,
+            $page_id_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_CREATE_QUESTION => $this->createQuestion(
+                $url_builder,
+                $action_token,
+                $step_token,
+                $question_id_token,
+                $page_id_token
+            ),
+            self::CMD_EDIT_QUESTION => $this->editQuestion(
+                $url_builder,
+                $action_token,
+                $step_token,
+                $question_id_token,
+                $page_id_token
+            ),
+            default => $this->showTable(
+                $toolbar,
+                $url_builder,
+                $action_token,
+                $question_id_token
+            )
+        };
+    }
+
+    public function forwardPageCmds(
+        \ilGlobalTemplateInterface $tpl,
+        URI $base_uri,
+    ): void {
+        [
+            0 => $url_builder,
+            1 => $action_token,
+            3 => $question_id_token,
+            4 => $page_id_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
+
+        $question_id = $this->retrieveQuestionId($question_id_token);
+        $page_id = $this->retrievePageId($page_id_token);
+        $this->setParametersForQuestionCmds($question_id_token, $question_id->toString(), $page_id_token, $page_id);
+
+        $tpl->setContent(
+            $this->ctrl->forwardCommand(
+                new \QstsQuestionPageGUI(
+                    $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION)
+                        ->withParameter($question_id_token, $question_id->toString())
+                        ->buildURI(),
+                    $page_id
+                )
+            )
+        );
+    }
+
+    public function createAnswerForm(
+        URI $base_uri
+    ): array {
+        [
+            $url_builder,
+            $action_token,
+            $step_token,
+            $question_id_token,
+            $page_id_token,
+            $type_hash_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+        $question_id = $this->retrieveQuestionId($question_id_token);
+        $url_builder_with_params = $url_builder
+                ->withParameter($question_id_token, $question_id->toString())
+                ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
+                ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
+
+        $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
+        if ($answer_form_type_class_hash !== '') {
+            return $this->forwardCreateAnswerFormCmd(
+                $this->answer_form_types_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
+                $this->answer_form_factory->getDefaultTypeGenericProperties($question_id),
+                $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
+                $step_token
+            );
+        }
+
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
+                $url_builder_with_params,
+                $action_token,
+                $step_token,
+                $type_hash_token
+            ),
+            default => [$this->buildCreateAnswerForm(
+                $url_builder_with_params,
+                $action_token
+            )]
+        };
+    }
+
+    public function editAnswerForm(
+        URI $base_uri
+    ): array {
+        [$url_builder, $action_token] = $this->acquireURLBuilderAndParameters($base_uri);
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_EDIT_ANSWER_FORM => [$this->processCreateAnswerForm($url_builder, $action_token)],
+            default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
+        };
+    }
+
+    private function createQuestion(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $question_id_token,
+        URLBuilderToken $page_id_token
+    ): array {
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
+
+        $create = (new QuestionImplementation())->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->create(
+            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION),
+            $step_token,
+            $this->retrieveStringValueForToken($step_token)
+        );
+
+        if (is_array($create)) {
+            return $create;
+        }
+
+        $this->questions_repository->store($create);
+        return $this->buildEditStartView(
+            $url_builder->withParameter($question_id_token, $create->getId()),
+            $step_token,
+            $page_id_token,
+            $create
+        );
+
+    }
+
+    private function editQuestion(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $question_id_token,
+        URLBuilderToken $page_id_token
+    ): array {
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
+
+        $question_id = $this->retrieveQuestionId($question_id_token);
+
+        $url_builder_with_row_id = $url_builder->withParameter($question_id_token, $question_id->toString());
+
+        $edit = $this->questions_repository->getForQuestionId($question_id)->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->edit(
+            $url_builder_with_row_id->withParameter($action_token, self::CMD_EDIT_QUESTION),
+            $step_token,
+            $page_id_token,
+            $this->retrieveStringValueForToken($step_token)
+        );
+
+        if (is_array($edit)) {
+            return $edit;
+        }
+
+        $this->questions_repository->store($edit);
+        return $this->buildEditStartView(
+            $url_builder_with_row_id,
+            $step_token,
+            $page_id_token,
+            $edit
+        );
+    }
+
+    private function showTable(
+        \ilToolbarGUI $toolbar,
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): array {
+        $toolbar->addComponent(
+            $this->ui_factory->button()->standard(
+                $this->lng->txt('create'),
+                $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()->__toString()
+            )
+        );
+
+        $table = new QuestionsTable(
+            $this->ui_factory,
+            $this->ui_services,
+            $this->lng,
+            $this->answer_form_types_factory,
+            $this->questions_repository,
+            $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
+            $action_token,
+            $question_id_token
+        );
+        return [
+            $table->getFilter($url_builder->buildURI()->__toString()),
+            $table->getTable()->withRequest($this->http->request())
+
+        ];
+    }
+
+    private function processCreateAnswerForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $type_hash_token
+    ): array {
+        $form = $this->buildCreateAnswerForm(
+            $url_builder,
+            $action_token
+        )->withRequest($this->http->request());
+
+        $data = $form->getData();
+        if ($data === null || $data['form_type'] === null) {
+            return [$form];
+        }
+
+        return $this->forwardCreateAnswerFormCmd(
+            $data['form_type'],
+            $url_builder->withParameter($type_hash_token, $this->answer_form_types_factory->getHashedClass($data['form_type']::class)),
+            $step_token
+        );
+    }
+
+    private function forwardCreateAnswerFormCmd(
+        Definition $type,
+        TypeGenericProperties $type_generic_properties,
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): array {
+        return $type->getEditView()->create(
+            $type->buildProperties($type_generic_properties, []),
+            $url_builder,
+            $step_token,
+            $this->retrieveStringValueForToken($step_token)
+        );
+    }
+
+    private function acquireURLBuilderAndParameters(URI $base_uri): array
+    {
+        return (new URLBuilder($base_uri))
+            ->acquireParameters(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::TOKEN_STRING_ACTION,
+                self::TOKEN_STRING_STEP,
+                self::TOKEN_STRING_QUESTION_ID,
+                self::TOKEN_STRING_PAGE_ID,
+                self::TOKEN_TYPE_HASH
+            );
+    }
+
+    private function retrieveStringValueForToken(
+        URLBuilderToken $token
+    ): string {
+        return $this->http->wrapper()->query()->retrieve(
+            $token->getName(),
+            $this->buildStringTrafo()
+        );
+    }
+
+    private function retrieveQuestionId(
+        URLBuilderToken $question_id_token
+    ): ?Uuid {
+        return $this->http->wrapper()->query()->retrieve(
+            $question_id_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->custom()->transformation(
+                    fn($v): Uuid => $this->uuid_factory->fromString($v)
+                ),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
+    public function retrievePageId(
+        URLBuilderToken $page_id_token
+    ): ?int {
+        return $this->http->wrapper()->query()->retrieve(
+            $page_id_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->kindlyTo()->int(),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
+    private function buildStringTrafo(): Transformation
+    {
+        return $this->refinery->byTrying([
+            $this->refinery->kindlyTo()->string(),
+            $this->refinery->always('')
+        ]);
+    }
+
+    private function initializeEditMode(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): void {
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::MODE_ENABLED,
+            true
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::QUESTIONLIST_ENTRY,
+            $this->buildQuestionListSlate($url_builder, $action_token, $question_id_token)
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::URL_CLOSE_MODE_INFO,
+            $url_builder->buildURI()
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::URL_CREATE_QUESTION,
+            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()
+        );
+    }
+
+    private function setParametersForQuestionCmds(
+        URLBuilderToken $question_id_token,
+        string $question_id,
+        URLBuilderToken $page_id_token,
+        int $page_id
+    ): void {
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            $question_id_token->getName(),
+            $question_id
+        );
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            $page_id_token->getName(),
+            $page_id
+        );
+    }
+
+    private function buildQuestionListSlate(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): LegacySlate {
+        return $this->ui_factory->mainControls()->slate()->legacy(
+            $this->lng->txt('mainbar_button_label_questionlist'),
+            $this->ui_factory->symbol()->icon()->standard('', '')->withAbbreviation('QL'),
+            $this->ui_factory->legacy()->content(
+                $this->ui_renderer->render(
+                    $this->ui_factory->panel()->secondary()->listing(
+                        $this->lng->txt('mainbar_button_label_questionlist'),
+                        [
+                            $this->buildItemGroupForQuestionListSlate($url_builder, $action_token, $question_id_token)
+                        ]
+                    )
+                )
+            )
+        );
+    }
+
+    private function buildItemGroupForQuestionListSlate(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): ItemGroup {
+        return $this->ui_factory->item()->group(
+            '',
+            array_map(
+                fn(QuestionImplementation $v): StandardItem => $this->ui_factory->item()->standard(
+                    $v->toEditLink(
+                        $this->ui_factory->link(),
+                        $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
+                        $question_id_token
+                    )
+                ),
+                iterator_to_array($this->questions_repository->getAllQuestions())
+            )
+        );
+    }
+
+    private function buildEditStartView(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        URLBuilderToken $page_id_token,
+        QuestionImplementation $question
+    ): array {
+        return $question->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->edit(
+            $url_builder,
+            $step_token,
+            $page_id_token,
+            ''
+        );
+    }
+
+    private function buildCreateAnswerForm(
+        URLBuilder $url_builder
+    ): StandardForm {
+        $if = $this->ui_factory->input();
+        return $if->container()->form()->standard(
+            $url_builder->buildURI()->__toString(),
+            [
+                'form_type' => $if->field()->section(
+                    [
+                        $if->field()->select(
+                            $this->lng->txt('select_answer_form_type'),
+                            $this->answer_form_factory->getAnswerFormTypesArrayForSelect()
+                        )->withRequired(true)
+                    ],
+                    $this->lng->txt('create_answer_form')
+                )->withAdditionalTransformation(
+                    $this->refinery->custom()->transformation(
+                        fn(array $vs): ?Form => $this->answer_form_factory->buildTypeDefinitionFromSelectValue($vs[0])
+                    )
+                )
+            ]
+        )->withSubmitLabel($this->lng->txt('next'));
+    }
+
+    private function checkCapabilities(array $capabilities): void
+    {
+        foreach ($capabilities as $capability) {
+            if (!$this->questions_repository->capabilityExists($capability)) {
+                throw new \InvalidArgumentException('All provided capabilities must implement ILIAS\Questions\AnswerForm\Capabilities\Capability.');
+            }
+        }
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php b/components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php
new file mode 100644
index 000000000000..14a16b4c6037
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php
@@ -0,0 +1,555 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation;
+
+use ILIAS\Questions\AnswerForm\Definition;
+use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\AnswerForm\TypeGenericProperties;
+use ILIAS\Questions\Question\Persistence\Repository;
+use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Data\Factory as DataFactory;
+use ILIAS\Data\URI;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
+use ILIAS\HTTP\Services as HTTP;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Renderer as UIRenderer;
+use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
+use ILIAS\UI\Component\Item\Standard as StandardItem;
+use ILIAS\UI\Component\Item\Group as ItemGroup;
+use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
+use ILIAS\GlobalScreen\Services as GlobalScreen;
+
+class Edit
+{
+    private const array QUERY_PARAMETER_NAME_SPACE = ['q'];
+    private const string TOKEN_STRING_ACTION = 'a';
+    private const string TOKEN_STRING_STEP = 's';
+    private const string TOKEN_STRING_QUESTION_ID = 'q';
+    private const string TOKEN_STRING_PAGE_ID = 'p';
+    private const string TOKEN_TYPE_HASH = 't';
+    private const string CMD_CREATE_QUESTION = 'create';
+    private const string CMD_EDIT_QUESTION = 'edit';
+    private const string CMD_CREATE_ANSWER_FORM = 'create_af';
+    private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
+
+    private array $required_capabilities = [];
+    private Editability $editability = Editability::Full;
+    private bool $ordering_enabled = false;
+
+    public function __construct(
+        private readonly Language $lng,
+        private readonly \ilObjUser $current_user,
+        private readonly Refinery $refinery,
+        private readonly UIFactory $ui_factory,
+        private readonly UIRenderer $ui_renderer,
+        private readonly GlobalScreen $global_screen,
+        private readonly \ilCtrl $ctrl,
+        private readonly HTTP $http,
+        private readonly \ilUIService $ui_services,
+        private readonly DataFactory $data_factory,
+        private readonly UuidFactory $uuid_factory,
+        private readonly AnswerFormFactory $answer_form_factory,
+        private readonly Repository $questions_repository
+    ) {
+
+    }
+
+    public function withRequiredCapabilities(array $capability_class_names): self
+    {
+        $this->checkCapabilities($capability_class_names);
+        $clone = clone $this;
+        $clone->required_capabilities = $capability_class_names;
+        return $clone;
+    }
+
+    public function withEditable(Editability $editability): self
+    {
+        $clone = clone $this;
+        $clone->editability = $editability;
+        return $clone;
+    }
+
+    public function withOrderingEnabled(bool $enable): self
+    {
+        $clone = clone $this;
+        $clone->ordering_enabled = $enable;
+        return $clone;
+    }
+
+    public function view(
+        \ilToolbarGUI $toolbar,
+        URI $base_uri
+    ): array {
+        [
+            $url_builder,
+            $action_token,
+            $step_token,
+            $question_id_token,
+            $page_id_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_CREATE_QUESTION => $this->createQuestion(
+                $url_builder,
+                $action_token,
+                $step_token,
+                $question_id_token,
+                $page_id_token
+            ),
+            self::CMD_EDIT_QUESTION => $this->editQuestion(
+                $url_builder,
+                $action_token,
+                $step_token,
+                $question_id_token,
+                $page_id_token
+            ),
+            default => $this->showTable(
+                $toolbar,
+                $url_builder,
+                $action_token,
+                $question_id_token
+            )
+        };
+    }
+
+    public function forwardPageCmds(
+        \ilGlobalTemplateInterface $tpl,
+        URI $base_uri,
+    ): void {
+        [
+            0 => $url_builder,
+            1 => $action_token,
+            3 => $question_id_token,
+            4 => $page_id_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
+
+        $question_id = $this->retrieveQuestionId($question_id_token);
+        $page_id = $this->retrievePageId($page_id_token);
+        $this->setParametersForQuestionCmds($question_id_token, $question_id->toString(), $page_id_token, $page_id);
+
+        $tpl->setContent(
+            $this->ctrl->forwardCommand(
+                new \QstsQuestionPageGUI(
+                    $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION)
+                        ->withParameter($question_id_token, $question_id->toString())
+                        ->buildURI(),
+                    $page_id
+                )
+            )
+        );
+    }
+
+    public function createAnswerForm(
+        URI $base_uri
+    ): array {
+        [
+            $url_builder,
+            $action_token,
+            $step_token,
+            $question_id_token,
+            $page_id_token,
+            $type_hash_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+        $question_id = $this->retrieveQuestionId($question_id_token);
+        $url_builder_with_params = $url_builder
+                ->withParameter($question_id_token, $question_id->toString())
+                ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
+                ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
+
+        $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
+        if ($answer_form_type_class_hash !== '') {
+            return $this->forwardCreateAnswerFormCmd(
+                $this->answer_form_types_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
+                $this->answer_form_factory->getDefaultTypeGenericProperties($question_id),
+                $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
+                $step_token
+            );
+        }
+
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
+                $url_builder_with_params,
+                $action_token,
+                $step_token,
+                $type_hash_token
+            ),
+            default => [$this->buildCreateAnswerForm(
+                $url_builder_with_params,
+                $action_token
+            )]
+        };
+    }
+
+    public function editAnswerForm(
+        URI $base_uri
+    ): array {
+        [$url_builder, $action_token] = $this->acquireURLBuilderAndParameters($base_uri);
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_EDIT_ANSWER_FORM => [$this->processCreateAnswerForm($url_builder, $action_token)],
+            default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
+        };
+    }
+
+    private function createQuestion(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $question_id_token,
+        URLBuilderToken $page_id_token
+    ): array {
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
+
+        $create = (new QuestionImplementation())->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->create(
+            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION),
+            $step_token,
+            $this->retrieveStringValueForToken($step_token)
+        );
+
+        if (is_array($create)) {
+            return $create;
+        }
+
+        $this->questions_repository->store($create);
+        return $this->buildEditStartView(
+            $url_builder->withParameter($question_id_token, $create->getId()),
+            $step_token,
+            $page_id_token,
+            $create
+        );
+
+    }
+
+    private function editQuestion(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $question_id_token,
+        URLBuilderToken $page_id_token
+    ): array {
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
+
+        $question_id = $this->retrieveQuestionId($question_id_token);
+
+        $url_builder_with_row_id = $url_builder->withParameter($question_id_token, $question_id->toString());
+
+        $edit = $this->questions_repository->getForQuestionId($question_id)->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->edit(
+            $url_builder_with_row_id->withParameter($action_token, self::CMD_EDIT_QUESTION),
+            $step_token,
+            $page_id_token,
+            $this->retrieveStringValueForToken($step_token)
+        );
+
+        if (is_array($edit)) {
+            return $edit;
+        }
+
+        $this->questions_repository->store($edit);
+        return $this->buildEditStartView(
+            $url_builder_with_row_id,
+            $step_token,
+            $page_id_token,
+            $edit
+        );
+    }
+
+    private function showTable(
+        \ilToolbarGUI $toolbar,
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): array {
+        $toolbar->addComponent(
+            $this->ui_factory->button()->standard(
+                $this->lng->txt('create'),
+                $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()->__toString()
+            )
+        );
+
+        $table = new QuestionsTable(
+            $this->ui_factory,
+            $this->ui_services,
+            $this->lng,
+            $this->answer_form_types_factory,
+            $this->questions_repository,
+            $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
+            $action_token,
+            $question_id_token
+        );
+        return [
+            $table->getFilter($url_builder->buildURI()->__toString()),
+            $table->getTable()->withRequest($this->http->request())
+
+        ];
+    }
+
+    private function processCreateAnswerForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $type_hash_token
+    ): array {
+        $form = $this->buildCreateAnswerForm(
+            $url_builder,
+            $action_token
+        )->withRequest($this->http->request());
+
+        $data = $form->getData();
+        if ($data === null || $data['form_type'] === null) {
+            return [$form];
+        }
+
+        return $this->forwardCreateAnswerFormCmd(
+            $data['form_type'],
+            $url_builder->withParameter($type_hash_token, $this->answer_form_types_factory->getHashedClass($data['form_type']::class)),
+            $step_token
+        );
+    }
+
+    private function forwardCreateAnswerFormCmd(
+        Definition $type,
+        TypeGenericProperties $type_generic_properties,
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): array {
+        return $type->getEditView()->create(
+            $type->buildProperties($type_generic_properties, []),
+            $url_builder,
+            $step_token,
+            $this->retrieveStringValueForToken($step_token)
+        );
+    }
+
+    private function acquireURLBuilderAndParameters(URI $base_uri): array
+    {
+        return (new URLBuilder($base_uri))
+            ->acquireParameters(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::TOKEN_STRING_ACTION,
+                self::TOKEN_STRING_STEP,
+                self::TOKEN_STRING_QUESTION_ID,
+                self::TOKEN_STRING_PAGE_ID,
+                self::TOKEN_TYPE_HASH
+            );
+    }
+
+    private function retrieveStringValueForToken(
+        URLBuilderToken $token
+    ): string {
+        return $this->http->wrapper()->query()->retrieve(
+            $token->getName(),
+            $this->buildStringTrafo()
+        );
+    }
+
+    private function retrieveQuestionId(
+        URLBuilderToken $question_id_token
+    ): ?Uuid {
+        return $this->http->wrapper()->query()->retrieve(
+            $question_id_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->custom()->transformation(
+                    fn($v): Uuid => $this->uuid_factory->fromString($v)
+                ),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
+    public function retrievePageId(
+        URLBuilderToken $page_id_token
+    ): ?int {
+        return $this->http->wrapper()->query()->retrieve(
+            $page_id_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->kindlyTo()->int(),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
+    private function buildStringTrafo(): Transformation
+    {
+        return $this->refinery->byTrying([
+            $this->refinery->kindlyTo()->string(),
+            $this->refinery->always('')
+        ]);
+    }
+
+    private function initializeEditMode(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): void {
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::MODE_ENABLED,
+            true
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::QUESTIONLIST_ENTRY,
+            $this->buildQuestionListSlate($url_builder, $action_token, $question_id_token)
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::URL_CLOSE_MODE_INFO,
+            $url_builder->buildURI()
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::URL_CREATE_QUESTION,
+            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()
+        );
+    }
+
+    private function setParametersForQuestionCmds(
+        URLBuilderToken $question_id_token,
+        string $question_id,
+        URLBuilderToken $page_id_token,
+        int $page_id
+    ): void {
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            $question_id_token->getName(),
+            $question_id
+        );
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            $page_id_token->getName(),
+            $page_id
+        );
+    }
+
+    private function buildQuestionListSlate(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): LegacySlate {
+        return $this->ui_factory->mainControls()->slate()->legacy(
+            $this->lng->txt('mainbar_button_label_questionlist'),
+            $this->ui_factory->symbol()->icon()->standard('', '')->withAbbreviation('QL'),
+            $this->ui_factory->legacy()->content(
+                $this->ui_renderer->render(
+                    $this->ui_factory->panel()->secondary()->listing(
+                        $this->lng->txt('mainbar_button_label_questionlist'),
+                        [
+                            $this->buildItemGroupForQuestionListSlate($url_builder, $action_token, $question_id_token)
+                        ]
+                    )
+                )
+            )
+        );
+    }
+
+    private function buildItemGroupForQuestionListSlate(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): ItemGroup {
+        return $this->ui_factory->item()->group(
+            '',
+            array_map(
+                fn(QuestionImplementation $v): StandardItem => $this->ui_factory->item()->standard(
+                    $v->toEditLink(
+                        $this->ui_factory->link(),
+                        $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
+                        $question_id_token
+                    )
+                ),
+                iterator_to_array($this->questions_repository->getAllQuestions())
+            )
+        );
+    }
+
+    private function buildEditStartView(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        URLBuilderToken $page_id_token,
+        QuestionImplementation $question
+    ): array {
+        return $question->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->edit(
+            $url_builder,
+            $step_token,
+            $page_id_token,
+            ''
+        );
+    }
+
+    private function buildCreateAnswerForm(
+        URLBuilder $url_builder
+    ): StandardForm {
+        $if = $this->ui_factory->input();
+        return $if->container()->form()->standard(
+            $url_builder->buildURI()->__toString(),
+            [
+                'form_type' => $if->field()->section(
+                    [
+                        $if->field()->select(
+                            $this->lng->txt('select_answer_form_type'),
+                            $this->answer_form_factory->getAnswerFormTypesArrayForSelect()
+                        )->withRequired(true)
+                    ],
+                    $this->lng->txt('create_answer_form')
+                )->withAdditionalTransformation(
+                    $this->refinery->custom()->transformation(
+                        fn(array $vs): ?Form => $this->answer_form_factory->buildTypeDefinitionFromSelectValue($vs[0])
+                    )
+                )
+            ]
+        )->withSubmitLabel($this->lng->txt('next'));
+    }
+
+    private function checkCapabilities(array $capabilities): void
+    {
+        foreach ($capabilities as $capability) {
+            if (!$this->questions_repository->capabilityExists($capability)) {
+                throw new \InvalidArgumentException('All provided capabilities must implement ILIAS\Questions\AnswerForm\Capabilities\Capability.');
+            }
+        }
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Editability.php b/components/ILIAS/Questions/src/Presentation/Definitions/Editability.php
similarity index 100%
rename from components/ILIAS/Questions/src/Presentation/Editability.php
rename to components/ILIAS/Questions/src/Presentation/Definitions/Editability.php
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php b/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
new file mode 100755
index 000000000000..e23e4217a684
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\HTTP\Wrapper;
+
+use ILIAS\Refinery\Transformation;
+
+/**
+ * Class ArrayBasedRequestWrapper
+ *
+ * @author Fabian Schmid <fs@studer-raimann.ch>
+ */
+class ArrayBasedRequestWrapper implements RequestWrapper
+{
+    /**
+     * GetRequestWrapper constructor.
+     * @param mixed[] $raw_values
+     */
+    public function __construct(private array $raw_values)
+    {
+    }
+
+
+    /**
+     * @inheritDoc
+     */
+    public function retrieve(string $key, Transformation $transformation)
+    {
+        return $transformation->transform($this->raw_values[$key] ?? null);
+    }
+
+
+    /**
+     * @inheritDoc
+     */
+    public function has(string $key): bool
+    {
+        return isset($this->raw_values[$key]);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function keys(): array
+    {
+        return array_keys($this->raw_values);
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/Definitions/QuestionsTable.php
similarity index 100%
rename from components/ILIAS/Questions/src/Presentation/QuestionsTable.php
rename to components/ILIAS/Questions/src/Presentation/Definitions/QuestionsTable.php
diff --git a/components/ILIAS/Questions/src/Presentation/LayoutProvider.php b/components/ILIAS/Questions/src/Presentation/Layout/LayoutProvider.php
similarity index 100%
rename from components/ILIAS/Questions/src/Presentation/LayoutProvider.php
rename to components/ILIAS/Questions/src/Presentation/Layout/LayoutProvider.php
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
new file mode 100644
index 000000000000..14a16b4c6037
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -0,0 +1,555 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation;
+
+use ILIAS\Questions\AnswerForm\Definition;
+use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\AnswerForm\TypeGenericProperties;
+use ILIAS\Questions\Question\Persistence\Repository;
+use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Data\Factory as DataFactory;
+use ILIAS\Data\URI;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
+use ILIAS\HTTP\Services as HTTP;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Renderer as UIRenderer;
+use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
+use ILIAS\UI\Component\Item\Standard as StandardItem;
+use ILIAS\UI\Component\Item\Group as ItemGroup;
+use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
+use ILIAS\GlobalScreen\Services as GlobalScreen;
+
+class Edit
+{
+    private const array QUERY_PARAMETER_NAME_SPACE = ['q'];
+    private const string TOKEN_STRING_ACTION = 'a';
+    private const string TOKEN_STRING_STEP = 's';
+    private const string TOKEN_STRING_QUESTION_ID = 'q';
+    private const string TOKEN_STRING_PAGE_ID = 'p';
+    private const string TOKEN_TYPE_HASH = 't';
+    private const string CMD_CREATE_QUESTION = 'create';
+    private const string CMD_EDIT_QUESTION = 'edit';
+    private const string CMD_CREATE_ANSWER_FORM = 'create_af';
+    private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
+
+    private array $required_capabilities = [];
+    private Editability $editability = Editability::Full;
+    private bool $ordering_enabled = false;
+
+    public function __construct(
+        private readonly Language $lng,
+        private readonly \ilObjUser $current_user,
+        private readonly Refinery $refinery,
+        private readonly UIFactory $ui_factory,
+        private readonly UIRenderer $ui_renderer,
+        private readonly GlobalScreen $global_screen,
+        private readonly \ilCtrl $ctrl,
+        private readonly HTTP $http,
+        private readonly \ilUIService $ui_services,
+        private readonly DataFactory $data_factory,
+        private readonly UuidFactory $uuid_factory,
+        private readonly AnswerFormFactory $answer_form_factory,
+        private readonly Repository $questions_repository
+    ) {
+
+    }
+
+    public function withRequiredCapabilities(array $capability_class_names): self
+    {
+        $this->checkCapabilities($capability_class_names);
+        $clone = clone $this;
+        $clone->required_capabilities = $capability_class_names;
+        return $clone;
+    }
+
+    public function withEditable(Editability $editability): self
+    {
+        $clone = clone $this;
+        $clone->editability = $editability;
+        return $clone;
+    }
+
+    public function withOrderingEnabled(bool $enable): self
+    {
+        $clone = clone $this;
+        $clone->ordering_enabled = $enable;
+        return $clone;
+    }
+
+    public function view(
+        \ilToolbarGUI $toolbar,
+        URI $base_uri
+    ): array {
+        [
+            $url_builder,
+            $action_token,
+            $step_token,
+            $question_id_token,
+            $page_id_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_CREATE_QUESTION => $this->createQuestion(
+                $url_builder,
+                $action_token,
+                $step_token,
+                $question_id_token,
+                $page_id_token
+            ),
+            self::CMD_EDIT_QUESTION => $this->editQuestion(
+                $url_builder,
+                $action_token,
+                $step_token,
+                $question_id_token,
+                $page_id_token
+            ),
+            default => $this->showTable(
+                $toolbar,
+                $url_builder,
+                $action_token,
+                $question_id_token
+            )
+        };
+    }
+
+    public function forwardPageCmds(
+        \ilGlobalTemplateInterface $tpl,
+        URI $base_uri,
+    ): void {
+        [
+            0 => $url_builder,
+            1 => $action_token,
+            3 => $question_id_token,
+            4 => $page_id_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
+
+        $question_id = $this->retrieveQuestionId($question_id_token);
+        $page_id = $this->retrievePageId($page_id_token);
+        $this->setParametersForQuestionCmds($question_id_token, $question_id->toString(), $page_id_token, $page_id);
+
+        $tpl->setContent(
+            $this->ctrl->forwardCommand(
+                new \QstsQuestionPageGUI(
+                    $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION)
+                        ->withParameter($question_id_token, $question_id->toString())
+                        ->buildURI(),
+                    $page_id
+                )
+            )
+        );
+    }
+
+    public function createAnswerForm(
+        URI $base_uri
+    ): array {
+        [
+            $url_builder,
+            $action_token,
+            $step_token,
+            $question_id_token,
+            $page_id_token,
+            $type_hash_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+        $question_id = $this->retrieveQuestionId($question_id_token);
+        $url_builder_with_params = $url_builder
+                ->withParameter($question_id_token, $question_id->toString())
+                ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
+                ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
+
+        $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
+        if ($answer_form_type_class_hash !== '') {
+            return $this->forwardCreateAnswerFormCmd(
+                $this->answer_form_types_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
+                $this->answer_form_factory->getDefaultTypeGenericProperties($question_id),
+                $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
+                $step_token
+            );
+        }
+
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
+                $url_builder_with_params,
+                $action_token,
+                $step_token,
+                $type_hash_token
+            ),
+            default => [$this->buildCreateAnswerForm(
+                $url_builder_with_params,
+                $action_token
+            )]
+        };
+    }
+
+    public function editAnswerForm(
+        URI $base_uri
+    ): array {
+        [$url_builder, $action_token] = $this->acquireURLBuilderAndParameters($base_uri);
+        return match($this->retrieveStringValueForToken($action_token)) {
+            self::CMD_EDIT_ANSWER_FORM => [$this->processCreateAnswerForm($url_builder, $action_token)],
+            default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
+        };
+    }
+
+    private function createQuestion(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $question_id_token,
+        URLBuilderToken $page_id_token
+    ): array {
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
+
+        $create = (new QuestionImplementation())->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->create(
+            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION),
+            $step_token,
+            $this->retrieveStringValueForToken($step_token)
+        );
+
+        if (is_array($create)) {
+            return $create;
+        }
+
+        $this->questions_repository->store($create);
+        return $this->buildEditStartView(
+            $url_builder->withParameter($question_id_token, $create->getId()),
+            $step_token,
+            $page_id_token,
+            $create
+        );
+
+    }
+
+    private function editQuestion(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $question_id_token,
+        URLBuilderToken $page_id_token
+    ): array {
+        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
+
+        $question_id = $this->retrieveQuestionId($question_id_token);
+
+        $url_builder_with_row_id = $url_builder->withParameter($question_id_token, $question_id->toString());
+
+        $edit = $this->questions_repository->getForQuestionId($question_id)->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->edit(
+            $url_builder_with_row_id->withParameter($action_token, self::CMD_EDIT_QUESTION),
+            $step_token,
+            $page_id_token,
+            $this->retrieveStringValueForToken($step_token)
+        );
+
+        if (is_array($edit)) {
+            return $edit;
+        }
+
+        $this->questions_repository->store($edit);
+        return $this->buildEditStartView(
+            $url_builder_with_row_id,
+            $step_token,
+            $page_id_token,
+            $edit
+        );
+    }
+
+    private function showTable(
+        \ilToolbarGUI $toolbar,
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): array {
+        $toolbar->addComponent(
+            $this->ui_factory->button()->standard(
+                $this->lng->txt('create'),
+                $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()->__toString()
+            )
+        );
+
+        $table = new QuestionsTable(
+            $this->ui_factory,
+            $this->ui_services,
+            $this->lng,
+            $this->answer_form_types_factory,
+            $this->questions_repository,
+            $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
+            $action_token,
+            $question_id_token
+        );
+        return [
+            $table->getFilter($url_builder->buildURI()->__toString()),
+            $table->getTable()->withRequest($this->http->request())
+
+        ];
+    }
+
+    private function processCreateAnswerForm(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $step_token,
+        URLBuilderToken $type_hash_token
+    ): array {
+        $form = $this->buildCreateAnswerForm(
+            $url_builder,
+            $action_token
+        )->withRequest($this->http->request());
+
+        $data = $form->getData();
+        if ($data === null || $data['form_type'] === null) {
+            return [$form];
+        }
+
+        return $this->forwardCreateAnswerFormCmd(
+            $data['form_type'],
+            $url_builder->withParameter($type_hash_token, $this->answer_form_types_factory->getHashedClass($data['form_type']::class)),
+            $step_token
+        );
+    }
+
+    private function forwardCreateAnswerFormCmd(
+        Definition $type,
+        TypeGenericProperties $type_generic_properties,
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token
+    ): array {
+        return $type->getEditView()->create(
+            $type->buildProperties($type_generic_properties, []),
+            $url_builder,
+            $step_token,
+            $this->retrieveStringValueForToken($step_token)
+        );
+    }
+
+    private function acquireURLBuilderAndParameters(URI $base_uri): array
+    {
+        return (new URLBuilder($base_uri))
+            ->acquireParameters(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::TOKEN_STRING_ACTION,
+                self::TOKEN_STRING_STEP,
+                self::TOKEN_STRING_QUESTION_ID,
+                self::TOKEN_STRING_PAGE_ID,
+                self::TOKEN_TYPE_HASH
+            );
+    }
+
+    private function retrieveStringValueForToken(
+        URLBuilderToken $token
+    ): string {
+        return $this->http->wrapper()->query()->retrieve(
+            $token->getName(),
+            $this->buildStringTrafo()
+        );
+    }
+
+    private function retrieveQuestionId(
+        URLBuilderToken $question_id_token
+    ): ?Uuid {
+        return $this->http->wrapper()->query()->retrieve(
+            $question_id_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->custom()->transformation(
+                    fn($v): Uuid => $this->uuid_factory->fromString($v)
+                ),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
+    public function retrievePageId(
+        URLBuilderToken $page_id_token
+    ): ?int {
+        return $this->http->wrapper()->query()->retrieve(
+            $page_id_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->kindlyTo()->int(),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
+    private function buildStringTrafo(): Transformation
+    {
+        return $this->refinery->byTrying([
+            $this->refinery->kindlyTo()->string(),
+            $this->refinery->always('')
+        ]);
+    }
+
+    private function initializeEditMode(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): void {
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::MODE_ENABLED,
+            true
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::QUESTIONLIST_ENTRY,
+            $this->buildQuestionListSlate($url_builder, $action_token, $question_id_token)
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::URL_CLOSE_MODE_INFO,
+            $url_builder->buildURI()
+        );
+        $this->global_screen->tool()->context()->current()->addAdditionalData(
+            LayoutProvider::URL_CREATE_QUESTION,
+            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()
+        );
+    }
+
+    private function setParametersForQuestionCmds(
+        URLBuilderToken $question_id_token,
+        string $question_id,
+        URLBuilderToken $page_id_token,
+        int $page_id
+    ): void {
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            $question_id_token->getName(),
+            $question_id
+        );
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            $page_id_token->getName(),
+            $page_id
+        );
+    }
+
+    private function buildQuestionListSlate(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): LegacySlate {
+        return $this->ui_factory->mainControls()->slate()->legacy(
+            $this->lng->txt('mainbar_button_label_questionlist'),
+            $this->ui_factory->symbol()->icon()->standard('', '')->withAbbreviation('QL'),
+            $this->ui_factory->legacy()->content(
+                $this->ui_renderer->render(
+                    $this->ui_factory->panel()->secondary()->listing(
+                        $this->lng->txt('mainbar_button_label_questionlist'),
+                        [
+                            $this->buildItemGroupForQuestionListSlate($url_builder, $action_token, $question_id_token)
+                        ]
+                    )
+                )
+            )
+        );
+    }
+
+    private function buildItemGroupForQuestionListSlate(
+        URLBuilder $url_builder,
+        URLBuilderToken $action_token,
+        URLBuilderToken $question_id_token
+    ): ItemGroup {
+        return $this->ui_factory->item()->group(
+            '',
+            array_map(
+                fn(QuestionImplementation $v): StandardItem => $this->ui_factory->item()->standard(
+                    $v->toEditLink(
+                        $this->ui_factory->link(),
+                        $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
+                        $question_id_token
+                    )
+                ),
+                iterator_to_array($this->questions_repository->getAllQuestions())
+            )
+        );
+    }
+
+    private function buildEditStartView(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        URLBuilderToken $page_id_token,
+        QuestionImplementation $question
+    ): array {
+        return $question->getEditView(
+            $this->lng,
+            $this->current_user,
+            $this->ui_factory,
+            $this->refinery,
+            $this->http->request(),
+            $this->ctrl,
+            $this->data_factory
+        )->edit(
+            $url_builder,
+            $step_token,
+            $page_id_token,
+            ''
+        );
+    }
+
+    private function buildCreateAnswerForm(
+        URLBuilder $url_builder
+    ): StandardForm {
+        $if = $this->ui_factory->input();
+        return $if->container()->form()->standard(
+            $url_builder->buildURI()->__toString(),
+            [
+                'form_type' => $if->field()->section(
+                    [
+                        $if->field()->select(
+                            $this->lng->txt('select_answer_form_type'),
+                            $this->answer_form_factory->getAnswerFormTypesArrayForSelect()
+                        )->withRequired(true)
+                    ],
+                    $this->lng->txt('create_answer_form')
+                )->withAdditionalTransformation(
+                    $this->refinery->custom()->transformation(
+                        fn(array $vs): ?Form => $this->answer_form_factory->buildTypeDefinitionFromSelectValue($vs[0])
+                    )
+                )
+            ]
+        )->withSubmitLabel($this->lng->txt('next'));
+    }
+
+    private function checkCapabilities(array $capabilities): void
+    {
+        foreach ($capabilities as $capability) {
+            if (!$this->questions_repository->capabilityExists($capability)) {
+                throw new \InvalidArgumentException('All provided capabilities must implement ILIAS\Questions\AnswerForm\Capabilities\Capability.');
+            }
+        }
+    }
+}

From 1757a40a30824579d5a205b52a681c56a9146cd1 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 15 Dec 2025 07:52:08 +0100
Subject: [PATCH 089/141] Questions: Implementing Cloze Question

---
 .../class.ilObjQuestionsGUI.php               |  12 +-
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  30 +-
 .../Legacy/PageEditor/QstsQuestionPage.php    |  26 +
 .../PageEditor/class.QstsQuestionPageGUI.php  |   9 +-
 .../PageEditor/class.ilPCAnswerForm.php       | 393 ++----------
 .../PageEditor/class.ilPCAnswerFormGUI.php    |  45 +-
 .../Questions/src/AnswerForm/Definition.php   |   2 +-
 .../Questions/src/AnswerForm/Factory.php      |  10 +-
 .../Questions/src/AnswerForm/Properties.php   |   6 +-
 .../Questions/src/AnswerForm/Views/Edit.php   |  22 +-
 .../src/AnswerFormTypes/Cloze/Definition.php  |   9 +-
 .../Cloze/Properties/AnswerForm/Factory.php   |  34 +-
 .../Properties/AnswerForm/Properties.php      | 106 ++--
 .../Cloze/Properties/ClozeText/Factory.php    |   4 +-
 .../Cloze/Properties/ClozeText/Text.php       |   8 +-
 .../Cloze/Properties/Gaps/Factory.php         |   6 +-
 .../Cloze/Properties/Gaps/Gap.php             |  71 +--
 .../Cloze/Properties/Gaps/Gaps.php            |  43 +-
 .../Cloze/Properties/Gaps/LongMenu.php        |  22 +-
 .../Cloze/Properties/Gaps/Numeric.php         |  26 +-
 .../Gaps/Properties/AnswerOption.php          |  14 +-
 .../Gaps/Properties/AnswerOptions.php         |   2 +-
 .../Properties/Gaps/Properties/Factory.php    |   8 +-
 .../Properties/Gaps/Properties/Properties.php |  93 ++-
 .../Cloze/Properties/Gaps/Select.php          |  20 +-
 .../Cloze/Properties/Gaps/Text.php            |  22 +-
 .../Cloze/Properties/Gaps/Type.php            |  14 +-
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 326 +++++-----
 .../Presentation/Definitions/CarryWrapper.php |  53 +-
 .../src/Presentation/Definitions/EditForm.php | 549 ++---------------
 .../Definitions/EditFormFactory.php           | 558 ++----------------
 .../Presentation/Definitions/EditOverview.php | 546 ++---------------
 .../Presentation/Definitions/Editability.php  |   2 +-
 .../src/Presentation/Definitions/Leaf.php     |  45 +-
 .../Definitions/QuestionsTable.php            |  96 +--
 .../Presentation/Layout/LayoutProvider.php    |   2 +-
 .../Questions/src/Presentation/Views/Edit.php | 223 +++----
 .../ILIAS/Questions/src/PublicInterface.php   |   2 +-
 .../Question/Persistence/ManipulateQuery.php  |  33 --
 .../src/Question/Persistence/Repository.php   |  31 +-
 .../src/Question/QuestionImplementation.php   |  40 +-
 .../Questions/src/Question/Views/Edit.php     | 118 ++--
 42 files changed, 1070 insertions(+), 2611 deletions(-)

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
index eedde9e858f3..4bfaecc6d77d 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -19,7 +19,7 @@
 declare(strict_types=1);
 
 use ILIAS\Questions\Legacy\LocalDIC;
-use ILIAS\Questions\Presentation\Edit;
+use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Units\GlobalConfigurationGUI;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\UploadAnswerOptionsGUI;
 use ILIAS\Data\Factory as DataFactory;
@@ -98,12 +98,10 @@ public function viewQuestionsObject(): void
         $this->tabs_gui->activateTab('questions');
 
         $this->tpl->setContent(
-            $this->ui_renderer->render(
-                $this->edit_view->view(
-                    $this->toolbar,
-                    $this->buildEditQuestionsBaseUri()
-                )
-            )
+            $this->edit_view->view(
+                $this->toolbar,
+                $this->buildEditQuestionsBaseUri()
+            )->render($this->ui_renderer)
         );
     }
 
diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 59a70f626023..783ec2583f02 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -24,7 +24,8 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze;
 use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
-use ILIAS\Questions\Presentation\Edit;
+use ILIAS\Questions\Presentation\Views\Edit;
+use ILIAS\Questions\Presentation\Definitions\EditFormFactory;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\DI\Container as ILIASContainer;
@@ -50,14 +51,22 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic[UuidFactory::class] = static fn($c): UuidFactory => new UuidFactory();
 
         $dic[AnswerFormFactory::class] = static fn($c): AnswerFormFactory
-            => new AnswerFormFactory([
-                $c[Cloze\Type::class]
-            ]);
+            => new AnswerFormFactory(
+                $c[UuidFactory::class],
+                [
+                    $c[Cloze\Definition::class]
+                ]
+            );
         $dic[QuestionsRepository::class] = static fn($c): QuestionsRepository =>
             new QuestionsRepository(
                 $DIC['ilDB'],
                 new UuidFactory(),
             );
+        $dic[EditFormFactory::class] = static fn($c): EditFormFactory =>
+            new EditFormFactory(
+                $DIC['ui.factory'],
+                $DIC['lng']
+            );
         $dic[Edit::class] = static fn($c): Edit => new Edit(
             $DIC['lng'],
             $DIC['ilUser'],
@@ -71,25 +80,25 @@ protected static function buildDIC(ILIASContainer $DIC): self
             $c[DataFactory::class],
             $c[UuidFactory::class],
             $c[AnswerFormFactory::class],
-            $c[QuestionsRepository::class]
+            $c[QuestionsRepository::class],
+            $c[EditFormFactory::class]
         );
 
         $dic[Cloze\Properties\ClozeText\Factory::class] = static fn($c): Cloze\Properties\ClozeText\Factory
             => new Cloze\Properties\ClozeText\Factory(
                 $DIC['refinery'],
                 (new \ilMustacheFactory())->getBasicEngine(),
-                $c[UuidFactory::class],
                 $c[DataFactory::class]->text()
             );
-        $dic[Cloze\Properties\Gaps\Data\Factory::class] = static fn($c): Cloze\Properties\Gaps\Data\Factory
-            => new Cloze\Properties\Gaps\Data\Factory(
+        $dic[Cloze\Properties\Gaps\Properties\Factory::class] = static fn($c): Cloze\Properties\Gaps\Properties\Factory
+            => new Cloze\Properties\Gaps\Properties\Factory(
                 $c[UuidFactory::class],
                 $DIC['refinery']
             );
         $dic[Cloze\Properties\Gaps\Factory::class] = static fn($c): Cloze\Properties\Gaps\Factory
             => new Cloze\Properties\Gaps\Factory(
                 $c[UuidFactory::class],
-                $c[Cloze\Properties\Gaps\Data\Factory::class],
+                $c[Cloze\Properties\Gaps\Properties\Factory::class],
                 [
                     new Cloze\Properties\Gaps\Text(
                         $DIC['refinery'],
@@ -115,7 +124,6 @@ protected static function buildDIC(ILIASContainer $DIC): self
             );
         $dic[Cloze\Properties\AnswerForm\Factory::class] = static fn($c): Cloze\Properties\AnswerForm\Factory
             => new Cloze\Properties\AnswerForm\Factory(
-                $c[UuidFactory::class],
                 $c[Cloze\Properties\ClozeText\Factory::class],
                 $c[Cloze\Properties\Gaps\Factory::class]
             );
@@ -135,7 +143,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
             );
         $dic[Cloze\Views\Participant::class] = static fn($c): Cloze\Views\Participant
             => new Cloze\Views\Participant();
-        $dic[Cloze\Type::class] = static fn($c): Cloze\Type => new Cloze\Type(
+        $dic[Cloze\Definition::class] = static fn($c): Cloze\Definition => new Cloze\Definition(
             $c[Cloze\Properties\AnswerForm\Factory::class],
             $c[Cloze\Persistence::class],
             [
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
index 23644751d771..b600e179ed02 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
@@ -18,10 +18,36 @@
 
 declare(strict_types=1);
 
+use ILIAS\Questions\Presentation\Views\Edit;
+use ILIAS\Questions\Question\QuestionImplementation;
+
 class QstsQuestionPage extends ilPageObject
 {
+    private readonly Edit $edit_view;
+    private readonly QuestionImplementation $question;
+
     public function getParentType(): string
     {
         return 'qsts';
     }
+
+    public function getEditView(): Edit
+    {
+        return $this->edit_view;
+    }
+
+    public function setEditView(Edit $edit_view): void
+    {
+        $this->edit_view = $edit_view;
+    }
+
+    public function getQuestion(): QuestionImplementation
+    {
+        return $this->question;
+    }
+
+    public function setQuestion(QuestionImplementation $question): void
+    {
+        $this->question = $question;
+    }
 }
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
index ae44c63ecae1..ee196302261c 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
@@ -18,6 +18,8 @@
 
 declare(strict_types=1);
 
+use ILIAS\Questions\Presentation\Views\Edit;
+use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\URI;
 
 /**
@@ -29,9 +31,12 @@ class QstsQuestionPageGUI extends ilPageObjectGUI
 {
     public function __construct(
         private readonly URI $return_uri,
-        int $id = 0
+        Edit $edit_view,
+        QuestionImplementation $question
     ) {
-        parent::__construct('qsts', $id);
+        parent::__construct('qsts', $question->getPageId());
+        $this->obj->setQuestion($question);
+        $this->obj->setEditView($edit_view);
         $this->setEnabledPageFocus(false);
     }
 
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
index 86f8961dad6e..5835d4626104 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
@@ -18,260 +18,39 @@
 
 declare(strict_types=1);
 
+use ILIAS\Data\UUID\Uuid;
+
 class ilPCAnswerForm extends ilPageContent
 {
+    private const string ANSWER_FORM_ELEMENT_TAG = 'AnswerForm';
+    private const string ANSWER_FORM_ID_ATTRIBUT = 'Uuid';
+    private const string ANSWER_FORM_PLACEHOLDER = '\[\[\[ANSWER_FORM_(.*)\]\]\]';
+
     public function init(): void
     {
         $this->setType('answf');
     }
 
-    public function setQuestionReference(string $a_questionreference): void
-    {
-        if (is_object($this->getChildNode())) {
-            $this->getChildNode()->setAttribute("QRef", $a_questionreference);
-        }
-    }
-
-    public function getQuestionReference(): ?string
-    {
-        if (is_object($this->getChildNode())) {
-            return $this->getChildNode()->getAttribute("QRef");
-        }
-        return null;
-    }
-
-    public function create(
-        ilPageObject $a_pg_obj,
-        string $a_hier_id,
-        string $a_pc_id = ""
-    ): void {
-        $this->createInitialChildNode(
-            $a_hier_id,
-            $a_pc_id,
-            "Question",
-            ["QRef" => ""]
-        );
-    }
-
-    /**
-     * Copy question from pool into page
-     */
-    public function copyPoolQuestionIntoPage(
-        string $a_q_id,
-        string $a_hier_id
-    ): void {
-        $question = assQuestion::instantiateQuestion($a_q_id);
-        $duplicate_id = $question->copyObject(0, $question->getTitle());
-        $duplicate = assQuestion::instantiateQuestion($duplicate_id);
-        $duplicate->setObjId(0);
-
-        ilAssSelfAssessmentQuestionFormatter::prepareQuestionForLearningModule($duplicate);
-
-        $this->getChildNode()->setAttribute("QRef", "il__qst_" . $duplicate_id);
-    }
-
     public static function getLangVars(): array
     {
         return ['ed_insert_pcqst', 'empty_question', 'pc_qst'];
     }
 
-    /**
-     * After page has been updated (or created)
-     */
-    public static function afterPageUpdate(
-        ilPageObject $a_page,
-        DOMDocument $a_domdoc,
-        string $a_xml,
-        bool $a_creation
-    ): void {
-        global $DIC;
-
-        $ilDB = $DIC->database();
-
-        $ilDB->manipulateF(
-            "DELETE FROM page_question WHERE page_parent_type = %s " .
-            " AND page_id = %s AND page_lang = %s",
-            array("text", "integer", "text"),
-            array($a_page->getParentType(), $a_page->getId(), $a_page->getLanguage())
-        );
-
-        $xpath = new DOMXPath($a_domdoc);
-        $nodes = $xpath->query('//Question');
-        $q_ids = array();
-        foreach ($nodes as $node) {
-            $q_ref = $node->getAttribute("QRef");
-
-            $inst_id = ilInternalLink::_extractInstOfTarget($q_ref);
-            if (!($inst_id > 0)) {
-                $q_id = ilInternalLink::_extractObjIdOfTarget($q_ref);
-                if ($q_id > 0) {
-                    $q_ids[$q_id] = $q_id;
-                }
-            }
-        }
-        foreach ($q_ids as $qid) {
-            $ilDB->replace(
-                "page_question",
-                [
-                "page_parent_type" => ["text", $a_page->getParentType()],
-                "page_id" => ["integer", $a_page->getId()],
-                "page_lang" => ["text", $a_page->getLanguage()],
-                "question_id" => ["integer", $qid]
-            ],
-                []
-            );
-        }
-    }
-
-    public static function beforePageDelete(
-        ilPageObject $a_page
-    ): void {
-        global $DIC;
-
-        $ilDB = $DIC->database();
-
-        $ilDB->manipulateF(
-            "DELETE FROM page_question WHERE page_parent_type = %s " .
-            " AND page_id = %s AND page_lang = %s",
-            array("text", "integer", "text"),
-            array($a_page->getParentType(), $a_page->getId(), $a_page->getLanguage())
-        );
-    }
-
-    public static function _getQuestionIdsForPage(
-        string $a_parent_type,
-        int $a_page_id,
-        string $a_lang = "-"
-    ): array {
-        global $DIC;
-
-        $ilDB = $DIC->database();
-
-        $parent_type_array = explode(':', $a_parent_type);
-
-        $res = $ilDB->queryF(
-            "SELECT * FROM page_question WHERE page_parent_type = %s " .
-            " AND page_id = %s AND page_lang = %s",
-            array("text", "integer", "text"),
-            array($parent_type_array[0], $a_page_id, $a_lang)
-        );
-        $q_ids = array();
-        while ($rec = $ilDB->fetchAssoc($res)) {
-            $q_ids[] = $rec["question_id"];
-        }
-
-        return $q_ids;
-    }
-
-    public static function _getPageForQuestionId(
-        int $a_q_id,
-        string $a_parent_type = ""
-    ): ?array {
-        global $DIC;
-
-        $ilDB = $DIC->database();
-
-        $set = $ilDB->query(
-            "SELECT * FROM page_question " .
-            " WHERE question_id = " . $ilDB->quote($a_q_id, "integer")
-        );
-        while ($rec = $ilDB->fetchAssoc($set)) {
-            if ($a_parent_type == "" || $rec["page_parent_type"] == $a_parent_type) {
-                return array("page_id" => $rec["page_id"], "parent_type" => $rec["page_parent_type"]);
-            }
-        }
-        return null;
-    }
-
     public function modifyPageContentPostXsl(
-        string $a_output,
-        string $a_mode,
-        bool $a_abstract_only = false
+        string $output,
+        string $mode,
+        bool $abstract_only = false
     ): string {
-        $qhtml = "";
-
-        if ($this->getPage()->getPageConfig()->getEnableSelfAssessment()) {
-            // #14154
-            $q_ids = $this->getQuestionIds();
-            if (count($q_ids)) {
-                foreach ($q_ids as $q_id) {
-                    $q_gui = assQuestionGUI::_getQuestionGUI("", $q_id);
-                    // object check due to #16557
-                    if (is_object($q_gui->getObject()) && !$q_gui->getObject()->isComplete()) {
-                        $a_output = str_replace(
-                            "{{{{{Question;il__qst_" . $q_id . "}}}}}",
-                            "<i>" . $lng->txt("cont_empty_question") . "</i>",
-                            $a_output
-                        );
-                    }
-                }
-
-                // this exports the questions which is needed below
-                $qhtml = $this->getQuestionJsOfPage($a_mode == "edit", $a_mode);
-
-                $a_output = "<script>" . ilQuestionExporter::questionsJS($q_ids) . "</script>" . $a_output;
-                if (!self::$initial_done) {
-                    $a_output = "<script>var ScormApi=null; var questions = new Array();</script>" . $a_output;
-                    self::$initial_done = true;
-                }
-            }
-        } else {
-            // set by T&A components
-            $qhtml = $this->getPage()->getPageConfig()->getQuestionHTML();
-
-            // address #19788
-            if (!is_array($qhtml) || count($qhtml) == 0) {
-                // #14154
-                $q_ids = $this->getQuestionIds();
-                if (count($q_ids)) {
-                    foreach ($q_ids as $k) {
-                        $a_output = str_replace("{{{{{Question;il__qst_$k" . "}}}}}", " " . $lng->txt("copg_questions_not_supported_here"), $a_output);
-                    }
-                }
-            }
-        }
-
-        if (is_array($qhtml)) {
-            foreach ($qhtml as $k => $h) {
-                $a_output = str_replace("{{{{{Question;il__qst_$k" . "}}}}}", " " . $h, $a_output);
-            }
-        }
-
-        return $a_output;
-    }
-
-    /**
-     * Reset initial state (for exports)
-     */
-    public static function resetInitialState(): void
-    {
-        self::$initial_done = false;
-    }
-
-    public function getJavascriptFiles(string $a_mode): array
-    {
-        $js_files = array();
-
-        if ($this->getPage()->getPageConfig()->getEnableSelfAssessment()) {
-            $js_files[] = 'assets/js/pure_rendering.js';
-            $js_files[] = 'assets/js/question_handling.js';
-            $js_files[] = 'assets/js/matchinginput.js';
-            $js_files[] = 'assets/js/orderinghorizontal.js';
-            $js_files[] = 'assets/js/orderingvertical.js';
-            $js_files[] = 'assets/js/matching.js';
-
-            foreach ($this->getQuestionIds() as $qId) {
-                $qstGui = assQuestionGUI::_getQuestionGUI('', $qId);
-                $js_files = array_merge($js_files, $qstGui->getPresentationJavascripts());
-            }
-        }
-
-        if (!$this->getPage()->getPageConfig()->getEnableSelfAssessmentScorm() && $a_mode != ilPageObjectGUI::PREVIEW
-            && $a_mode != "offline") {
-            $js_files[] = "./components/ILIAS/COPage/js/ilCOPageQuestionHandler.js";
-        }
-
-        return $js_files;
+        /** @var \ILIAS\Questions\Question\QuestionImplementation $question */
+        $question = $this->pg_obj->getQuestion();
+
+        return mb_ereg_replace_callback(
+            self::ANSWER_FORM_PLACEHOLDER,
+            fn(array $matches): string => $question
+                ->getAnswerFormByIdString($matches[1])?->getTypeGenericProperties()
+                ->getAdditionalText() ?? '',
+            $output
+        );
     }
 
     public function getCssFiles(string $a_mode): array
@@ -283,123 +62,29 @@ public function getCssFiles(string $a_mode): array
         return array();
     }
 
-    public function getOnloadCode(string $a_mode): array
-    {
-        $code = array();
-
-        if ($this->getPage()->getPageConfig()->getEnableSelfAssessment()) {
-            if (!$this->getPage()->getPageConfig()->getEnableSelfAssessmentScorm() && $a_mode != ilPageObjectGUI::PREVIEW
-                && $a_mode != "offline" && $a_mode !== "edit") {
-                $ilCtrl->setParameterByClass(strtolower(get_class($this->getPage())) . "gui", "page_id", $this->getPage()->getId());
-                $url = $ilCtrl->getLinkTargetByClass(strtolower(get_class($this->getPage())) . "gui", "processAnswer", "", true, false);
-                $code[] = "ilCOPageQuestionHandler.initCallback('" . $url . "');";
-            }
-
-            if ($this->getPage()->getPageConfig()->getDisableDefaultQuestionFeedback()) {
-                $code[] = "ilias.questions.default_feedback = false;";
-            }
-
-            $code[] = self::getJSTextInitCode($this->getPage()->getPageConfig()->getLocalizationLanguage()) . ' il.COPagePres.updateQuestionOverviews();';
-        }
-
-        $q_ids = $this->getQuestionIds();
-
-        // call renderers
-        foreach ($q_ids as $q_id) {
-            $code[] = "if (typeof renderILQuestion$q_id === 'function') {renderILQuestion$q_id();}";
-        }
-
-        // init answer status
-        $get_stored_tries = $this->getPage()->getPageConfig()->getUseStoredQuestionTries();
-        if ($get_stored_tries) {
-            if (count($q_ids) > 0) {
-                foreach ($q_ids as $q_id) {
-                    $as = ilPageQuestionProcessor::getAnswerStatus($q_id, $ilUser->getId());
-                    $code[] = "ilias.questions.initAnswer(" . $q_id . ", " . (int) ($as["try"] ?? 0) . ", " . ($as["passed"] ? "true" : "null") . ");";
-                }
-            }
-        }
-        return $code;
-    }
-
-    /**
-     * Get js txt init code
-     */
-    public static function getJSTextInitCode(string $a_lang): string
-    {
-        global $DIC;
-
-        $lng = $DIC->language();
-        $ilUser = $DIC->user();
-
-        if ($a_lang == "") {
-            $a_lang = $ilUser->getLanguage();
-        }
-
-        return
-            '
-			ilias.questions.txt.wrong_answers = "' . $lng->txtlng("content", "cont_wrong_answers", $a_lang) . '";
-			ilias.questions.txt.wrong_answers_single = "' . $lng->txtlng("content", "cont_wrong_answers_single", $a_lang) . '";
-			ilias.questions.txt.tries_remaining = "' . $lng->txtlng("content", "cont_tries_remaining", $a_lang) . '";
-			ilias.questions.txt.please_try_again = "' . $lng->txtlng("content", "cont_please_try_again", $a_lang) . '";
-			ilias.questions.txt.all_answers_correct = "' . $lng->txtlng("content", "cont_all_answers_correct", $a_lang) . '";
-			ilias.questions.txt.enough_answers_correct = "' . $lng->txtlng("content", "cont_enough_answers_correct", $a_lang) . '";
-			ilias.questions.txt.nr_of_tries_exceeded = "' . $lng->txtlng("content", "cont_nr_of_tries_exceeded", $a_lang) . '";
-			ilias.questions.txt.correct_answers_separator = "' . $lng->txtlng("assessment", "or", $a_lang) . '";
-			ilias.questions.txt.correct_answers_shown = "' . $lng->txtlng("content", "cont_correct_answers_shown", $a_lang) . '";
-			ilias.questions.txt.correct_answers_also = "' . $lng->txtlng("content", "cont_correct_answers_also", $a_lang) . '";
-			ilias.questions.txt.correct_answer_also = "' . $lng->txtlng("content", "cont_correct_answer_also", $a_lang) . '";
-			ilias.questions.txt.ov_all_correct = "' . $lng->txtlng("content", "cont_ov_all_correct", $a_lang) . '";
-			ilias.questions.txt.ov_some_correct = "' . $lng->txtlng("content", "cont_ov_some_correct", $a_lang) . '";
-			ilias.questions.txt.ov_wrong_answered = "' . $lng->txtlng("content", "cont_ov_wrong_answered", $a_lang) . '";
-			ilias.questions.txt.please_select = "' . $lng->txtlng("content", "cont_please_select", $a_lang) . '";
-			ilias.questions.txt.ov_preview = "' . $lng->txtlng("content", "cont_ov_preview", $a_lang) . '";
-			ilias.questions.txt.submit_answers = "' . $lng->txtlng("content", "cont_submit_answers", $a_lang) . '";
-			ilias.questions.refresh_lang();
-			';
-    }
-
-    public function getQuestionJsOfPage(
-        bool $a_no_interaction,
-        string $a_mode
-    ): array {
-        $q_ids = $this->getQuestionIds();
-        $js = array();
-        if (count($q_ids) > 0) {
-            foreach ($q_ids as $q_id) {
-                $q_exporter = new ilQuestionExporter($a_no_interaction);
-                $image_path = "";
-                if ($a_mode == "offline") {
-                    if ($this->getPage()->getParentType() == "sahs") {
-                        $image_path = "./objects/";
-                    }
-                    if ($this->getPage()->getParentType() == "lm") {
-                        $image_path = "./assessment/0/" . $q_id . "/images/";
-                    }
-                }
-                $js[$q_id] = $q_exporter->exportQuestion($q_id, $image_path, $a_mode);
-            }
-        }
-        return $js;
+    public function create(
+        Uuid $answer_form_id
+    ): void {
+        $this->createInitialChildNode(
+            $this->hier_id,
+            '',
+            self::ANSWER_FORM_ELEMENT_TAG,
+            [self::ANSWER_FORM_ID_ATTRIBUT => $answer_form_id->toString()]
+        );
     }
 
-    protected function getQuestionIds(): array
+    private function getAnswerFormIds(): array
     {
-        $dom = $this->getPage()->getDomDoc();
-        $q_ids = [];
-        $nodes = $this->dom_util->path($dom, "//Question");
-        foreach ($nodes as $node) {
-            $qref = $node->getAttribute("QRef");
-            $inst_id = ilInternalLink::_extractInstOfTarget($qref);
-            $obj_id = ilInternalLink::_extractObjIdOfTarget($qref);
-
-            if (!($inst_id > 0)) {
-                if ($obj_id > 0) {
-                    $q_ids[] = $obj_id;
-                }
-            }
-        }
-        return $q_ids;
+        return array_reduce(
+            $this->dom_util->path(
+                $this->getPage()->getDomDoc(),
+                '//' . self::ANSWER_FORM_ELEMENT_TAG
+            ),
+            function (array $c, \DomNode $node): Uuid {
+                $node->getAttribute(self::ANSWER_FORM_ID_ATTRIBUT);
+            },
+            []
+        );
     }
 
     public static function handleCopiedContent(
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
index e97a2c11526d..a8e640d3ecbd 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
@@ -18,8 +18,7 @@
 
 declare(strict_types=1);
 
-use ILIAS\Questions\Legacy\LocalDIC;
-use ILIAS\Questions\Presentation\Edit;
+use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\UI\Renderer as UIRenderer;
 
@@ -34,18 +33,18 @@ class ilPCAnswerFormGUI extends ilPageContentGUI
     private readonly Edit $edit_view;
 
     public function __construct(
-        ilPageObject $a_pg_obj,
-        ?ilPageContent $a_content_obj,
-        string $a_hier_id,
-        string $a_pc_id = ""
+        ilPageObject $pg_obj,
+        ?ilPageContent $content_obj,
+        string $hier_id,
+        string $pc_id = ''
     ) {
         global $DIC;
         $this->tabs = $DIC['ilTabs'];
         $this->ui_renderer = $DIC['ui.renderer'];
         $this->data_factory = new DataFactory();
-        $this->edit_view = LocalDIC::dic()[Edit::class];
 
-        parent::__construct($a_pg_obj, $a_content_obj, $a_hier_id, $a_pc_id);
+        parent::__construct($pg_obj, $content_obj, $hier_id, $pc_id);
+        $this->edit_view = $this->pg_obj->getEditView();
     }
 
     public function executeCommand()
@@ -57,14 +56,16 @@ public function executeCommand()
     public function insertCmd(): void
     {
         $this->setInsertTabs();
+        $content_obj = new ilPCAnswerForm($this->pg_obj);
+        $content_obj->setHierId($this->hier_id);
         $this->tpl->setContent(
-            $this->ui_renderer->render(
-                $this->edit_view->createAnswerForm(
-                    $this->data_factory->uri(
-                        ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'insert')
-                    )
-                )
-            )
+            $this->edit_view->createAnswerForm(
+                $this->data_factory->uri(
+                    ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'insert')
+                ),
+                $this->pg_obj->getQuestion(),
+                $content_obj
+            )->render($this->ui_renderer)
         );
     }
 
@@ -72,13 +73,13 @@ public function editCmd(): void
     {
         $this->setInsertTabs();
         $this->tpl->setContent(
-            $this->ui_renderer->render(
-                $this->edit_view->editAnswerForm(
-                    $this->data_factory->uri(
-                        ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'insert')
-                    )
-                )
-            )
+            $this->edit_view->editAnswerForm(
+                $this->data_factory->uri(
+                    ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'insert')
+                ),
+                $this->pg_obj->getQuestion(),
+                $content_obj
+            )->render($this->ui_renderer)
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerForm/Definition.php b/components/ILIAS/Questions/src/AnswerForm/Definition.php
index 094c6c7931eb..2c44dd759687 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Definition.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Definition.php
@@ -29,7 +29,7 @@ interface Definition
 {
     public function getLabel(Language $lng): string;
     public function buildProperties(
-        TypeGenericData $type_generic_properties,
+        TypeGenericProperties $type_generic_properties,
         array $type_specific_data
     ): Properties;
     public function getPersistence(): Persistence;
diff --git a/components/ILIAS/Questions/src/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerForm/Factory.php
index ae0fe0e8853e..6ff6ec1b1efa 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Factory.php
@@ -22,6 +22,8 @@
 
 use ILIAS\Questions\AnswerForm\Definition;
 use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
 
 class Factory
 {
@@ -39,7 +41,7 @@ public function __construct(
     ) {
         $this->available_answer_form_types = array_reduce(
             $available_answer_form_types,
-            function (array $c, Type $v) {
+            function (array $c, Definition $v) {
                 $c[$this->getHashedClass($v::class)] = $v;
                 return $c;
             },
@@ -50,12 +52,12 @@ function (array $c, Type $v) {
     /**
      * @return array<string, \ILIAS\Questions\AnswerForm\Definition>
      */
-    public function getAnswerFormTypesArrayForSelect(): array
+    public function getAnswerFormTypesArrayForSelect(Language $lng): array
     {
         return array_reduce(
             $this->available_answer_form_types,
-            function (array $c, Definition $v): array {
-                $c[$this->getHashedClass($v::class)] = $v->getLabel($this->lng);
+            function (array $c, Definition $v) use ($lng): array {
+                $c[$this->getHashedClass($v::class)] = $v->getLabel($lng);
                 return $c;
             },
             []
diff --git a/components/ILIAS/Questions/src/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerForm/Properties.php
index 28385aee6d83..d85e3a6dc339 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Properties.php
@@ -20,7 +20,11 @@
 
 namespace ILIAS\Questions\AnswerForm;
 
+use ILIAS\Data\UUID\Uuid;
+
 interface Properties
 {
-    public function getTypeGenericData(): TypeGenericData;
+    public function getAnswerFormId(): ?Uuid;
+    public function getQuestionId(): ?Uuid;
+    public function getTypeGenericProperties(): TypeGenericProperties;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
index 2dd5fbb85e41..c59dd1a30d62 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
@@ -20,7 +20,9 @@
 
 namespace ILIAS\Questions\AnswerForm\Views;
 
-use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Questions\AnswerForm\Properties;
+use ILIAS\Questions\Presentation\Definitions\EditForm;
+use ILIAS\Questions\Presentation\Definitions\EditFormFactory;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
 
@@ -29,18 +31,24 @@ interface Edit
     public function create(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
-        string $step
-    ): array|ManipulateQuery;
+        string $step,
+        EditFormFactory $edit_form_factory,
+        Properties $properties
+    ): EditForm|Properties;
 
     public function edit(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
-        string $step
-    ): array|ManipulateQuery;
+        string $step,
+        EditFormFactory $edit_form_factory,
+        Properties $properties
+    ): EditForm|Properties;
 
     public function other(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
-        string $cmd
-    ): array|ManipulateQuery;
+        string $cmd,
+        EditFormFactory $edit_form_factory,
+        Properties $properties,
+    ): EditForm|Properties;
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
index c2bc3f878064..e6a9655e911b 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
@@ -22,7 +22,7 @@
 
 use ILIAS\Questions\AnswerForm\Definition as DefinitionInterface;
 use ILIAS\Questions\AnswerForm\Capabilities\Capability;
-use ILIAS\Questions\AnswerForm\TypeGenericData;
+use ILIAS\Questions\AnswerForm\TypeGenericProperties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Edit;
@@ -49,17 +49,12 @@ public function getLabel(Language $lng): string
     }
 
     public function buildProperties(
-        TypeGenericData $type_generic_data,
+        TypeGenericProperties $type_generic_data,
         array $type_specific_data
     ): Properties {
         return $this->properties_factory->fromData($type_generic_data, $type_specific_data);
     }
 
-    public function getProperties(): Properties
-    {
-        return $this->properties;
-    }
-
     public function getPersistence(): Persistence
     {
         return $this->persistence;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
index 6d9e68728760..1bde6f2050c1 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
@@ -25,14 +25,10 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
-use ILIAS\Data\UUID\Factory as UuidFactory;
-use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
-use ILIAS\Refinery\Factory as Refinery;
 
 class Factory
 {
     public function __construct(
-        private readonly UuidFactory $uuid_factory,
         private readonly ClozeTextFactory $cloze_text_factory,
         private readonly GapsFactory $gaps_factory
     ) {
@@ -42,11 +38,28 @@ public function fromData(
         TypeGenericProperties $type_generic_properties,
         array $type_specific_data
     ): Properties {
+        if ($type_specific_data === []) {
+            return new Properties(
+                $type_generic_properties->getAnswerFormId(),
+                $type_generic_properties->getQuestionId(),
+                $this->cloze_text_factory->buildFromTextString(
+                    $type_generic_properties->getAdditionalText()
+                ),
+                $type_generic_properties->getAdditionalTextLegacy(),
+                $this->gaps_factory->getEmptyGapsObject()
+            );
+        }
+
         return new Properties(
             $type_generic_properties->getAnswerFormId(),
             $type_generic_properties->getQuestionId(),
-            $this->cloze_text_factory->buildFromTextString($type_generic_properties->getAdditionalText()),
-            $type_generic_properties->getAdditionalTextLegacy()
+            $this->cloze_text_factory->buildFromTextString(
+                $type_generic_properties->getAdditionalText()
+            ),
+            $type_generic_properties->getAdditionalTextLegacy(),
+            $type_specific_data['gaps'],
+            $type_specific_data['identical_scoring'],
+            $type_specific_data['combinations_enabled']
         );
     }
 
@@ -64,13 +77,4 @@ public function fromForm(
             ->withScoringOfIdenticalResponses($scoring_of_identical_responses)
             ->withCombinationsEnabled($combinations_enabled);
     }
-
-    public function buildDefault(): Properties
-    {
-        return new Properties(
-            null,
-            $this->cloze_text_factory->buildFromTextString(''),
-            $this->gaps_factory->getEmptyGapsObject()
-        );
-    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
index 8b40e4edbfce..6eb5ef36c89f 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
@@ -26,6 +26,8 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
+use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -35,7 +37,7 @@
 
 class Properties implements PropertiesInterface
 {
-    private const string FORM_KEY_ID = 'id';
+    private const string FORM_KEY_ID = 'form_id';
     private const string FORM_KEY_CLOZE_TEXT = 'cloze_text';
     private const string FORM_KEY_IDENTICAL_SCORING = 'identical_scoring';
     private const string FORM_KEY_ENABLE_COMBINATIONS = 'enable_combinations';
@@ -45,17 +47,27 @@ class Properties implements PropertiesInterface
      * @param array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Gap> $gaps
      */
     public function __construct(
-        private readonly ?Uuid $answer_form_id,
-        private readonly ?Uuid $question_id,
+        private readonly Uuid $answer_form_id,
+        private readonly Uuid $question_id,
         private Text $cloze_text,
+        private readonly string $legacy_cloze_text,
         private Gaps $gaps,
         private ScoringIdentical $scoring_identical = ScoringIdentical::ScoreAll,
-        private bool $combinations_enabled = false,
-        private readonly string $legacy_cloze_text = ''
+        private bool $combinations_enabled = false
     ) {
     }
 
-    public function getTypeGenericData(): TypeGenericProperties
+    public function getAnswerFormId(): ?Uuid
+    {
+        return $this->answer_form_id;
+    }
+
+    public function getQuestionId(): Uuid
+    {
+        return $this->question_id;
+    }
+
+    public function getTypeGenericProperties(): TypeGenericProperties
     {
         return new TypeGenericProperties(
             $this->answer_form_id,
@@ -68,11 +80,6 @@ public function getTypeGenericData(): TypeGenericProperties
         );
     }
 
-    public function getAnswerFormId(): ?Uuid
-    {
-        return $this->answer_form_id;
-    }
-
     public function getClozeText(): Text
     {
         return $this->cloze_text;
@@ -162,15 +169,15 @@ public function buildBasicEditingInputs(
         );
     }
 
-    public function buildBasicEditingInputsHidden(
+    public function buildCarryInputs(
         FieldFactory $ff
     ): Group {
         return $ff->group(
             [
                 self::FORM_KEY_ID => $ff->hidden()->withValue($this->answer_form_id->toString()),
-                self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getHiddenInput($ff)
+                self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getCarryInputs($ff)
                     ->withDedicatedName(self::FORM_KEY_CLOZE_TEXT),
-                self::FORM_KEY_GAPS_TO_EDIT => $this->gaps->getHiddenInput($ff)
+                self::FORM_KEY_GAPS_TO_EDIT => $this->gaps->getCarryInputs($ff)
                     ->withDedicatedName(self::FORM_KEY_GAPS_TO_EDIT),
                 self::FORM_KEY_IDENTICAL_SCORING => $ff->hidden()
                     ->withDedicatedName(self::FORM_KEY_IDENTICAL_SCORING)
@@ -182,43 +189,54 @@ public function buildBasicEditingInputsHidden(
         );
     }
 
-    public function withValuesFromPost(
+    public function withValuesFromCarry(
         Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        string $form_input_path
+        ClozeTextFactory $cloze_text_factory,
+        GapsFactory $gaps_factory,
+        CarryWrapper $carry
     ): Properties {
-        $cloze_text = $post_wrapper->retrieve(
-            $form_input_path . '/' . self::FORM_KEY_CLOZE_TEXT,
-            $refinery->custom()->transformation(
-                fn(string $v): ClozeText => $this->cloze_text_factory->buildFromHiddenInputString($v)
-            )
+        $clone = clone $this;
+        $clone->cloze_text = $carry->retrieve(
+            self::FORM_KEY_CLOZE_TEXT,
+            $refinery->byTrying([
+                $refinery->custom()->transformation(
+                    fn(?string $v): Text => $v === null
+                        ? throw new \InvalidArgumentException()
+                        : $cloze_text_factory->buildFromHiddenInputString($v)
+                ),
+                $refinery->always($clone->cloze_text)
+            ])
         );
 
-        $scoring_of_identical_responses = $post_wrapper->retrieve(
-            $form_input_path . '/' . self::FORM_KEY_IDENTICAL_SCORING,
-            $refinery->custom()->transformation(
-                static fn(string $v): ScoringIdentical => ScoringIdentical::tryFrom($v)
-                    ?? $properties->getScoringOfIdenticalResponses()
-            )
+        $clone->scoring_identical = $carry->retrieve(
+            self::FORM_KEY_IDENTICAL_SCORING,
+            $refinery->byTrying([
+                $refinery->custom()->transformation(
+                    fn(?string $v): ScoringIdentical => $v === null
+                        ? throw new \InvalidArgumentException()
+                        : ScoringIdentical::tryFrom($v) ?? $clone->scoring_identical
+                ),
+                $refinery->always($clone->scoring_identical)
+            ])
+        );
+
+        $clone->combinations_enabled = $carry->retrieve(
+            self::FORM_KEY_ENABLE_COMBINATIONS,
+            $refinery->byTrying([
+                $refinery->kindlyTo()->bool(),
+                $refinery->always($clone->combinations_enabled)
+            ])
         );
 
-        $combinations_enabled = $post_wrapper->retrieve(
-            $form_input_path . '/' . self::FORM_KEY_ENABLE_COMBINATIONS,
-            $refinery->kindlyTo()->bool()
+        $clone->gaps = $carry->retrieve(
+            self::FORM_KEY_GAPS_TO_EDIT,
+            $clone->cloze_text->updateGapsFromMarkdown($this->getGaps())
+                ->getFromCarryTransformation(
+                    $refinery,
+                    $gaps_factory
+                )
         );
 
-        $gaps = $cloze_text->updateGapsFromMarkdown($properties->getGaps())
-            ->withValuesFromPost(
-                $refinery,
-                $post_wrapper,
-                $this->gaps_factory,
-                $form_input_path . '/' . self::FORM_KEY_GAPS_TO_EDIT
-            );
-
-        return $properties
-            ->withClozeText($cloze_text)
-            ->withScoringOfIdenticalResponses($scoring_of_identical_responses)
-            ->withCombinationsEnabled($combinations_enabled)
-            ->withGaps($gaps);
+        return $clone;
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
index 38a11609da62..1d722fbdfc64 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
@@ -21,7 +21,6 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText;
 
 use ILIAS\Data\Text\Factory as TextFactory;
-use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Refinery\Factory as Refinery;
 use Mustache\Engine;
 
@@ -30,7 +29,6 @@ class Factory
     public function __construct(
         private readonly Refinery $refinery,
         private readonly Engine $mustache_engine,
-        private readonly UuidFactory $uuid_factory,
         private readonly TextFactory $text_factory
     ) {
     }
@@ -52,6 +50,6 @@ public function buildFromHiddenInputString(string $text): Text
 
     private function unmaskTextFromOutputInHiddenInput(string $text): string
     {
-        return str_replace(['&#123;&#123;', '&#125;&#125;'], ['{{', '}}'], $text);
+        return str_replace(['\{\{', '\}\}'], ['{{', '}}'], $text);
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 5903fa486fc0..cb492e25e1b4 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -64,7 +64,7 @@ public function getInput(
         ->withValue($this->cloze_text->getRawRepresentation());
     }
 
-    public function getHiddenInput(FieldFactory $ff): HiddenInput
+    public function getCarryInputs(FieldFactory $ff): HiddenInput
     {
         return $ff->hidden()->withValue($this->getTextForOutputInHiddenInput());
     }
@@ -152,6 +152,10 @@ private function hasAtLeastOneGap(): bool
 
     private function getTextForOutputInHiddenInput(): string
     {
-        return str_replace(['{{', '}}'], ['&#123;&#123;', '&#125;&#125;'], $this->cloze_text->getRawRepresentation());
+        return str_replace(
+            ['{{', '}}'],
+            ['\{\{', '\}\}'],
+            $this->cloze_text->getRawRepresentation()
+        );
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index 06b38b1f56dd..996257b5e236 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Factory as DataFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Factory as PropertiesFactory;
 use ILIAS\Language\Language;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 
@@ -30,7 +30,7 @@ class Factory
 
     public function __construct(
         private readonly UuidFactory $uuid_factory,
-        private readonly DataFactory $data_factory,
+        private readonly PropertiesFactory $data_factory,
         array $available_gap_types
     ) {
         foreach ($available_gap_types as $type) {
@@ -62,7 +62,7 @@ public function getNewGap(
         return new Gap(
             $answer_input_id,
             $position,
-            $this->data_factory->getDefaultDataObject($answer_input_id)
+            $this->data_factory->getDefaultProperties($answer_input_id)
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index dc0be37e81e3..83fca45023b8 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -20,11 +20,12 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
+use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
-use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
@@ -39,7 +40,7 @@ class Gap
     public function __construct(
         private Uuid $answer_input_id,
         private int $position,
-        private Data $data,
+        private Properties $properties,
         private ?Type $type = null
     ) {
     }
@@ -75,15 +76,15 @@ public function withType(Type $type): self
         return $clone;
     }
 
-    public function getData(): Data
+    public function getProperties(): Properties
     {
-        return $this->data;
+        return $this->properties;
     }
 
-    public function withData(Data $data): self
+    public function withProperties(Properties $properties): self
     {
         $clone = clone $this;
-        $clone->data = $data;
+        $clone->properties = $properties;
         return $clone;
     }
 
@@ -117,7 +118,7 @@ public function getEditAnswerOptionsSection(
         FieldFactory $ff
     ): Section {
         $section = $ff->section(
-            $this->type->getEditAnswerOptionsInputs($this->data),
+            $this->type->getEditAnswerOptionsInputs($this->properties),
             "{$this->buildShortenedGapName()} ({$lng->txt("{$this->type->getIdentifier()}_gap")})"
         );
 
@@ -137,7 +138,7 @@ public function getEditPointsSection(
         FieldFactory $ff
     ): Section {
         $section = $ff->section(
-            $this->type->getEditPointsInputs($this->data->getAnswerOptions()),
+            $this->type->getEditPointsInputs($this->properties->getAnswerOptions()),
             "{$this->buildShortenedGapName()} ({$lng->txt("{$this->type->getIdentifier()}_gap")})"
         );
 
@@ -152,40 +153,44 @@ public function getEditPointsSection(
         );
     }
 
-    public function getHiddenInput(
+    public function getCarryInputs(
         FieldFactory $ff
     ): Group {
         return $ff->group([
             self::FORM_KEY_TYPE => $ff->hidden()->withValue($this->type?->getIdentifier() ?? '')
                 ->withDedicatedName(self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId()),
-            self::FORM_KEY_DATA => $this->data->getHiddenInput($ff)
+            self::FORM_KEY_DATA => $this->properties->getCarryInputs($ff)
             ->withDedicatedName(self::FORM_KEY_DATA . $this->getShortenedAnswerInputId())
         ]);
     }
 
-    public function withValuesFromPost(
+    public function getFromCarryTransformation(
         Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        Factory $gaps_factory,
-        string $form_input_path
-    ): self {
-        $available_gap_types = $gaps_factory->getAvailableGapTypes();
-        return $post_wrapper->retrieve(
-            $form_input_path . '/' . self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId(),
-            $refinery->byTrying([
-                $refinery->custom()->transformation(
-                    fn(?string $v): self => $available_gap_types[$v]
-                        ? $this->withType($available_gap_types[$v])
-                        : $this
-                ),
-                $refinery->always($this)
-            ])
-        )->withData(
-            $this->data->withValuesFromPost(
-                $refinery,
-                $post_wrapper,
-                $form_input_path . '/' . self::FORM_KEY_DATA . $this->getShortenedAnswerInputId()
-            )
+        Factory $gaps_factory
+    ): Transformation {
+        return $refinery->custom()->transformation(
+            function (?CarryWrapper $v) use ($refinery, $gaps_factory): self {
+                if ($v === null) {
+                    return $this;
+                }
+                $available_gap_types = $gaps_factory->getAvailableGapTypes();
+                return $v->retrieve(
+                    self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId(),
+                    $refinery->byTrying([
+                        $refinery->custom()->transformation(
+                            fn(?string $v): self => $available_gap_types[$v]
+                                ? $this->withType($available_gap_types[$v])
+                                : $this
+                        ),
+                        $refinery->always($this)
+                    ])
+                )->withProperties(
+                    $v->retrieve(
+                        self::FORM_KEY_DATA . $this->getShortenedAnswerInputId(),
+                        $this->properties->getFromCarryTransformation($refinery)
+                    )
+                );
+            }
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 1e93f6b0b341..caa32f048226 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -20,10 +20,11 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
+use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
-use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
@@ -197,13 +198,13 @@ function (array $c, Gap $v) use ($lng, $ff): array {
         );
     }
 
-    public function getHiddenInput(FieldFactory $ff): Group
+    public function getCarryInputs(FieldFactory $ff): Group
     {
         return $ff->group(
             array_reduce(
                 $this->gaps,
                 function (array $c, Gap $v) use ($ff): array {
-                    $c[$v->getAnswerInputId()->toString()] = $v->getHiddenInput($ff)
+                    $c[$v->getAnswerInputId()->toString()] = $v->getCarryInputs($ff)
                         ->withDedicatedName($v->getAnswerInputId()->toString());
                     return $c;
                 },
@@ -212,23 +213,29 @@ function (array $c, Gap $v) use ($ff): array {
         );
     }
 
-    public function withValuesFromPost(
+    public function getFromCarryTransformation(
         Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        Factory $gaps_factory,
-        string $form_input_path
-    ): self {
-        $clone = clone $this;
-        $clone->gaps = array_map(
-            fn(Gap $v): Gap => $v->withValuesFromPost(
-                $refinery,
-                $post_wrapper,
-                $gaps_factory,
-                $form_input_path . '/' . $v->getAnswerInputId()->toString()
-            ),
-            $this->gaps
+        Factory $gaps_factory
+    ): Transformation {
+        return $refinery->custom()->transformation(
+            function (?CarryWrapper $v) use ($refinery, $gaps_factory): self {
+                if ($v === null) {
+                    return $this;
+                }
+                $clone = clone $this;
+                $clone->gaps = array_map(
+                    fn(Gap $gap): Gap => $v->retrieve(
+                        $gap->getAnswerInputId()->toString(),
+                        $gap->getFromCarryTransformation(
+                            $refinery,
+                            $gaps_factory
+                        )
+                    ),
+                    $this->gaps
+                );
+                return $clone;
+            }
         );
-        return $clone;
     }
 
     private function extractIdFromTagName(string $tag_name): string
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
index 9295f0129a63..7d23ee8c2c66 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
@@ -20,9 +20,9 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOptions;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOption;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
 use ILIAS\FileUpload\MimeType;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -48,14 +48,14 @@ public function getIdentifier(): string
         return 'long_menu';
     }
 
-    public function getEditAnswerOptionsInputs(Data $data): array
+    public function getEditAnswerOptionsInputs(Properties $properties): array
     {
         $ff = $this->ui_factory->input()->field();
         return [
             'answer_options' => $ff->tag(
                 $this->lng->txt('answer_options'),
                 []
-            )->withValue($data->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
+            )->withValue($properties->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
             'upload_answer_options' => $ff->file(
                 new UploadAnswerOptionsGUI(),
                 $this->lng->txt('upload_answer_options'),
@@ -64,16 +64,16 @@ public function getEditAnswerOptionsInputs(Data $data): array
             'min_autocomplete' => $ff->numeric(
                 $this->lng->txt('min_autocomplete')
             )->withRequired(true)
-            ->withValue($data->getMinAutocomplete() ?? self::DEFAULT_MIN_AUTOCOMPLETE),
+            ->withValue($properties->getMinAutocomplete() ?? self::DEFAULT_MIN_AUTOCOMPLETE),
             'options_awarding_points' => $ff->tag(
                 $this->lng->txt('answer_options'),
-                $data->getAnswerOptions()->getTagsArrayFromAnswerOptions()
+                $properties->getAnswerOptions()->getTagsArrayFromAnswerOptions()
             )
             ->withRequired(true)
             ->withValue(
                 array_map(
                     fn(AnswerOption $v): string => $v->getTextValue(),
-                    $data->getAnswerOptions()->getAnswerOptionsAwardingPoints()
+                    $properties->getAnswerOptions()->getAnswerOptionsAwardingPoints()
                 )
             )
         ];
@@ -124,11 +124,11 @@ function (array $vs): bool {
     public function getBuildGapTransformation(Gap $gap): Transformation
     {
         return $this->refinery->custom()->transformation(
-            fn(array $vs): Gap => $gap->withData(
-                $gap->getData()
+            fn(array $vs): Gap => $gap->withProperties(
+                $gap->getProperties()
                     ->withMinAutocomplete($vs['min_autocomplete'])
                     ->withAnswerOptions(
-                        $gap->getData()->getAnswerOptions()->withAnswerOptionsFromTags(
+                        $gap->getProperties()->getAnswerOptions()->withAnswerOptionsFromTags(
                             array_merge(
                                 $vs['answer_options'],
                                 $this->retrieveAnswerOptionsArrayFromUpload($vs['upload_answer_options'])
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
index 52302d45edfd..d58ba257a21b 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
@@ -20,9 +20,9 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOptions;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOption;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
@@ -47,22 +47,22 @@ public function getIdentifier(): string
         return 'numeric';
     }
 
-    public function getEditAnswerOptionsInputs(Data $data): array
+    public function getEditAnswerOptionsInputs(Properties $properties): array
     {
-        $answer_option = $data->getAnswerOptions()->getAnswerOptionForPositionOrNew(0);
+        $answer_option = $properties->getAnswerOptions()->getAnswerOptionForPositionOrNew(0);
         $ff = $this->ui_factory->input()->field();
         return [
             'lower_limit' => $ff->numeric($this->lng->txt('lower_limit'))
-                ->withStepSize($data->getStepSize() ?? self::DEFAULT_STEP_SIZE)
+                ->withStepSize($properties->getStepSize() ?? self::DEFAULT_STEP_SIZE)
                 ->withRequired(true)
                 ->withValue($answer_option->getLowerLimit()),
             'upper_limit' => $ff->numeric($this->lng->txt('upper_limit'))
-                ->withStepSize($data->getStepSize() ?? self::DEFAULT_STEP_SIZE)
+                ->withStepSize($properties->getStepSize() ?? self::DEFAULT_STEP_SIZE)
                 ->withValue($answer_option->getUpperLimit()),
             'step_size' => $ff->numeric($this->lng->txt('step_size'))
                 ->withStepSize(0.000001)
                 ->withRequired(true)
-                ->withValue($data->getStepSize() ?? self::DEFAULT_STEP_SIZE)
+                ->withValue($properties->getStepSize() ?? self::DEFAULT_STEP_SIZE)
         ];
     }
 
@@ -108,12 +108,12 @@ public function getEditPointsSectionConstraint(): ?Constraint
 
     public function getBuildGapTransformation(Gap $gap): Transformation
     {
-        $data = $gap->getData();
+        $properties = $gap->getProperties();
         return $this->refinery->custom()->transformation(
-            fn(array $vs): Gap => $gap->withData(
-                $data->withAnswerOptions(
-                    $data->getAnswerOptions()->withAnswerOptions([
-                        $data->getAnswerOptions()->getAnswerOptionForPositionOrNew(0)
+            fn(array $vs): Gap => $gap->withProperties(
+                $properties->withAnswerOptions(
+                    $properties->getAnswerOptions()->withAnswerOptions([
+                        $properties->getAnswerOptions()->getAnswerOptionForPositionOrNew(0)
                             ->withLowerLimit($vs['lower_limit'])
                             ->withUpperLimit($vs['upper_limit'])
                         ])
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOption.php
index 655760c8418c..69140125a5f5 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOption.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOption.php
@@ -18,19 +18,19 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
 
 use ILIAS\Questions\Question\Persistence\ManipulateQuery;
 use ILIAS\Data\UUID\Uuid;
 
 class AnswerOption
 {
-    public const string KEY_ID = 'id';
-    public const string KEY_POSITION = 'position';
-    public const string KEY_TEXT_VALUE = 'text_value';
-    public const string KEY_LOWER_LIMIT = 'lower_limit';
-    public const string KEY_UPPER_LIMIT = 'upper_limit';
-    public const string KEY_AVAILABLE_POINTS = 'points';
+    public const string FORM_KEY_ID = 'id';
+    public const string FORM_KEY_POSITION = 'position';
+    public const string FORM_KEY_TEXT_VALUE = 'text_value';
+    public const string FORM_KEY_LOWER_LIMIT = 'lower_limit';
+    public const string FORM_KEY_UPPER_LIMIT = 'upper_limit';
+    public const string FORM_KEY_AVAILABLE_POINTS = 'points';
 
     public function __construct(
         private readonly Uuid $answer_option_id,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOptions.php
index 73622d6f9bd4..4bf7df0f3f20 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOptions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOptions.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
 
 use ILIAS\Questions\Question\Persistence\ManipulateQuery;
 use ILIAS\Refinery\Factory as Refinery;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Factory.php
index d3a7b4ead468..09e2cbd9a0de 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Factory.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
 
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
@@ -32,10 +32,10 @@ public function __construct(
     ) {
     }
 
-    public function getDefaultDataObject(
+    public function getDefaultProperties(
         Uuid $answer_input_id
-    ): Data {
-        return new Data(
+    ): Properties {
+        return new Properties(
             $answer_input_id,
             new AnswerOptions(
                 $this,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php
index b4fe36d1a9d6..af03b913a120 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php
@@ -18,16 +18,17 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
 
 use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
-use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
+use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Implementation\Component\Input\Field\Group;
 
-class Data
+class Properties
 {
     private const string FORM_KEY_MAX_CHARS = 'max_chars';
     private const string FORM_KEY_STEP_SIZE = 'step_size';
@@ -37,7 +38,7 @@ class Data
     private const string FORM_KEY_ANSWER_OPTIONS = 'answer_options';
 
     /**
-     * @param array<ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOption> $answer_options
+     * @param array<ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties    \AnswerOption> $answer_options
      */
     public function __construct(
         private readonly Uuid $answer_input_id,
@@ -127,7 +128,7 @@ public function withAnswerOptions(AnswerOptions $answer_options): self
         return $clone;
     }
 
-    public function getHiddenInput(FieldFactory $ff): Group
+    public function getCarryInputs(FieldFactory $ff): Group
     {
         $inputs = [];
         if ($this->max_chars !== null) {
@@ -161,28 +162,29 @@ public function getHiddenInput(FieldFactory $ff): Group
         return $ff->group($inputs);
     }
 
-    public function withValuesFromPost(
-        Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        string $form_input_path
-    ): Data {
-        $clone = clone $this;
-        $clone->max_chars = $this->retrieveMaxCharsFromPost($refinery, $post_wrapper, $form_input_path);
-        $clone->step_size = $this->retrieveStepSizeFromPost($refinery, $post_wrapper, $form_input_path);
-        $clone->text_matching_method = $this->retrieveTextMatchingMethodFromPost($refinery, $post_wrapper, $form_input_path);
-        $clone->min_autocomplete = $this->retrieveMinAutocompleteFromPost($refinery, $post_wrapper, $form_input_path);
-        $clone->shuffle_answer_options = $this->retrieveShuffleAnswerOptionsFromPost($refinery, $post_wrapper, $form_input_path);
-        $clone->answer_options = $this->retrieveAnswerOptionsFromPost($refinery, $post_wrapper, $form_input_path);
-        return $clone;
+    public function getFromCarryTransformation(
+        Refinery $refinery
+    ): Transformation {
+        return $refinery->custom()->transformation(
+            function (CarryWrapper $v) use ($refinery): self {
+                $clone = clone $this;
+                $clone->max_chars = $this->retrieveMaxCharsFromCarry($refinery, $v);
+                $clone->step_size = $this->retrieveStepSizeFromCarry($refinery, $v);
+                $clone->text_matching_method = $this->retrieveTextMatchingMethodFromCarry($refinery, $v);
+                $clone->min_autocomplete = $this->retrieveMinAutocompleteFromCarry($refinery, $v);
+                $clone->shuffle_answer_options = $this->retrieveShuffleAnswerOptionsFromCarry($refinery, $v);
+                $clone->answer_options = $this->retrieveAnswerOptionsFromCarry($refinery, $v);
+                return $clone;
+            }
+        );
     }
 
-    private function retrieveMaxCharsFromPost(
+    private function retrieveMaxCharsFromCarry(
         Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        string $form_input_path
+        CarryWrapper $carry
     ): ?int {
-        return $post_wrapper->retrieve(
-            $form_input_path . '/' . self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId(),
+        return $carry->retrieve(
+            self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId(),
             $refinery->byTrying([
                 $refinery->kindlyTo()->int(),
                 $refinery->always($this->getMaxChars())
@@ -190,13 +192,12 @@ private function retrieveMaxCharsFromPost(
         );
     }
 
-    private function retrieveStepSizeFromPost(
+    private function retrieveStepSizeFromCarry(
         Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        string $form_input_path
+        CarryWrapper $carry
     ): ?float {
-        return $post_wrapper->retrieve(
-            $form_input_path . '/' . self::FORM_KEY_STEP_SIZE . $this->getShortenedAnswerInputId(),
+        return $carry->retrieve(
+            self::FORM_KEY_STEP_SIZE . $this->getShortenedAnswerInputId(),
             $refinery->byTrying([
                 $refinery->kindlyTo()->float(),
                 $refinery->always($this->getStepSize())
@@ -204,13 +205,12 @@ private function retrieveStepSizeFromPost(
         );
     }
 
-    private function retrieveTextMatchingMethodFromPost(
+    private function retrieveTextMatchingMethodFromCarry(
         Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        string $form_input_path
+        CarryWrapper $carry
     ): ?TextMatchingOptions {
-        return $post_wrapper->retrieve(
-            $form_input_path . '/' . self::FORM_KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId(),
+        return $carry->retrieve(
+            self::FORM_KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId(),
             $refinery->custom()->transformation(
                 fn(?string $v): ?TextMatchingOptions => $v !== null
                     ? TextMatchingOptions::tryFrom($v)
@@ -219,13 +219,12 @@ private function retrieveTextMatchingMethodFromPost(
         );
     }
 
-    private function retrieveMinAutocompleteFromPost(
+    private function retrieveMinAutocompleteFromCarry(
         Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        string $form_input_path
+        CarryWrapper $carry
     ): ?int {
-        return $post_wrapper->retrieve(
-            $form_input_path . '/' . self::FORM_KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId(),
+        return $carry->retrieve(
+            self::FORM_KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId(),
             $refinery->byTrying([
                 $refinery->kindlyTo()->int(),
                 $refinery->always($this->getMinAutocomplete())
@@ -233,13 +232,12 @@ private function retrieveMinAutocompleteFromPost(
         );
     }
 
-    private function retrieveShuffleAnswerOptionsFromPost(
+    private function retrieveShuffleAnswerOptionsFromCarry(
         Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        string $form_input_path
+        CarryWrapper $carry
     ): ?bool {
-        return $post_wrapper->retrieve(
-            $form_input_path . '/' . self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
+        return $carry->retrieve(
+            self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
             $refinery->byTrying([
                 $refinery->kindlyTo()->bool(),
                 $refinery->always($this->getShuffleAnswerOptions())
@@ -247,13 +245,12 @@ private function retrieveShuffleAnswerOptionsFromPost(
         );
     }
 
-    private function retrieveAnswerOptionsFromPost(
+    private function retrieveAnswerOptionsFromCarry(
         Refinery $refinery,
-        ArrayBasedRequestWrapper $post_wrapper,
-        string $form_input_path
+        CarryWrapper $carry
     ): AnswerOptions {
-        return $post_wrapper->retrieve(
-            $form_input_path . '/' . self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
+        return $carry->retrieve(
+            self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
             $refinery->custom()->transformation(
                 fn(?string $v): AnswerOptions => $this->answer_options->withValuesFromHiddenInputValue($v)
             )
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
index 220902079652..54847e55d77e 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
@@ -20,9 +20,9 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOptions;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOption;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
@@ -46,7 +46,7 @@ public function getIdentifier(): string
         return 'select';
     }
 
-    public function getEditAnswerOptionsInputs(Data $data): array
+    public function getEditAnswerOptionsInputs(Properties $properties): array
     {
         $ff = $this->ui_factory->input()->field();
         return [
@@ -54,10 +54,10 @@ public function getEditAnswerOptionsInputs(Data $data): array
                 $this->lng->txt('answer_options'),
                 []
             )->withRequired(true)
-            ->withValue($data->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
+            ->withValue($properties->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
             'shuffle_answer_options' => $ff->checkbox(
                 $this->lng->txt('shuffle_answers')
-            )->withValue($data?->getShuffleAnswerOptions() ?? self::DEFAULT_SHUFFLE_ANSWER_OPTIONS)
+            )->withValue($properties?->getShuffleAnswerOptions() ?? self::DEFAULT_SHUFFLE_ANSWER_OPTIONS)
         ];
     }
 
@@ -91,11 +91,11 @@ function (array $vs): bool {
 
     public function getBuildGapTransformation(Gap $gap): Transformation
     {
-        $data = $gap->getData();
+        $properties = $gap->getProperties();
         return $this->refinery->custom()->transformation(
-            fn(array $vs): Gap => $gap->withData(
-                $data->withAnswerOptions(
-                    $data->getAnswerOptions()->withAnswerOptionsFromTags($vs['answer_options'])
+            fn(array $vs): Gap => $gap->withProperties(
+                $properties->withAnswerOptions(
+                    $properties->getAnswerOptions()->withAnswerOptionsFromTags($vs['answer_options'])
                 )
             )
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
index 1e0bcb93c136..4f99af8a7b10 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
@@ -20,9 +20,9 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOptions;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOption;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
 use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -47,7 +47,7 @@ public function getIdentifier(): string
         return 'text';
     }
 
-    public function getEditAnswerOptionsInputs(Data $data): array
+    public function getEditAnswerOptionsInputs(Properties $properties): array
     {
         $ff = $this->ui_factory->input()->field();
         return [
@@ -55,15 +55,15 @@ public function getEditAnswerOptionsInputs(Data $data): array
                 $this->lng->txt('answer_options'),
                 []
             )->withRequired(true)
-            ->withValue($data->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
+            ->withValue($properties->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
             'matching_method' => $ff->select(
                 $this->lng->txt('matching_method'),
                 TextMatchingOptions::buildOptionsList($this->lng)
             )->withRequired(true)
-            ->withValue($data->getTextMatchingMethod()?->value ?? self::DEFAULT_TECT_MATCHING_METHOD->value),
+            ->withValue($properties->getTextMatchingMethod()?->value ?? self::DEFAULT_TECT_MATCHING_METHOD->value),
             'max_chars' => $ff->numeric(
                 $this->lng->txt('max_chars'),
-            )->withValue($data->getMaxChars())
+            )->withValue($properties->getMaxChars())
         ];
     }
 
@@ -103,13 +103,13 @@ function (array $vs): bool {
 
     public function getBuildGapTransformation(Gap $gap): Transformation
     {
-        $data = $gap->getData();
+        $properties = $gap->getProperties();
         return $this->refinery->custom()->transformation(
-            fn(array $vs): Gap => $gap->withData(
-                $data->withMaxChars($vs['max_chars'])
+            fn(array $vs): Gap => $gap->withProperties(
+                $properties->withMaxChars($vs['max_chars'])
                     ->withTextMatchingMethod(TextMatchingOptions::tryFrom($vs['matching_method']) ?? self::DEFAULT_TECT_MATCHING_METHOD)
                     ->withAnswerOptions(
-                        $data->getAnswerOptions()->withAnswerOptionsFromTags($vs['answer_options'])
+                        $properties->getAnswerOptions()->withAnswerOptionsFromTags($vs['answer_options'])
                     )
             )
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
index 181649f153ca..6bcb0a700e6a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
@@ -20,8 +20,8 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\AnswerOptions;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Data\Data;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
 use ILIAS\Refinery\Transformation;
@@ -34,7 +34,7 @@ public function __construct(
     }
 
     abstract public function getIdentifier(): string;
-    abstract public function getEditAnswerOptionsInputs(Data $data): array;
+    abstract public function getEditAnswerOptionsInputs(Properties $data): array;
     abstract public function getEditAnswerOptionsSectionConstraint(): ?Constraint;
     abstract public function getEditPointsInputs(AnswerOptions $answer_options): array;
     abstract public function getEditPointsSectionConstraint(): ?Constraint;
@@ -43,11 +43,11 @@ abstract public function getAnswerInput(): \ilFormPropertyGUI;
 
     public function getAddPointsTransformation(Gap $gap): Transformation
     {
-        $data = $gap->getData();
+        $properties = $gap->getProperties();
         return $this->refinery->custom()->transformation(
-            fn(array $vs): Gap => $gap->withData(
-                $data->withAnswerOptions(
-                    $data->getAnswerOptions()
+            fn(array $vs): Gap => $gap->withProperties(
+                $properties->withAnswerOptions(
+                    $properties->getAnswerOptions()
                         ->withAnswerOptionsWithAddedPointsFromForm($this->refinery, $vs)
                 )
             )
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index cefb14c14553..029b91f95416 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -20,18 +20,20 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
 
+use ILIAS\Questions\AnswerForm\Properties as PropertiesInterface;
 use ILIAS\Questions\AnswerForm\Views\Edit as EditViewInterface;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
-use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Questions\Presentation\Definitions\EditForm;
+use ILIAS\Questions\Presentation\Definitions\EditFormFactory;
 use ILIAS\HTTP\Services as HTTPServices;
 use ILIAS\Language\Language;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
 use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
+use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\Refinery\Factory as Refinery;
 
 class Edit implements EditViewInterface
@@ -41,9 +43,6 @@ class Edit implements EditViewInterface
     private const string STEP_SET_POINTS = 'sap';
     private const string STEP_SAVE = 's';
 
-    private const string MAIN_SECTION_NAME = 'form';
-    private const string PROPERTIES_SECTION_NAME = 'properties';
-
     public function __construct(
         private readonly Language $lng,
         private readonly UIFactory $ui_factory,
@@ -59,222 +58,273 @@ public function create(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
         string $step,
-    ): array|ManipulateQuery {
+        EditFormFactory $edit_form_factory,
+        PropertiesInterface $properties
+    ): EditForm|Properties {
         return match($step) {
-            self::STEP_SET_GAP_TYPES => $this->processBasicEditingForm($url_builder, $step_token),
-            self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm($url_builder, $step_token),
-            self::STEP_SET_POINTS => $this->processAnswerOptionsForm($url_builder, $step_token),
-            self::STEP_SAVE => $this->processAssignPointsForm($url_builder, $step_token),
-            default => [$this->buildBasicEditingForm($url_builder, $step_token)]
+            self::STEP_SET_GAP_TYPES => $this->processBasicEditingForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory,
+                $properties->withValuesFromCarry(
+                    $this->refinery,
+                    $this->cloze_text_factory,
+                    $this->gap_factory,
+                    $edit_form_factory->getCarrySectionData(
+                        $this->http->wrapper()->post(),
+                        $this->refinery
+                    )
+                )
+            ),
+            self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory,
+                $properties->withValuesFromCarry(
+                    $this->refinery,
+                    $this->cloze_text_factory,
+                    $this->gap_factory,
+                    $edit_form_factory->getCarrySectionData(
+                        $this->http->wrapper()->post(),
+                        $this->refinery
+                    )
+                )
+            ),
+            self::STEP_SET_POINTS => $this->processAnswerOptionsForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory,
+                $properties->withValuesFromCarry(
+                    $this->refinery,
+                    $this->cloze_text_factory,
+                    $this->gap_factory,
+                    $edit_form_factory->getCarrySectionData(
+                        $this->http->wrapper()->post(),
+                        $this->refinery
+                    )
+                )
+            ),
+            self::STEP_SAVE => $this->processAssignPointsForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory,
+                $properties->withValuesFromCarry(
+                    $this->refinery,
+                    $this->cloze_text_factory,
+                    $this->gap_factory,
+                    $edit_form_factory->getCarrySectionData(
+                        $this->http->wrapper()->post(),
+                        $this->refinery
+                    )
+                )
+            ),
+            default => $this->buildBasicEditingForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory,
+                $properties
+            )
         };
     }
 
     public function edit(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
-        string $step
-    ): array|ManipulateQuery {
+        string $step,
+        EditFormFactory $edit_form_factory,
+        PropertiesInterface $properties,
+    ): EditForm|Properties {
 
     }
 
     public function other(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
-        string $step
-    ): array|ManipulateQuery {
+        string $step,
+        EditFormFactory $edit_form_factory,
+        PropertiesInterface $properties
+    ): EditForm|Properties {
 
     }
 
     private function buildBasicEditingForm(
         URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): StandardForm {
-        return $this->ui_factory->input()->container()->form()->standard(
-            $url_builder->withParameter($step_token, self::STEP_SET_GAP_TYPES)->buildURI()->__toString(),
-            [
-                self::MAIN_SECTION_NAME => $this->type->getProperties()->buildBasicEditingInputs(
-                    $this->lng,
-                    $this->ui_factory->input()->field(),
-                    $this->refinery,
-                    $this->properties_factory,
-                    $this->cloze_text_factory
-                )
-            ]
-        )->withSubmitLabel($this->lng->txt('next'));
+        URLBuilderToken $step_token,
+        EditFormFactory $edit_form_factory,
+        Properties $properties
+    ): EditForm {
+        return $edit_form_factory->getEditForm(
+            $url_builder->withParameter($step_token, self::STEP_SET_GAP_TYPES)->buildURI(),
+            $properties->buildBasicEditingInputs(
+                $this->lng,
+                $this->ui_factory->input()->field(),
+                $this->refinery,
+                $this->properties_factory,
+                $this->cloze_text_factory
+            ),
+            false
+        );
     }
 
     private function processBasicEditingForm(
         URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): array {
-        $form = $this->buildBasicEditingForm($url_builder, $step_token)->withRequest($this->http->request());
-        $data = $form->getData();
-        if ($data === null) {
-            return [$form];
-        }
+        URLBuilderToken $step_token,
+        EditFormFactory $edit_form_factory,
+        Properties $properties
+    ): EditForm {
+        $form = $this->buildBasicEditingForm(
+            $url_builder,
+            $step_token,
+            $edit_form_factory,
+            $properties
+        )->withRequest($this->http->request());
 
-        return $this->buildOutputWithPanel(
-            $this->buildGapTypesForm(
+        $data = $form->getData();
+        return $data === null
+            ? $form
+            : $this->buildGapTypesForm(
                 $url_builder,
                 $step_token,
-                $data[self::MAIN_SECTION_NAME]
-            ),
-            $data[self::MAIN_SECTION_NAME]
-        );
+                $edit_form_factory,
+                $data
+            );
     }
 
     private function buildGapTypesForm(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
+        EditFormFactory $edit_form_factory,
         Properties $properties
-    ): StandardForm {
+    ): EditForm {
         $ff = $this->ui_factory->input()->field();
-        return $this->ui_factory->input()->container()->form()->standard(
-            $url_builder->withParameter($step_token, self::STEP_SET_ANSWER_OPTIONS)->buildURI()->__toString(),
-            [
-                self::MAIN_SECTION_NAME => $properties->getGaps()->buildGapsTypeInputs(
-                    $this->lng,
-                    $ff,
-                    $this->refinery,
-                    $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng)
-                ),
-                self::PROPERTIES_SECTION_NAME => $properties
-                    ->withClozeText($properties->getClozeText())
-                    ->buildBasicEditingInputsHidden($ff)
-                    ->withDedicatedName(self::PROPERTIES_SECTION_NAME)
-
-            ]
-        )->withSubmitLabel($this->lng->txt('next'));
+        return $edit_form_factory->getEditForm(
+            $url_builder->withParameter($step_token, self::STEP_SET_ANSWER_OPTIONS)->buildURI(),
+            $properties->getGaps()->buildGapsTypeInputs(
+                $this->lng,
+                $ff,
+                $this->refinery,
+                $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng)
+            ),
+            false,
+            $properties->withClozeText($properties->getClozeText())
+                ->buildCarryInputs($ff)
+        )->withContentBeforeForm(
+            $this->buildClozeTextPanel($properties)
+        );
     }
 
     private function processGapTypesForm(
         URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): array {
-        $properties = $this->retrievePropertiesFromPost();
+        URLBuilderToken $step_token,
+        EditFormFactory $edit_form_factory,
+        Properties $properties,
+    ): EditForm {
         $form = $this->buildGapTypesForm(
             $url_builder,
             $step_token,
+            $edit_form_factory,
             $properties
         )->withRequest($this->http->request());
 
         $data = $form->getData();
-        return $this->buildOutputWithPanel(
-            $data === null
-                ? $form
-                : $this->buildAnswerOptionsForm(
-                    $url_builder,
-                    $step_token,
-                    $properties->withGaps($data[self::MAIN_SECTION_NAME])
-                ),
-            $properties
-        );
+        return $data === null
+            ? $form
+            : $this->buildAnswerOptionsForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory,
+                $properties->withGaps($data)
+            );
     }
 
     private function buildAnswerOptionsForm(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
+        EditFormFactory $edit_form_factory,
         Properties $properties
-    ): StandardForm {
+    ): EditForm {
         $ff = $this->ui_factory->input()->field();
-        return $this->ui_factory->input()->container()->form()->standard(
-            $url_builder->withParameter($step_token, self::STEP_SET_POINTS)->buildURI()->__toString(),
-            [
-                self::MAIN_SECTION_NAME => $properties->getGaps()->buildAnswerOptionsInputs($this->lng, $ff, $this->refinery),
-                self::PROPERTIES_SECTION_NAME => $properties->buildBasicEditingInputsHidden($ff)
-                    ->withDedicatedName(self::PROPERTIES_SECTION_NAME)
-            ]
-        )->withSubmitLabel($this->lng->txt('next'));
+        return $edit_form_factory->getEditForm(
+            $url_builder->withParameter($step_token, self::STEP_SET_POINTS)->buildURI(),
+            $properties->getGaps()->buildAnswerOptionsInputs($this->lng, $ff, $this->refinery),
+            false,
+            $properties->buildCarryInputs($ff)
+        )->withContentBeforeForm(
+            $this->buildClozeTextPanel($properties)
+        );
     }
 
     private function processAnswerOptionsForm(
         URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): array {
-        $properties = $this->retrievePropertiesFromPost();
+        URLBuilderToken $step_token,
+        EditFormFactory $edit_form_factory,
+        Properties $properties
+    ): EditForm {
         $form = $this->buildAnswerOptionsForm(
             $url_builder,
             $step_token,
+            $edit_form_factory,
             $properties
         )->withRequest($this->http->request());
 
         $data = $form->getData();
-        return $this->buildOutputWithPanel(
-            $data === null
-                ? $form
-                : $this->buildAssignPointsForm(
-                    $url_builder,
-                    $step_token,
-                    $properties->withGaps($data[self::MAIN_SECTION_NAME])
-                ),
-            $properties
-        );
+        return $data === null
+            ? $form
+            : $this->buildAssignPointsForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory,
+                $properties->withGaps($data)
+            );
     }
 
     private function buildAssignPointsForm(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
+        EditFormFactory $edit_form_factory,
         Properties $properties
-    ): StandardForm {
+    ): EditForm {
         $ff = $this->ui_factory->input()->field();
-        return $this->ui_factory->input()->container()->form()->standard(
-            $url_builder->withParameter($step_token, self::STEP_SAVE)->buildURI()->__toString(),
-            [
-                self::MAIN_SECTION_NAME => $properties->getGaps()->buildPointInputs($this->lng, $ff, $this->refinery),
-                self::PROPERTIES_SECTION_NAME => $properties->buildBasicEditingInputsHidden($ff)
-                    ->withDedicatedName(self::PROPERTIES_SECTION_NAME)
-            ]
-        )->withSubmitLabel($this->lng->txt('save'));
+        return $edit_form_factory->getEditForm(
+            $url_builder->withParameter($step_token, self::STEP_SAVE)->buildURI(),
+            $properties->getGaps()->buildPointInputs($this->lng, $ff, $this->refinery),
+            true,
+            $properties->buildCarryInputs($ff)
+        )->withContentBeforeForm(
+            $this->buildClozeTextPanel($properties)
+        );
     }
 
     private function processAssignPointsForm(
         URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): array|ManipulateQuery {
-        $properties = $this->retrievePropertiesFromPost();
+        URLBuilderToken $step_token,
+        EditFormFactory $edit_form_factory,
+        Properties $properties
+    ): EditForm|Properties {
         $form = $this->buildAssignPointsForm(
             $url_builder,
             $step_token,
+            $edit_form_factory,
             $properties
         )->withRequest($this->http->request());
 
         $data = $form->getData();
-        if ($data === null) {
-            return $this->buildOutputWithPanel($form, $properties);
-        }
-
-        return $this->save($properties->withGaps($data[self::MAIN_SECTION_NAME]));
+        return $data === null
+            ? $form->withContentBeforeForm(
+                $this->buildClozeTextPanel($properties)
+            ) : $properties->withGaps($data);
     }
 
-    private function buildOutputWithPanel(
-        StandardForm $form,
+    private function buildClozeTextPanel(
         Properties $properties
-    ): array {
-        return [
-            $this->ui_factory->panel()->standard(
-                $this->lng->txt('cloze_text'),
-                $this->ui_factory->legacy()->content(
-                    $properties->getClozeText()->getRenderedMarkdown(
-                        $properties->getGaps()
-                    )
+    ): StandardPanel {
+        return $this->ui_factory->panel()->standard(
+            $this->lng->txt('cloze_text'),
+            $this->ui_factory->legacy()->content(
+                $properties->getClozeText()->getRenderedMarkdown(
+                    $properties->getGaps()
                 )
-            ),
-            $form
-        ];
-    }
-
-    private function save(Properties $properties): ManipulateQuery
-    {
-        return $properties->toPersistence();
-    }
-
-    private function retrievePropertiesFromPost(): Properties
-    {
-
-        return $this->type->getProperties()->withValuesFromPost(
-            $this->refinery,
-            $this->http->wrapper()->post(),
-            'form/' . self::PROPERTIES_SECTION_NAME
+            )
         );
     }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php b/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
index e23e4217a684..9c2762194748 100755
--- a/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
@@ -18,48 +18,41 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\HTTP\Wrapper;
+namespace ILIAS\Questions\Presentation\Definitions;
 
 use ILIAS\Refinery\Transformation;
 
-/**
- * Class ArrayBasedRequestWrapper
- *
- * @author Fabian Schmid <fs@studer-raimann.ch>
- */
-class ArrayBasedRequestWrapper implements RequestWrapper
+class CarryWrapper
 {
-    /**
-     * GetRequestWrapper constructor.
-     * @param mixed[] $raw_values
-     */
-    public function __construct(private array $raw_values)
-    {
+    public function __construct(
+        private array $raw_values
+    ) {
     }
 
-
     /**
-     * @inheritDoc
+     * The Transformation will receive either the value from $_POST or an instance
+     * of `CarrySectionData` containing the next nesting level if the value contains
+     * values from multiple variables from $_POST.
      */
-    public function retrieve(string $key, Transformation $transformation)
+    public function retrieve(string $key, Transformation $transformation): mixed
     {
-        return $transformation->transform($this->raw_values[$key] ?? null);
+        return $transformation->transform(
+            $this->retrieveValueFromArray($key)
+        );
     }
 
-
-    /**
-     * @inheritDoc
-     */
-    public function has(string $key): bool
+    private function retrieveValueFromArray(string $key): mixed
     {
-        return isset($this->raw_values[$key]);
-    }
+        $value = $this->raw_values[$key] ?? null;
 
-    /**
-     * @inheritDoc
-     */
-    public function keys(): array
-    {
-        return array_keys($this->raw_values);
+        if ($value === null) {
+            return null;
+        }
+
+        if ($value instanceof Leaf) {
+            return $value->get();
+        }
+
+        return new self($value);
     }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EditForm.php b/components/ILIAS/Questions/src/Presentation/Definitions/EditForm.php
index 14a16b4c6037..035e81c01873 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EditForm.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EditForm.php
@@ -18,538 +18,115 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation;
+namespace ILIAS\Questions\Presentation\Definitions;
 
-use ILIAS\Questions\AnswerForm\Definition;
-use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
-use ILIAS\Questions\AnswerForm\TypeGenericProperties;
-use ILIAS\Questions\Question\Persistence\Repository;
-use ILIAS\Questions\Question\QuestionImplementation;
-use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\URI;
-use ILIAS\Data\UUID\Factory as UuidFactory;
-use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
-use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\Refinery\Transformation;
-use ILIAS\HTTP\Services as HTTP;
-use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\Renderer as UIRenderer;
+use ILIAS\UI\Component\Input\Container\Form\Factory as FormFactory;
 use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
-use ILIAS\UI\Component\Item\Standard as StandardItem;
-use ILIAS\UI\Component\Item\Group as ItemGroup;
-use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
-use ILIAS\UI\URLBuilder;
-use ILIAS\UI\URLBuilderToken;
-use ILIAS\GlobalScreen\Services as GlobalScreen;
+use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\UI\Renderer as UIRenderer;
+use Psr\Http\Message\ServerRequestInterface;
 
-class Edit
+class EditForm
 {
-    private const array QUERY_PARAMETER_NAME_SPACE = ['q'];
-    private const string TOKEN_STRING_ACTION = 'a';
-    private const string TOKEN_STRING_STEP = 's';
-    private const string TOKEN_STRING_QUESTION_ID = 'q';
-    private const string TOKEN_STRING_PAGE_ID = 'p';
-    private const string TOKEN_TYPE_HASH = 't';
-    private const string CMD_CREATE_QUESTION = 'create';
-    private const string CMD_EDIT_QUESTION = 'edit';
-    private const string CMD_CREATE_ANSWER_FORM = 'create_af';
-    private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
+    private const string MAIN_SECTION_NAME = 'form';
+    public const string CARRY_SECTION_NAME = 'carry';
+
+    private StandardForm $form;
 
-    private array $required_capabilities = [];
-    private Editability $editability = Editability::Full;
-    private bool $ordering_enabled = false;
+    private ?StandardPanel $content_before_form = null;
+    private ?StandardPanel $content_after_form = null;
 
     public function __construct(
+        private readonly FormFactory $form_factory,
         private readonly Language $lng,
-        private readonly \ilObjUser $current_user,
-        private readonly Refinery $refinery,
-        private readonly UIFactory $ui_factory,
-        private readonly UIRenderer $ui_renderer,
-        private readonly GlobalScreen $global_screen,
-        private readonly \ilCtrl $ctrl,
-        private readonly HTTP $http,
-        private readonly \ilUIService $ui_services,
-        private readonly DataFactory $data_factory,
-        private readonly UuidFactory $uuid_factory,
-        private readonly AnswerFormFactory $answer_form_factory,
-        private readonly Repository $questions_repository
+        private readonly URI $target_uri,
+        private readonly Section $main_section_inputs,
+        private readonly bool $is_final_step,
+        private readonly ?Group $carry_inputs
     ) {
-
+        $this->form = $this->buildForm();
     }
 
-    public function withRequiredCapabilities(array $capability_class_names): self
+    public function withContentBeforeForm(StandardPanel $content): self
     {
-        $this->checkCapabilities($capability_class_names);
         $clone = clone $this;
-        $clone->required_capabilities = $capability_class_names;
+        $clone->content_before_form = $content;
         return $clone;
     }
 
-    public function withEditable(Editability $editability): self
+    public function withContentAfterForm(StandardPanel $content): self
     {
         $clone = clone $this;
-        $clone->editability = $editability;
+        $clone->content_after_form = $content;
         return $clone;
     }
 
-    public function withOrderingEnabled(bool $enable): self
-    {
-        $clone = clone $this;
-        $clone->ordering_enabled = $enable;
-        return $clone;
+    public function render(
+        UIRenderer $ui_renderer
+    ): string {
+        return $ui_renderer->render($this->buildContent());
     }
 
-    public function view(
-        \ilToolbarGUI $toolbar,
-        URI $base_uri
-    ): array {
-        [
-            $url_builder,
-            $action_token,
-            $step_token,
-            $question_id_token,
-            $page_id_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-        return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_CREATE_QUESTION => $this->createQuestion(
-                $url_builder,
-                $action_token,
-                $step_token,
-                $question_id_token,
-                $page_id_token
-            ),
-            self::CMD_EDIT_QUESTION => $this->editQuestion(
-                $url_builder,
-                $action_token,
-                $step_token,
-                $question_id_token,
-                $page_id_token
-            ),
-            default => $this->showTable(
-                $toolbar,
-                $url_builder,
-                $action_token,
-                $question_id_token
-            )
-        };
+    public function withRequest(
+        ServerRequestInterface $request
+    ): self {
+        $clone = clone $this;
+        $clone->form = $clone->form->withRequest($request);
+        return $clone;
     }
 
-    public function forwardPageCmds(
-        \ilGlobalTemplateInterface $tpl,
-        URI $base_uri,
-    ): void {
-        [
-            0 => $url_builder,
-            1 => $action_token,
-            3 => $question_id_token,
-            4 => $page_id_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $question_id = $this->retrieveQuestionId($question_id_token);
-        $page_id = $this->retrievePageId($page_id_token);
-        $this->setParametersForQuestionCmds($question_id_token, $question_id->toString(), $page_id_token, $page_id);
-
-        $tpl->setContent(
-            $this->ctrl->forwardCommand(
-                new \QstsQuestionPageGUI(
-                    $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION)
-                        ->withParameter($question_id_token, $question_id->toString())
-                        ->buildURI(),
-                    $page_id
-                )
-            )
-        );
+    public function getData(): mixed
+    {
+        $data = $this->form->getData();
+        return $data[self::MAIN_SECTION_NAME] ?? null;
     }
 
-    public function createAnswerForm(
-        URI $base_uri
-    ): array {
-        [
-            $url_builder,
-            $action_token,
-            $step_token,
-            $question_id_token,
-            $page_id_token,
-            $type_hash_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-        $question_id = $this->retrieveQuestionId($question_id_token);
-        $url_builder_with_params = $url_builder
-                ->withParameter($question_id_token, $question_id->toString())
-                ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
-                ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
+    private function buildContent(): array
+    {
+        $content = [];
 
-        $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
-        if ($answer_form_type_class_hash !== '') {
-            return $this->forwardCreateAnswerFormCmd(
-                $this->answer_form_types_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
-                $this->answer_form_factory->getDefaultTypeGenericProperties($question_id),
-                $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
-                $step_token
-            );
+        if ($this->content_before_form !== null) {
+            $content[] = $this->content_before_form;
         }
 
-        return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
-                $url_builder_with_params,
-                $action_token,
-                $step_token,
-                $type_hash_token
-            ),
-            default => [$this->buildCreateAnswerForm(
-                $url_builder_with_params,
-                $action_token
-            )]
-        };
-    }
-
-    public function editAnswerForm(
-        URI $base_uri
-    ): array {
-        [$url_builder, $action_token] = $this->acquireURLBuilderAndParameters($base_uri);
-        return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_EDIT_ANSWER_FORM => [$this->processCreateAnswerForm($url_builder, $action_token)],
-            default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
-        };
-    }
+        $content[] = $this->form;
 
-    private function createQuestion(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $question_id_token,
-        URLBuilderToken $page_id_token
-    ): array {
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $create = (new QuestionImplementation())->getEditView(
-            $this->lng,
-            $this->current_user,
-            $this->ui_factory,
-            $this->refinery,
-            $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
-        )->create(
-            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION),
-            $step_token,
-            $this->retrieveStringValueForToken($step_token)
-        );
-
-        if (is_array($create)) {
-            return $create;
+        if ($this->content_after_form !== null) {
+            $content[] = $this->content_after_form;
         }
 
-        $this->questions_repository->store($create);
-        return $this->buildEditStartView(
-            $url_builder->withParameter($question_id_token, $create->getId()),
-            $step_token,
-            $page_id_token,
-            $create
-        );
-
+        return $content;
     }
 
-    private function editQuestion(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $question_id_token,
-        URLBuilderToken $page_id_token
-    ): array {
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $question_id = $this->retrieveQuestionId($question_id_token);
-
-        $url_builder_with_row_id = $url_builder->withParameter($question_id_token, $question_id->toString());
-
-        $edit = $this->questions_repository->getForQuestionId($question_id)->getEditView(
-            $this->lng,
-            $this->current_user,
-            $this->ui_factory,
-            $this->refinery,
-            $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
-        )->edit(
-            $url_builder_with_row_id->withParameter($action_token, self::CMD_EDIT_QUESTION),
-            $step_token,
-            $page_id_token,
-            $this->retrieveStringValueForToken($step_token)
+    private function buildForm(): StandardForm
+    {
+        $form = $this->form_factory->standard(
+            $this->target_uri->__toString(),
+            $this->buildFormInputs()
         );
 
-        if (is_array($edit)) {
-            return $edit;
+        if ($this->is_final_step) {
+            return $form->withSubmitLabel($this->lng->txt('save'));
         }
 
-        $this->questions_repository->store($edit);
-        return $this->buildEditStartView(
-            $url_builder_with_row_id,
-            $step_token,
-            $page_id_token,
-            $edit
-        );
+        return $form->withSubmitLabel($this->lng->txt('next'));
     }
 
-    private function showTable(
-        \ilToolbarGUI $toolbar,
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): array {
-        $toolbar->addComponent(
-            $this->ui_factory->button()->standard(
-                $this->lng->txt('create'),
-                $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()->__toString()
-            )
-        );
-
-        $table = new QuestionsTable(
-            $this->ui_factory,
-            $this->ui_services,
-            $this->lng,
-            $this->answer_form_types_factory,
-            $this->questions_repository,
-            $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
-            $action_token,
-            $question_id_token
-        );
-        return [
-            $table->getFilter($url_builder->buildURI()->__toString()),
-            $table->getTable()->withRequest($this->http->request())
-
+    private function buildFormInputs(): array
+    {
+        $form_inputs = [
+            self::MAIN_SECTION_NAME => $this->main_section_inputs
         ];
-    }
-
-    private function processCreateAnswerForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $type_hash_token
-    ): array {
-        $form = $this->buildCreateAnswerForm(
-            $url_builder,
-            $action_token
-        )->withRequest($this->http->request());
 
-        $data = $form->getData();
-        if ($data === null || $data['form_type'] === null) {
-            return [$form];
+        if ($this->carry_inputs !== null) {
+            $form_inputs[self::CARRY_SECTION_NAME] = $this->carry_inputs
+                ->withDedicatedName(self::CARRY_SECTION_NAME);
         }
 
-        return $this->forwardCreateAnswerFormCmd(
-            $data['form_type'],
-            $url_builder->withParameter($type_hash_token, $this->answer_form_types_factory->getHashedClass($data['form_type']::class)),
-            $step_token
-        );
-    }
-
-    private function forwardCreateAnswerFormCmd(
-        Definition $type,
-        TypeGenericProperties $type_generic_properties,
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): array {
-        return $type->getEditView()->create(
-            $type->buildProperties($type_generic_properties, []),
-            $url_builder,
-            $step_token,
-            $this->retrieveStringValueForToken($step_token)
-        );
-    }
-
-    private function acquireURLBuilderAndParameters(URI $base_uri): array
-    {
-        return (new URLBuilder($base_uri))
-            ->acquireParameters(
-                self::QUERY_PARAMETER_NAME_SPACE,
-                self::TOKEN_STRING_ACTION,
-                self::TOKEN_STRING_STEP,
-                self::TOKEN_STRING_QUESTION_ID,
-                self::TOKEN_STRING_PAGE_ID,
-                self::TOKEN_TYPE_HASH
-            );
-    }
-
-    private function retrieveStringValueForToken(
-        URLBuilderToken $token
-    ): string {
-        return $this->http->wrapper()->query()->retrieve(
-            $token->getName(),
-            $this->buildStringTrafo()
-        );
-    }
-
-    private function retrieveQuestionId(
-        URLBuilderToken $question_id_token
-    ): ?Uuid {
-        return $this->http->wrapper()->query()->retrieve(
-            $question_id_token->getName(),
-            $this->refinery->byTrying([
-                $this->refinery->custom()->transformation(
-                    fn($v): Uuid => $this->uuid_factory->fromString($v)
-                ),
-                $this->refinery->always(null)
-            ])
-        );
-    }
-
-    public function retrievePageId(
-        URLBuilderToken $page_id_token
-    ): ?int {
-        return $this->http->wrapper()->query()->retrieve(
-            $page_id_token->getName(),
-            $this->refinery->byTrying([
-                $this->refinery->kindlyTo()->int(),
-                $this->refinery->always(null)
-            ])
-        );
-    }
-
-    private function buildStringTrafo(): Transformation
-    {
-        return $this->refinery->byTrying([
-            $this->refinery->kindlyTo()->string(),
-            $this->refinery->always('')
-        ]);
-    }
-
-    private function initializeEditMode(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): void {
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::MODE_ENABLED,
-            true
-        );
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::QUESTIONLIST_ENTRY,
-            $this->buildQuestionListSlate($url_builder, $action_token, $question_id_token)
-        );
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::URL_CLOSE_MODE_INFO,
-            $url_builder->buildURI()
-        );
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::URL_CREATE_QUESTION,
-            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()
-        );
-    }
-
-    private function setParametersForQuestionCmds(
-        URLBuilderToken $question_id_token,
-        string $question_id,
-        URLBuilderToken $page_id_token,
-        int $page_id
-    ): void {
-        $this->ctrl->setParameterByClass(
-            \QstsQuestionPageGUI::class,
-            $question_id_token->getName(),
-            $question_id
-        );
-        $this->ctrl->setParameterByClass(
-            \QstsQuestionPageGUI::class,
-            $page_id_token->getName(),
-            $page_id
-        );
-    }
-
-    private function buildQuestionListSlate(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): LegacySlate {
-        return $this->ui_factory->mainControls()->slate()->legacy(
-            $this->lng->txt('mainbar_button_label_questionlist'),
-            $this->ui_factory->symbol()->icon()->standard('', '')->withAbbreviation('QL'),
-            $this->ui_factory->legacy()->content(
-                $this->ui_renderer->render(
-                    $this->ui_factory->panel()->secondary()->listing(
-                        $this->lng->txt('mainbar_button_label_questionlist'),
-                        [
-                            $this->buildItemGroupForQuestionListSlate($url_builder, $action_token, $question_id_token)
-                        ]
-                    )
-                )
-            )
-        );
-    }
-
-    private function buildItemGroupForQuestionListSlate(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): ItemGroup {
-        return $this->ui_factory->item()->group(
-            '',
-            array_map(
-                fn(QuestionImplementation $v): StandardItem => $this->ui_factory->item()->standard(
-                    $v->toEditLink(
-                        $this->ui_factory->link(),
-                        $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
-                        $question_id_token
-                    )
-                ),
-                iterator_to_array($this->questions_repository->getAllQuestions())
-            )
-        );
-    }
-
-    private function buildEditStartView(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        URLBuilderToken $page_id_token,
-        QuestionImplementation $question
-    ): array {
-        return $question->getEditView(
-            $this->lng,
-            $this->current_user,
-            $this->ui_factory,
-            $this->refinery,
-            $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
-        )->edit(
-            $url_builder,
-            $step_token,
-            $page_id_token,
-            ''
-        );
-    }
-
-    private function buildCreateAnswerForm(
-        URLBuilder $url_builder
-    ): StandardForm {
-        $if = $this->ui_factory->input();
-        return $if->container()->form()->standard(
-            $url_builder->buildURI()->__toString(),
-            [
-                'form_type' => $if->field()->section(
-                    [
-                        $if->field()->select(
-                            $this->lng->txt('select_answer_form_type'),
-                            $this->answer_form_factory->getAnswerFormTypesArrayForSelect()
-                        )->withRequired(true)
-                    ],
-                    $this->lng->txt('create_answer_form')
-                )->withAdditionalTransformation(
-                    $this->refinery->custom()->transformation(
-                        fn(array $vs): ?Form => $this->answer_form_factory->buildTypeDefinitionFromSelectValue($vs[0])
-                    )
-                )
-            ]
-        )->withSubmitLabel($this->lng->txt('next'));
-    }
-
-    private function checkCapabilities(array $capabilities): void
-    {
-        foreach ($capabilities as $capability) {
-            if (!$this->questions_repository->capabilityExists($capability)) {
-                throw new \InvalidArgumentException('All provided capabilities must implement ILIAS\Questions\AnswerForm\Capabilities\Capability.');
-            }
-        }
+        return $form_inputs;
     }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php b/components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php
index 14a16b4c6037..38a86f09be5e 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php
@@ -18,538 +18,58 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation;
+namespace ILIAS\Questions\Presentation\Definitions;
 
-use ILIAS\Questions\AnswerForm\Definition;
-use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
-use ILIAS\Questions\AnswerForm\TypeGenericProperties;
-use ILIAS\Questions\Question\Persistence\Repository;
-use ILIAS\Questions\Question\QuestionImplementation;
-use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\URI;
-use ILIAS\Data\UUID\Factory as UuidFactory;
-use ILIAS\Data\UUID\Uuid;
+use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\Refinery\Transformation;
-use ILIAS\HTTP\Services as HTTP;
 use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\Renderer as UIRenderer;
-use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
-use ILIAS\UI\Component\Item\Standard as StandardItem;
-use ILIAS\UI\Component\Item\Group as ItemGroup;
-use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
-use ILIAS\UI\URLBuilder;
-use ILIAS\UI\URLBuilderToken;
-use ILIAS\GlobalScreen\Services as GlobalScreen;
+use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\Component\Input\Field\Group;
 
-class Edit
+class EditFormFactory
 {
-    private const array QUERY_PARAMETER_NAME_SPACE = ['q'];
-    private const string TOKEN_STRING_ACTION = 'a';
-    private const string TOKEN_STRING_STEP = 's';
-    private const string TOKEN_STRING_QUESTION_ID = 'q';
-    private const string TOKEN_STRING_PAGE_ID = 'p';
-    private const string TOKEN_TYPE_HASH = 't';
-    private const string CMD_CREATE_QUESTION = 'create';
-    private const string CMD_EDIT_QUESTION = 'edit';
-    private const string CMD_CREATE_ANSWER_FORM = 'create_af';
-    private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
-
-    private array $required_capabilities = [];
-    private Editability $editability = Editability::Full;
-    private bool $ordering_enabled = false;
-
     public function __construct(
-        private readonly Language $lng,
-        private readonly \ilObjUser $current_user,
-        private readonly Refinery $refinery,
         private readonly UIFactory $ui_factory,
-        private readonly UIRenderer $ui_renderer,
-        private readonly GlobalScreen $global_screen,
-        private readonly \ilCtrl $ctrl,
-        private readonly HTTP $http,
-        private readonly \ilUIService $ui_services,
-        private readonly DataFactory $data_factory,
-        private readonly UuidFactory $uuid_factory,
-        private readonly AnswerFormFactory $answer_form_factory,
-        private readonly Repository $questions_repository
+        private readonly Language $lng
     ) {
-
-    }
-
-    public function withRequiredCapabilities(array $capability_class_names): self
-    {
-        $this->checkCapabilities($capability_class_names);
-        $clone = clone $this;
-        $clone->required_capabilities = $capability_class_names;
-        return $clone;
-    }
-
-    public function withEditable(Editability $editability): self
-    {
-        $clone = clone $this;
-        $clone->editability = $editability;
-        return $clone;
-    }
-
-    public function withOrderingEnabled(bool $enable): self
-    {
-        $clone = clone $this;
-        $clone->ordering_enabled = $enable;
-        return $clone;
-    }
-
-    public function view(
-        \ilToolbarGUI $toolbar,
-        URI $base_uri
-    ): array {
-        [
-            $url_builder,
-            $action_token,
-            $step_token,
-            $question_id_token,
-            $page_id_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-        return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_CREATE_QUESTION => $this->createQuestion(
-                $url_builder,
-                $action_token,
-                $step_token,
-                $question_id_token,
-                $page_id_token
-            ),
-            self::CMD_EDIT_QUESTION => $this->editQuestion(
-                $url_builder,
-                $action_token,
-                $step_token,
-                $question_id_token,
-                $page_id_token
-            ),
-            default => $this->showTable(
-                $toolbar,
-                $url_builder,
-                $action_token,
-                $question_id_token
-            )
-        };
-    }
-
-    public function forwardPageCmds(
-        \ilGlobalTemplateInterface $tpl,
-        URI $base_uri,
-    ): void {
-        [
-            0 => $url_builder,
-            1 => $action_token,
-            3 => $question_id_token,
-            4 => $page_id_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $question_id = $this->retrieveQuestionId($question_id_token);
-        $page_id = $this->retrievePageId($page_id_token);
-        $this->setParametersForQuestionCmds($question_id_token, $question_id->toString(), $page_id_token, $page_id);
-
-        $tpl->setContent(
-            $this->ctrl->forwardCommand(
-                new \QstsQuestionPageGUI(
-                    $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION)
-                        ->withParameter($question_id_token, $question_id->toString())
-                        ->buildURI(),
-                    $page_id
-                )
-            )
-        );
-    }
-
-    public function createAnswerForm(
-        URI $base_uri
-    ): array {
-        [
-            $url_builder,
-            $action_token,
-            $step_token,
-            $question_id_token,
-            $page_id_token,
-            $type_hash_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-        $question_id = $this->retrieveQuestionId($question_id_token);
-        $url_builder_with_params = $url_builder
-                ->withParameter($question_id_token, $question_id->toString())
-                ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
-                ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
-
-        $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
-        if ($answer_form_type_class_hash !== '') {
-            return $this->forwardCreateAnswerFormCmd(
-                $this->answer_form_types_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
-                $this->answer_form_factory->getDefaultTypeGenericProperties($question_id),
-                $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
-                $step_token
-            );
-        }
-
-        return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
-                $url_builder_with_params,
-                $action_token,
-                $step_token,
-                $type_hash_token
-            ),
-            default => [$this->buildCreateAnswerForm(
-                $url_builder_with_params,
-                $action_token
-            )]
-        };
-    }
-
-    public function editAnswerForm(
-        URI $base_uri
-    ): array {
-        [$url_builder, $action_token] = $this->acquireURLBuilderAndParameters($base_uri);
-        return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_EDIT_ANSWER_FORM => [$this->processCreateAnswerForm($url_builder, $action_token)],
-            default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
-        };
-    }
-
-    private function createQuestion(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $question_id_token,
-        URLBuilderToken $page_id_token
-    ): array {
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $create = (new QuestionImplementation())->getEditView(
-            $this->lng,
-            $this->current_user,
-            $this->ui_factory,
-            $this->refinery,
-            $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
-        )->create(
-            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION),
-            $step_token,
-            $this->retrieveStringValueForToken($step_token)
-        );
-
-        if (is_array($create)) {
-            return $create;
-        }
-
-        $this->questions_repository->store($create);
-        return $this->buildEditStartView(
-            $url_builder->withParameter($question_id_token, $create->getId()),
-            $step_token,
-            $page_id_token,
-            $create
-        );
-
-    }
-
-    private function editQuestion(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $question_id_token,
-        URLBuilderToken $page_id_token
-    ): array {
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $question_id = $this->retrieveQuestionId($question_id_token);
-
-        $url_builder_with_row_id = $url_builder->withParameter($question_id_token, $question_id->toString());
-
-        $edit = $this->questions_repository->getForQuestionId($question_id)->getEditView(
-            $this->lng,
-            $this->current_user,
-            $this->ui_factory,
-            $this->refinery,
-            $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
-        )->edit(
-            $url_builder_with_row_id->withParameter($action_token, self::CMD_EDIT_QUESTION),
-            $step_token,
-            $page_id_token,
-            $this->retrieveStringValueForToken($step_token)
-        );
-
-        if (is_array($edit)) {
-            return $edit;
-        }
-
-        $this->questions_repository->store($edit);
-        return $this->buildEditStartView(
-            $url_builder_with_row_id,
-            $step_token,
-            $page_id_token,
-            $edit
-        );
-    }
-
-    private function showTable(
-        \ilToolbarGUI $toolbar,
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): array {
-        $toolbar->addComponent(
-            $this->ui_factory->button()->standard(
-                $this->lng->txt('create'),
-                $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()->__toString()
-            )
-        );
-
-        $table = new QuestionsTable(
-            $this->ui_factory,
-            $this->ui_services,
-            $this->lng,
-            $this->answer_form_types_factory,
-            $this->questions_repository,
-            $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
-            $action_token,
-            $question_id_token
-        );
-        return [
-            $table->getFilter($url_builder->buildURI()->__toString()),
-            $table->getTable()->withRequest($this->http->request())
-
-        ];
-    }
-
-    private function processCreateAnswerForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $type_hash_token
-    ): array {
-        $form = $this->buildCreateAnswerForm(
-            $url_builder,
-            $action_token
-        )->withRequest($this->http->request());
-
-        $data = $form->getData();
-        if ($data === null || $data['form_type'] === null) {
-            return [$form];
-        }
-
-        return $this->forwardCreateAnswerFormCmd(
-            $data['form_type'],
-            $url_builder->withParameter($type_hash_token, $this->answer_form_types_factory->getHashedClass($data['form_type']::class)),
-            $step_token
-        );
-    }
-
-    private function forwardCreateAnswerFormCmd(
-        Definition $type,
-        TypeGenericProperties $type_generic_properties,
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): array {
-        return $type->getEditView()->create(
-            $type->buildProperties($type_generic_properties, []),
-            $url_builder,
-            $step_token,
-            $this->retrieveStringValueForToken($step_token)
-        );
-    }
-
-    private function acquireURLBuilderAndParameters(URI $base_uri): array
-    {
-        return (new URLBuilder($base_uri))
-            ->acquireParameters(
-                self::QUERY_PARAMETER_NAME_SPACE,
-                self::TOKEN_STRING_ACTION,
-                self::TOKEN_STRING_STEP,
-                self::TOKEN_STRING_QUESTION_ID,
-                self::TOKEN_STRING_PAGE_ID,
-                self::TOKEN_TYPE_HASH
-            );
-    }
-
-    private function retrieveStringValueForToken(
-        URLBuilderToken $token
-    ): string {
-        return $this->http->wrapper()->query()->retrieve(
-            $token->getName(),
-            $this->buildStringTrafo()
-        );
-    }
-
-    private function retrieveQuestionId(
-        URLBuilderToken $question_id_token
-    ): ?Uuid {
-        return $this->http->wrapper()->query()->retrieve(
-            $question_id_token->getName(),
-            $this->refinery->byTrying([
-                $this->refinery->custom()->transformation(
-                    fn($v): Uuid => $this->uuid_factory->fromString($v)
-                ),
-                $this->refinery->always(null)
-            ])
-        );
-    }
-
-    public function retrievePageId(
-        URLBuilderToken $page_id_token
-    ): ?int {
-        return $this->http->wrapper()->query()->retrieve(
-            $page_id_token->getName(),
-            $this->refinery->byTrying([
-                $this->refinery->kindlyTo()->int(),
-                $this->refinery->always(null)
-            ])
-        );
     }
 
-    private function buildStringTrafo(): Transformation
-    {
-        return $this->refinery->byTrying([
-            $this->refinery->kindlyTo()->string(),
-            $this->refinery->always('')
-        ]);
-    }
-
-    private function initializeEditMode(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): void {
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::MODE_ENABLED,
-            true
-        );
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::QUESTIONLIST_ENTRY,
-            $this->buildQuestionListSlate($url_builder, $action_token, $question_id_token)
-        );
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::URL_CLOSE_MODE_INFO,
-            $url_builder->buildURI()
-        );
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::URL_CREATE_QUESTION,
-            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()
-        );
-    }
-
-    private function setParametersForQuestionCmds(
-        URLBuilderToken $question_id_token,
-        string $question_id,
-        URLBuilderToken $page_id_token,
-        int $page_id
-    ): void {
-        $this->ctrl->setParameterByClass(
-            \QstsQuestionPageGUI::class,
-            $question_id_token->getName(),
-            $question_id
-        );
-        $this->ctrl->setParameterByClass(
-            \QstsQuestionPageGUI::class,
-            $page_id_token->getName(),
-            $page_id
-        );
-    }
-
-    private function buildQuestionListSlate(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): LegacySlate {
-        return $this->ui_factory->mainControls()->slate()->legacy(
-            $this->lng->txt('mainbar_button_label_questionlist'),
-            $this->ui_factory->symbol()->icon()->standard('', '')->withAbbreviation('QL'),
-            $this->ui_factory->legacy()->content(
-                $this->ui_renderer->render(
-                    $this->ui_factory->panel()->secondary()->listing(
-                        $this->lng->txt('mainbar_button_label_questionlist'),
-                        [
-                            $this->buildItemGroupForQuestionListSlate($url_builder, $action_token, $question_id_token)
-                        ]
-                    )
-                )
-            )
-        );
-    }
-
-    private function buildItemGroupForQuestionListSlate(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): ItemGroup {
-        return $this->ui_factory->item()->group(
-            '',
-            array_map(
-                fn(QuestionImplementation $v): StandardItem => $this->ui_factory->item()->standard(
-                    $v->toEditLink(
-                        $this->ui_factory->link(),
-                        $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
-                        $question_id_token
-                    )
-                ),
-                iterator_to_array($this->questions_repository->getAllQuestions())
-            )
-        );
-    }
-
-    private function buildEditStartView(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        URLBuilderToken $page_id_token,
-        QuestionImplementation $question
-    ): array {
-        return $question->getEditView(
+    public function getEditForm(
+        URI $target_uri,
+        Section $main_section_inputs,
+        bool $is_final_step,
+        ?Group $carry_inputs = null
+    ): EditForm {
+        return new EditForm(
+            $this->ui_factory->input()->container()->form(),
             $this->lng,
-            $this->current_user,
-            $this->ui_factory,
-            $this->refinery,
-            $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
-        )->edit(
-            $url_builder,
-            $step_token,
-            $page_id_token,
-            ''
+            $target_uri,
+            $main_section_inputs,
+            $is_final_step,
+            $carry_inputs
+        );
+    }
+
+    public function getCarrySectionData(
+        ArrayBasedRequestWrapper $post_wrapper,
+        Refinery $refinery
+    ): CarryWrapper {
+        return new CarryWrapper(
+            array_reduce(
+                $post_wrapper->keys(),
+                function (array $c, string $v) use ($post_wrapper, $refinery): array {
+                    $value = new Leaf(
+                        $post_wrapper->retrieve($v, $refinery->identity())
+                    );
+                    foreach (array_reverse(explode('/', $v)) as $path_element) {
+                        $value = [$path_element => $value];
+                    }
+                    return array_merge_recursive($c, $value);
+                },
+                []
+            )['form'][EditForm::CARRY_SECTION_NAME] ?? []
         );
     }
-
-    private function buildCreateAnswerForm(
-        URLBuilder $url_builder
-    ): StandardForm {
-        $if = $this->ui_factory->input();
-        return $if->container()->form()->standard(
-            $url_builder->buildURI()->__toString(),
-            [
-                'form_type' => $if->field()->section(
-                    [
-                        $if->field()->select(
-                            $this->lng->txt('select_answer_form_type'),
-                            $this->answer_form_factory->getAnswerFormTypesArrayForSelect()
-                        )->withRequired(true)
-                    ],
-                    $this->lng->txt('create_answer_form')
-                )->withAdditionalTransformation(
-                    $this->refinery->custom()->transformation(
-                        fn(array $vs): ?Form => $this->answer_form_factory->buildTypeDefinitionFromSelectValue($vs[0])
-                    )
-                )
-            ]
-        )->withSubmitLabel($this->lng->txt('next'));
-    }
-
-    private function checkCapabilities(array $capabilities): void
-    {
-        foreach ($capabilities as $capability) {
-            if (!$this->questions_repository->capabilityExists($capability)) {
-                throw new \InvalidArgumentException('All provided capabilities must implement ILIAS\Questions\AnswerForm\Capabilities\Capability.');
-            }
-        }
-    }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php b/components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php
index 14a16b4c6037..f854f1df63a7 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php
@@ -18,538 +18,112 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation;
+namespace ILIAS\Questions\Presentation\Definitions;
 
-use ILIAS\Questions\AnswerForm\Definition;
-use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
-use ILIAS\Questions\AnswerForm\TypeGenericProperties;
-use ILIAS\Questions\Question\Persistence\Repository;
-use ILIAS\Questions\Question\QuestionImplementation;
-use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\URI;
-use ILIAS\Data\UUID\Factory as UuidFactory;
-use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
-use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\Refinery\Transformation;
-use ILIAS\HTTP\Services as HTTP;
-use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\Renderer as UIRenderer;
+use ILIAS\UI\Component\Input\Container\Form\Factory as FormFactory;
 use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
-use ILIAS\UI\Component\Item\Standard as StandardItem;
-use ILIAS\UI\Component\Item\Group as ItemGroup;
-use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
-use ILIAS\UI\URLBuilder;
-use ILIAS\UI\URLBuilderToken;
-use ILIAS\GlobalScreen\Services as GlobalScreen;
+use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\UI\Renderer as UIRenderer;
+use Psr\Http\Message\ServerRequestInterface;
 
-class Edit
+class EditOverview
 {
-    private const array QUERY_PARAMETER_NAME_SPACE = ['q'];
-    private const string TOKEN_STRING_ACTION = 'a';
-    private const string TOKEN_STRING_STEP = 's';
-    private const string TOKEN_STRING_QUESTION_ID = 'q';
-    private const string TOKEN_STRING_PAGE_ID = 'p';
-    private const string TOKEN_TYPE_HASH = 't';
-    private const string CMD_CREATE_QUESTION = 'create';
-    private const string CMD_EDIT_QUESTION = 'edit';
-    private const string CMD_CREATE_ANSWER_FORM = 'create_af';
-    private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
+    private StandardForm $form;
 
-    private array $required_capabilities = [];
-    private Editability $editability = Editability::Full;
-    private bool $ordering_enabled = false;
+    private ?StandardPanel $content_before_form = null;
+    private ?StandardPanel $content_after_form = null;
 
     public function __construct(
+        private readonly FormFactory $form_factory,
         private readonly Language $lng,
-        private readonly \ilObjUser $current_user,
-        private readonly Refinery $refinery,
-        private readonly UIFactory $ui_factory,
-        private readonly UIRenderer $ui_renderer,
-        private readonly GlobalScreen $global_screen,
-        private readonly \ilCtrl $ctrl,
-        private readonly HTTP $http,
-        private readonly \ilUIService $ui_services,
-        private readonly DataFactory $data_factory,
-        private readonly UuidFactory $uuid_factory,
-        private readonly AnswerFormFactory $answer_form_factory,
-        private readonly Repository $questions_repository
+        private readonly URI $target_uri,
+        private readonly Section $main_section_inputs,
+        private readonly bool $is_final_step,
+        private readonly ?Group $carry_inputs
     ) {
-
+        $this->form = $this->buildForm();
     }
 
-    public function withRequiredCapabilities(array $capability_class_names): self
+    public function withContentBeforeForm(StandardPanel $content): self
     {
-        $this->checkCapabilities($capability_class_names);
         $clone = clone $this;
-        $clone->required_capabilities = $capability_class_names;
+        $clone->content_before_form = $content;
         return $clone;
     }
 
-    public function withEditable(Editability $editability): self
+    public function withContentAfterForm(StandardPanel $content): self
     {
         $clone = clone $this;
-        $clone->editability = $editability;
+        $clone->content_after_form = $content;
         return $clone;
     }
 
-    public function withOrderingEnabled(bool $enable): self
-    {
-        $clone = clone $this;
-        $clone->ordering_enabled = $enable;
-        return $clone;
+    public function render(
+        UIRenderer $ui_renderer
+    ): string {
+        return $ui_renderer->render($this->buildContent());
     }
 
-    public function view(
-        \ilToolbarGUI $toolbar,
-        URI $base_uri
-    ): array {
-        [
-            $url_builder,
-            $action_token,
-            $step_token,
-            $question_id_token,
-            $page_id_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-        return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_CREATE_QUESTION => $this->createQuestion(
-                $url_builder,
-                $action_token,
-                $step_token,
-                $question_id_token,
-                $page_id_token
-            ),
-            self::CMD_EDIT_QUESTION => $this->editQuestion(
-                $url_builder,
-                $action_token,
-                $step_token,
-                $question_id_token,
-                $page_id_token
-            ),
-            default => $this->showTable(
-                $toolbar,
-                $url_builder,
-                $action_token,
-                $question_id_token
-            )
-        };
+    public function withRequest(
+        ServerRequestInterface $request
+    ): self {
+        $clone = clone $this;
+        $clone->form = $clone->form->withRequest($request);
+        return $clone;
     }
 
-    public function forwardPageCmds(
-        \ilGlobalTemplateInterface $tpl,
-        URI $base_uri,
-    ): void {
-        [
-            0 => $url_builder,
-            1 => $action_token,
-            3 => $question_id_token,
-            4 => $page_id_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $question_id = $this->retrieveQuestionId($question_id_token);
-        $page_id = $this->retrievePageId($page_id_token);
-        $this->setParametersForQuestionCmds($question_id_token, $question_id->toString(), $page_id_token, $page_id);
-
-        $tpl->setContent(
-            $this->ctrl->forwardCommand(
-                new \QstsQuestionPageGUI(
-                    $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION)
-                        ->withParameter($question_id_token, $question_id->toString())
-                        ->buildURI(),
-                    $page_id
-                )
-            )
-        );
+    public function getData(): mixed
+    {
+        $data = $this->form->getData();
+        return $data[self::MAIN_SECTION_NAME] ?? null;
     }
 
-    public function createAnswerForm(
-        URI $base_uri
-    ): array {
-        [
-            $url_builder,
-            $action_token,
-            $step_token,
-            $question_id_token,
-            $page_id_token,
-            $type_hash_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-        $question_id = $this->retrieveQuestionId($question_id_token);
-        $url_builder_with_params = $url_builder
-                ->withParameter($question_id_token, $question_id->toString())
-                ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
-                ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
+    private function buildContent(): array
+    {
+        $content = [];
 
-        $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
-        if ($answer_form_type_class_hash !== '') {
-            return $this->forwardCreateAnswerFormCmd(
-                $this->answer_form_types_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
-                $this->answer_form_factory->getDefaultTypeGenericProperties($question_id),
-                $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
-                $step_token
-            );
+        if ($this->content_before_form !== null) {
+            $content[] = $this->content_before_form;
         }
 
-        return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
-                $url_builder_with_params,
-                $action_token,
-                $step_token,
-                $type_hash_token
-            ),
-            default => [$this->buildCreateAnswerForm(
-                $url_builder_with_params,
-                $action_token
-            )]
-        };
-    }
-
-    public function editAnswerForm(
-        URI $base_uri
-    ): array {
-        [$url_builder, $action_token] = $this->acquireURLBuilderAndParameters($base_uri);
-        return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_EDIT_ANSWER_FORM => [$this->processCreateAnswerForm($url_builder, $action_token)],
-            default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
-        };
-    }
-
-    private function createQuestion(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $question_id_token,
-        URLBuilderToken $page_id_token
-    ): array {
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $create = (new QuestionImplementation())->getEditView(
-            $this->lng,
-            $this->current_user,
-            $this->ui_factory,
-            $this->refinery,
-            $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
-        )->create(
-            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION),
-            $step_token,
-            $this->retrieveStringValueForToken($step_token)
-        );
+        $content[] = $this->form;
 
-        if (is_array($create)) {
-            return $create;
+        if ($this->content_after_form !== null) {
+            $content[] = $this->content_after_form;
         }
 
-        $this->questions_repository->store($create);
-        return $this->buildEditStartView(
-            $url_builder->withParameter($question_id_token, $create->getId()),
-            $step_token,
-            $page_id_token,
-            $create
-        );
-
+        return $content;
     }
 
-    private function editQuestion(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $question_id_token,
-        URLBuilderToken $page_id_token
-    ): array {
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $question_id = $this->retrieveQuestionId($question_id_token);
-
-        $url_builder_with_row_id = $url_builder->withParameter($question_id_token, $question_id->toString());
-
-        $edit = $this->questions_repository->getForQuestionId($question_id)->getEditView(
-            $this->lng,
-            $this->current_user,
-            $this->ui_factory,
-            $this->refinery,
-            $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
-        )->edit(
-            $url_builder_with_row_id->withParameter($action_token, self::CMD_EDIT_QUESTION),
-            $step_token,
-            $page_id_token,
-            $this->retrieveStringValueForToken($step_token)
+    private function buildForm(): StandardForm
+    {
+        $form = $this->form_factory->standard(
+            $this->target_uri->__toString(),
+            $this->buildFormInputs()
         );
 
-        if (is_array($edit)) {
-            return $edit;
+        if ($this->is_final_step) {
+            return $form->withSubmitLabel($this->lng->txt('save'));
         }
 
-        $this->questions_repository->store($edit);
-        return $this->buildEditStartView(
-            $url_builder_with_row_id,
-            $step_token,
-            $page_id_token,
-            $edit
-        );
+        return $form->withSubmitLabel($this->lng->txt('next'));
     }
 
-    private function showTable(
-        \ilToolbarGUI $toolbar,
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): array {
-        $toolbar->addComponent(
-            $this->ui_factory->button()->standard(
-                $this->lng->txt('create'),
-                $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()->__toString()
-            )
-        );
-
-        $table = new QuestionsTable(
-            $this->ui_factory,
-            $this->ui_services,
-            $this->lng,
-            $this->answer_form_types_factory,
-            $this->questions_repository,
-            $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
-            $action_token,
-            $question_id_token
-        );
-        return [
-            $table->getFilter($url_builder->buildURI()->__toString()),
-            $table->getTable()->withRequest($this->http->request())
-
+    private function buildFormInputs(): array
+    {
+        $form_inputs = [
+            self::MAIN_SECTION_NAME => $this->main_section_inputs
         ];
-    }
-
-    private function processCreateAnswerForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $type_hash_token
-    ): array {
-        $form = $this->buildCreateAnswerForm(
-            $url_builder,
-            $action_token
-        )->withRequest($this->http->request());
 
-        $data = $form->getData();
-        if ($data === null || $data['form_type'] === null) {
-            return [$form];
+        if ($this->carry_inputs !== null) {
+            $form_inputs[self::CARRY_SECTION_NAME] = $this->carry_inputs
+                ->withDedicatedName(self::CARRY_SECTION_NAME);
         }
 
-        return $this->forwardCreateAnswerFormCmd(
-            $data['form_type'],
-            $url_builder->withParameter($type_hash_token, $this->answer_form_types_factory->getHashedClass($data['form_type']::class)),
-            $step_token
-        );
-    }
-
-    private function forwardCreateAnswerFormCmd(
-        Definition $type,
-        TypeGenericProperties $type_generic_properties,
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): array {
-        return $type->getEditView()->create(
-            $type->buildProperties($type_generic_properties, []),
-            $url_builder,
-            $step_token,
-            $this->retrieveStringValueForToken($step_token)
-        );
-    }
-
-    private function acquireURLBuilderAndParameters(URI $base_uri): array
-    {
-        return (new URLBuilder($base_uri))
-            ->acquireParameters(
-                self::QUERY_PARAMETER_NAME_SPACE,
-                self::TOKEN_STRING_ACTION,
-                self::TOKEN_STRING_STEP,
-                self::TOKEN_STRING_QUESTION_ID,
-                self::TOKEN_STRING_PAGE_ID,
-                self::TOKEN_TYPE_HASH
-            );
-    }
-
-    private function retrieveStringValueForToken(
-        URLBuilderToken $token
-    ): string {
-        return $this->http->wrapper()->query()->retrieve(
-            $token->getName(),
-            $this->buildStringTrafo()
-        );
-    }
-
-    private function retrieveQuestionId(
-        URLBuilderToken $question_id_token
-    ): ?Uuid {
-        return $this->http->wrapper()->query()->retrieve(
-            $question_id_token->getName(),
-            $this->refinery->byTrying([
-                $this->refinery->custom()->transformation(
-                    fn($v): Uuid => $this->uuid_factory->fromString($v)
-                ),
-                $this->refinery->always(null)
-            ])
-        );
-    }
-
-    public function retrievePageId(
-        URLBuilderToken $page_id_token
-    ): ?int {
-        return $this->http->wrapper()->query()->retrieve(
-            $page_id_token->getName(),
-            $this->refinery->byTrying([
-                $this->refinery->kindlyTo()->int(),
-                $this->refinery->always(null)
-            ])
-        );
-    }
-
-    private function buildStringTrafo(): Transformation
-    {
-        return $this->refinery->byTrying([
-            $this->refinery->kindlyTo()->string(),
-            $this->refinery->always('')
-        ]);
-    }
-
-    private function initializeEditMode(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): void {
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::MODE_ENABLED,
-            true
-        );
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::QUESTIONLIST_ENTRY,
-            $this->buildQuestionListSlate($url_builder, $action_token, $question_id_token)
-        );
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::URL_CLOSE_MODE_INFO,
-            $url_builder->buildURI()
-        );
-        $this->global_screen->tool()->context()->current()->addAdditionalData(
-            LayoutProvider::URL_CREATE_QUESTION,
-            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()
-        );
-    }
-
-    private function setParametersForQuestionCmds(
-        URLBuilderToken $question_id_token,
-        string $question_id,
-        URLBuilderToken $page_id_token,
-        int $page_id
-    ): void {
-        $this->ctrl->setParameterByClass(
-            \QstsQuestionPageGUI::class,
-            $question_id_token->getName(),
-            $question_id
-        );
-        $this->ctrl->setParameterByClass(
-            \QstsQuestionPageGUI::class,
-            $page_id_token->getName(),
-            $page_id
-        );
-    }
-
-    private function buildQuestionListSlate(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): LegacySlate {
-        return $this->ui_factory->mainControls()->slate()->legacy(
-            $this->lng->txt('mainbar_button_label_questionlist'),
-            $this->ui_factory->symbol()->icon()->standard('', '')->withAbbreviation('QL'),
-            $this->ui_factory->legacy()->content(
-                $this->ui_renderer->render(
-                    $this->ui_factory->panel()->secondary()->listing(
-                        $this->lng->txt('mainbar_button_label_questionlist'),
-                        [
-                            $this->buildItemGroupForQuestionListSlate($url_builder, $action_token, $question_id_token)
-                        ]
-                    )
-                )
-            )
-        );
-    }
-
-    private function buildItemGroupForQuestionListSlate(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
-    ): ItemGroup {
-        return $this->ui_factory->item()->group(
-            '',
-            array_map(
-                fn(QuestionImplementation $v): StandardItem => $this->ui_factory->item()->standard(
-                    $v->toEditLink(
-                        $this->ui_factory->link(),
-                        $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
-                        $question_id_token
-                    )
-                ),
-                iterator_to_array($this->questions_repository->getAllQuestions())
-            )
-        );
-    }
-
-    private function buildEditStartView(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        URLBuilderToken $page_id_token,
-        QuestionImplementation $question
-    ): array {
-        return $question->getEditView(
-            $this->lng,
-            $this->current_user,
-            $this->ui_factory,
-            $this->refinery,
-            $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
-        )->edit(
-            $url_builder,
-            $step_token,
-            $page_id_token,
-            ''
-        );
-    }
-
-    private function buildCreateAnswerForm(
-        URLBuilder $url_builder
-    ): StandardForm {
-        $if = $this->ui_factory->input();
-        return $if->container()->form()->standard(
-            $url_builder->buildURI()->__toString(),
-            [
-                'form_type' => $if->field()->section(
-                    [
-                        $if->field()->select(
-                            $this->lng->txt('select_answer_form_type'),
-                            $this->answer_form_factory->getAnswerFormTypesArrayForSelect()
-                        )->withRequired(true)
-                    ],
-                    $this->lng->txt('create_answer_form')
-                )->withAdditionalTransformation(
-                    $this->refinery->custom()->transformation(
-                        fn(array $vs): ?Form => $this->answer_form_factory->buildTypeDefinitionFromSelectValue($vs[0])
-                    )
-                )
-            ]
-        )->withSubmitLabel($this->lng->txt('next'));
-    }
-
-    private function checkCapabilities(array $capabilities): void
-    {
-        foreach ($capabilities as $capability) {
-            if (!$this->questions_repository->capabilityExists($capability)) {
-                throw new \InvalidArgumentException('All provided capabilities must implement ILIAS\Questions\AnswerForm\Capabilities\Capability.');
-            }
-        }
+        return $form_inputs;
     }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/Editability.php b/components/ILIAS/Questions/src/Presentation/Definitions/Editability.php
index b8e8ce6a99d8..f7ca340fb0d8 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/Editability.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/Editability.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation;
+namespace ILIAS\Questions\Presentation\Definitions;
 
 enum Editability
 {
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php b/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
index e23e4217a684..55e80b2bc9a3 100755
--- a/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
@@ -18,48 +18,17 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\HTTP\Wrapper;
+namespace ILIAS\Questions\Presentation\Definitions;
 
-use ILIAS\Refinery\Transformation;
-
-/**
- * Class ArrayBasedRequestWrapper
- *
- * @author Fabian Schmid <fs@studer-raimann.ch>
- */
-class ArrayBasedRequestWrapper implements RequestWrapper
+class Leaf
 {
-    /**
-     * GetRequestWrapper constructor.
-     * @param mixed[] $raw_values
-     */
-    public function __construct(private array $raw_values)
-    {
-    }
-
-
-    /**
-     * @inheritDoc
-     */
-    public function retrieve(string $key, Transformation $transformation)
-    {
-        return $transformation->transform($this->raw_values[$key] ?? null);
-    }
-
-
-    /**
-     * @inheritDoc
-     */
-    public function has(string $key): bool
-    {
-        return isset($this->raw_values[$key]);
+    public function __construct(
+        private readonly mixed $value
+    ) {
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function keys(): array
+    public function get(): mixed
     {
-        return array_keys($this->raw_values);
+        return $this->value;
     }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/Definitions/QuestionsTable.php
index 39bb97834356..197d90742ae5 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/QuestionsTable.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/QuestionsTable.php
@@ -18,9 +18,10 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation;
+namespace ILIAS\Questions\Presentation\Definitions;
 
-use ILIAS\Questions\AnswerFormTypes\Factory as AnswerFormTypesFactory;
+use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Question\Persistence\Repository;
 use ILIAS\Data\Range;
 use ILIAS\Data\Order;
@@ -28,7 +29,9 @@
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
 use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Renderer as UIRenderer;
 use ILIAS\UI\Component\Input\Container\Filter\Standard as Filter;
+use Psr\Http\Message\ServerRequestInterface;
 
 class QuestionsTable implements Table\DataRetrieval
 {
@@ -36,7 +39,8 @@ public function __construct(
         private readonly UIFactory $ui_factory,
         private readonly \ilUIService $ui_service,
         private readonly \ilLanguage $lng,
-        private readonly AnswerFormTypesFactory $answer_form_type_factory,
+        private readonly ServerRequestInterface $request,
+        private readonly AnswerFormFactory $answer_form_factory,
         private readonly Repository $questions_repository,
         private readonly URLBuilder $url_builder,
         private readonly URLBuilderToken $action_token,
@@ -45,45 +49,12 @@ public function __construct(
         $lng->loadLanguageModule('qpl');
     }
 
-    public function getTable(): Table\Data
-    {
-        return $this->ui_factory->table()->data(
-            $this,
-            $this->lng->txt('questions'),
-            $this->getColums(),
-        );
-    }
-
-    public function getFilter(string $action): Filter
-    {
-        $question_type_options = [
-            '' => $this->lng->txt('filter_all_question_types')
-        ];
-
-        foreach ($this->answer_form_type_factory->getAvailableAnswerFormTypes() as $class => $type) {
-            $question_type_options[$class] = $type->getLabel($this->lng);
-        }
-
-        $field_factory = $this->ui_factory->input()->field();
-        $filter_inputs = [
-            'title' => $field_factory->text($this->lng->txt('title')),
-            'contains_type' => $field_factory->select($this->lng->txt('contains_type'), $question_type_options),
-        ];
-
-        $active = array_fill(0, count($filter_inputs), true);
-
-        $filter = $this->ui_service->filter()->standard(
-            'question_table_filter_id',
-            $action,
-            $filter_inputs,
-            $active,
-            true,
-            true
-        );
-        return $filter;
+    public function render(
+        UIRenderer $ui_renderer
+    ): string {
+        return $ui_renderer->render($this->buildContent());
     }
 
-
     public function getColums(): array
     {
         $f = $this->ui_factory->table()->column();
@@ -107,7 +78,10 @@ public function getRows(
             yield $question->toTableRow(
                 $row_builder,
                 $this->ui_factory,
-                $this->url_builder,
+                $this->url_builder->withParameter(
+                    $this->action_token,
+                    Edit::CMD_EDIT_QUESTION
+                ),
                 $this->row_id_token
             );
         }
@@ -120,4 +94,44 @@ public function getTotalRowCount(
     ): ?int {
         return 0;
     }
+
+    private function buildContent(): array
+    {
+        return [
+            $this->buildFilter($this->url_builder->buildURI()->__toString()),
+            $this->ui_factory->table()->data(
+                $this,
+                $this->lng->txt('questions'),
+                $this->getColums(),
+            )->withRequest($this->request)
+        ];
+    }
+
+    private function buildFilter(string $action): Filter
+    {
+        $question_type_options = [
+            '' => $this->lng->txt('filter_all_question_types')
+        ];
+
+        $field_factory = $this->ui_factory->input()->field();
+        $filter_inputs = [
+            'title' => $field_factory->text($this->lng->txt('title')),
+            'contains_type' => $field_factory->select(
+                $this->lng->txt('contains_type'),
+                $question_type_options + $this->answer_form_factory->getAnswerFormTypesArrayForSelect($this->lng)
+            ),
+        ];
+
+        $active = array_fill(0, count($filter_inputs), true);
+
+        $filter = $this->ui_service->filter()->standard(
+            'question_table_filter_id',
+            $action,
+            $filter_inputs,
+            $active,
+            true,
+            true
+        );
+        return $filter;
+    }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/LayoutProvider.php b/components/ILIAS/Questions/src/Presentation/Layout/LayoutProvider.php
index 6c48a4496a59..4d83083e2ed4 100755
--- a/components/ILIAS/Questions/src/Presentation/Layout/LayoutProvider.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/LayoutProvider.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation;
+namespace ILIAS\Questions\Presentation\Layout;
 
 use ILIAS\GlobalScreen\Scope\Layout\Factory\BreadCrumbsModification;
 use ILIAS\GlobalScreen\Scope\Layout\Factory\MainBarModification;
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 14a16b4c6037..16cb2ebab6e4 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -18,8 +18,13 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation;
+namespace ILIAS\Questions\Presentation\Views;
 
+use ILIAS\Questions\Presentation\Definitions\EditForm;
+use ILIAS\Questions\Presentation\Definitions\EditFormFactory;
+use ILIAS\Questions\Presentation\Definitions\Editability;
+use ILIAS\Questions\Presentation\Definitions\QuestionsTable;
+use ILIAS\Questions\Presentation\Layout\LayoutProvider;
 use ILIAS\Questions\AnswerForm\Definition;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
@@ -35,7 +40,6 @@
 use ILIAS\HTTP\Services as HTTP;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Renderer as UIRenderer;
-use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
 use ILIAS\UI\Component\Item\Standard as StandardItem;
 use ILIAS\UI\Component\Item\Group as ItemGroup;
 use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
@@ -49,10 +53,9 @@ class Edit
     private const string TOKEN_STRING_ACTION = 'a';
     private const string TOKEN_STRING_STEP = 's';
     private const string TOKEN_STRING_QUESTION_ID = 'q';
-    private const string TOKEN_STRING_PAGE_ID = 'p';
     private const string TOKEN_TYPE_HASH = 't';
     private const string CMD_CREATE_QUESTION = 'create';
-    private const string CMD_EDIT_QUESTION = 'edit';
+    public const string CMD_EDIT_QUESTION = 'edit';
     private const string CMD_CREATE_ANSWER_FORM = 'create_af';
     private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
 
@@ -73,7 +76,8 @@ public function __construct(
         private readonly DataFactory $data_factory,
         private readonly UuidFactory $uuid_factory,
         private readonly AnswerFormFactory $answer_form_factory,
-        private readonly Repository $questions_repository
+        private readonly Repository $questions_repository,
+        private readonly EditFormFactory $edit_form_factory
     ) {
 
     }
@@ -103,7 +107,7 @@ public function withOrderingEnabled(bool $enable): self
     public function view(
         \ilToolbarGUI $toolbar,
         URI $base_uri
-    ): array {
+    ): QuestionsTable|EditForm {
         [
             $url_builder,
             $action_token,
@@ -143,14 +147,12 @@ public function forwardPageCmds(
             0 => $url_builder,
             1 => $action_token,
             3 => $question_id_token,
-            4 => $page_id_token
         ] = $this->acquireURLBuilderAndParameters($base_uri);
 
         $this->initializeEditMode($url_builder, $action_token, $question_id_token);
 
         $question_id = $this->retrieveQuestionId($question_id_token);
-        $page_id = $this->retrievePageId($page_id_token);
-        $this->setParametersForQuestionCmds($question_id_token, $question_id->toString(), $page_id_token, $page_id);
+        $this->setParametersForQuestionCmds($question_id_token, $question_id->toString());
 
         $tpl->setContent(
             $this->ctrl->forwardCommand(
@@ -158,60 +160,77 @@ public function forwardPageCmds(
                     $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION)
                         ->withParameter($question_id_token, $question_id->toString())
                         ->buildURI(),
-                    $page_id
+                    $this,
+                    $this->questions_repository->getForQuestionId($question_id)
                 )
             )
         );
     }
 
     public function createAnswerForm(
-        URI $base_uri
-    ): array {
+        URI $base_uri,
+        QuestionImplementation $question,
+        \ilPCAnswerForm $content_obj
+    ): EditForm {
         [
             $url_builder,
             $action_token,
             $step_token,
             $question_id_token,
-            $page_id_token,
             $type_hash_token
         ] = $this->acquireURLBuilderAndParameters($base_uri);
-        $question_id = $this->retrieveQuestionId($question_id_token);
+
         $url_builder_with_params = $url_builder
-                ->withParameter($question_id_token, $question_id->toString())
-                ->withParameter($page_id_token, (string) $this->retrievePageId($page_id_token))
+                ->withParameter($question_id_token, $question->getId()->toString())
                 ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
 
         $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
         if ($answer_form_type_class_hash !== '') {
             return $this->forwardCreateAnswerFormCmd(
-                $this->answer_form_types_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
-                $this->answer_form_factory->getDefaultTypeGenericProperties($question_id),
                 $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
-                $step_token
+                $step_token,
+                $content_obj,
+                $this->answer_form_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
+                $this->answer_form_factory->getDefaultTypeGenericProperties($question->getId())
             );
         }
 
         return match($this->retrieveStringValueForToken($action_token)) {
             self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
                 $url_builder_with_params,
-                $action_token,
                 $step_token,
-                $type_hash_token
+                $type_hash_token,
+                $content_obj,
+                $this->answer_form_factory->getDefaultTypeGenericProperties($question->getId())
             ),
-            default => [$this->buildCreateAnswerForm(
-                $url_builder_with_params,
-                $action_token
-            )]
+            default => $this->buildCreateAnswerForm($url_builder_with_params)
         };
     }
 
     public function editAnswerForm(
-        URI $base_uri
-    ): array {
-        [$url_builder, $action_token] = $this->acquireURLBuilderAndParameters($base_uri);
+        URI $base_uri,
+        QuestionImplementation $question,
+        \ilPCAnswerForm $content_obj
+    ): EditForm|EditOverview {
+        [
+            $url_builder,
+            $action_token,
+            $step_token,
+            $question_id_token
+        ] = $this->acquireURLBuilderAndParameters($base_uri);
+
+        $url_builder_with_params = $url_builder
+                ->withParameter($question_id_token, $question->getId()->toString())
+                ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
+
         return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_EDIT_ANSWER_FORM => [$this->processCreateAnswerForm($url_builder, $action_token)],
-            default => [$this->buildCreateAnswerForm($url_builder, $action_token)]
+            self::CMD_EDIT_ANSWER_FORM => $this->processCreateAnswerForm($url_builder),
+            default => $this->forwardEditAnswerFormCmd(
+                $url_builder_with_params,
+                $step_token,
+                $content_obj,
+                $this->answer_form_factory->getDefaultTypeGenericProperties($question->getId())
+            )
         };
     }
 
@@ -221,10 +240,10 @@ private function createQuestion(
         URLBuilderToken $step_token,
         URLBuilderToken $question_id_token,
         URLBuilderToken $page_id_token
-    ): array {
+    ): EditForm {
         $this->initializeEditMode($url_builder, $action_token, $question_id_token);
 
-        $create = (new QuestionImplementation())->getEditView(
+        $create = $this->questions_repository->getNew()->getEditView(
             $this->lng,
             $this->current_user,
             $this->ui_factory,
@@ -235,16 +254,17 @@ private function createQuestion(
         )->create(
             $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION),
             $step_token,
-            $this->retrieveStringValueForToken($step_token)
+            $this->retrieveStringValueForToken($step_token),
+            $this->edit_form_factory
         );
 
-        if (is_array($create)) {
+        if ($create instanceof EditForm) {
             return $create;
         }
 
         $this->questions_repository->store($create);
         return $this->buildEditStartView(
-            $url_builder->withParameter($question_id_token, $create->getId()),
+            $url_builder->withParameter($question_id_token, $create->getId()->toString()),
             $step_token,
             $page_id_token,
             $create
@@ -258,7 +278,7 @@ private function editQuestion(
         URLBuilderToken $step_token,
         URLBuilderToken $question_id_token,
         URLBuilderToken $page_id_token
-    ): array {
+    ): EditForm {
         $this->initializeEditMode($url_builder, $action_token, $question_id_token);
 
         $question_id = $this->retrieveQuestionId($question_id_token);
@@ -277,10 +297,11 @@ private function editQuestion(
             $url_builder_with_row_id->withParameter($action_token, self::CMD_EDIT_QUESTION),
             $step_token,
             $page_id_token,
-            $this->retrieveStringValueForToken($step_token)
+            $this->retrieveStringValueForToken($step_token),
+            $this->edit_form_factory
         );
 
-        if (is_array($edit)) {
+        if ($edit instanceof EditForm) {
             return $edit;
         }
 
@@ -298,7 +319,7 @@ private function showTable(
         URLBuilder $url_builder,
         URLBuilderToken $action_token,
         URLBuilderToken $question_id_token
-    ): array {
+    ): QuestionsTable {
         $toolbar->addComponent(
             $this->ui_factory->button()->standard(
                 $this->lng->txt('create'),
@@ -306,58 +327,68 @@ private function showTable(
             )
         );
 
-        $table = new QuestionsTable(
+        return new QuestionsTable(
             $this->ui_factory,
             $this->ui_services,
             $this->lng,
-            $this->answer_form_types_factory,
+            $this->http->request(),
+            $this->answer_form_factory,
             $this->questions_repository,
-            $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
+            $url_builder,
             $action_token,
             $question_id_token
         );
-        return [
-            $table->getFilter($url_builder->buildURI()->__toString()),
-            $table->getTable()->withRequest($this->http->request())
-
-        ];
     }
 
     private function processCreateAnswerForm(
         URLBuilder $url_builder,
-        URLBuilderToken $action_token,
         URLBuilderToken $step_token,
-        URLBuilderToken $type_hash_token
-    ): array {
-        $form = $this->buildCreateAnswerForm(
-            $url_builder,
-            $action_token
-        )->withRequest($this->http->request());
+        URLBuilderToken $type_hash_token,
+        \ilPCAnswerForm $content_obj,
+        TypeGenericProperties $generic_answer_form_properties
+    ): EditForm {
+        $form = $this->buildCreateAnswerForm($url_builder)->withRequest($this->http->request());
 
         $data = $form->getData();
-        if ($data === null || $data['form_type'] === null) {
-            return [$form];
-        }
-
-        return $this->forwardCreateAnswerFormCmd(
-            $data['form_type'],
-            $url_builder->withParameter($type_hash_token, $this->answer_form_types_factory->getHashedClass($data['form_type']::class)),
-            $step_token
-        );
+        return $data === null
+            ? $form
+            : $this->forwardCreateAnswerFormCmd(
+                $url_builder->withParameter($type_hash_token, $this->answer_form_factory->getHashedClass($data::class)),
+                $step_token,
+                $content_obj,
+                $data,
+                $generic_answer_form_properties
+            );
     }
 
     private function forwardCreateAnswerFormCmd(
+        URLBuilder $url_builder,
+        URLBuilderToken $step_token,
+        \ilPCAnswerForm $content_obj,
         Definition $type,
         TypeGenericProperties $type_generic_properties,
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): array {
-        return $type->getEditView()->create(
-            $type->buildProperties($type_generic_properties, []),
+    ): ?EditForm {
+        $create = $type->getEditView()->create(
             $url_builder,
             $step_token,
-            $this->retrieveStringValueForToken($step_token)
+            $this->retrieveStringValueForToken($step_token),
+            $this->edit_form_factory,
+            $type->buildProperties($type_generic_properties, [])
         );
+
+        if ($create instanceof EditForm) {
+            return $create;
+        }
+
+        $this->questions_repository->store(
+            $this->questions_repository->getForQuestionId(
+                $create->getTypeGenericProperties()->getQuestionId()
+            )->withAnswerForm($create)
+        );
+        $content_obj->create($create->getAnswerFormId());
+        $content_obj->getPage()->update();
+
+        $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
     }
 
     private function acquireURLBuilderAndParameters(URI $base_uri): array
@@ -368,7 +399,6 @@ private function acquireURLBuilderAndParameters(URI $base_uri): array
                 self::TOKEN_STRING_ACTION,
                 self::TOKEN_STRING_STEP,
                 self::TOKEN_STRING_QUESTION_ID,
-                self::TOKEN_STRING_PAGE_ID,
                 self::TOKEN_TYPE_HASH
             );
     }
@@ -396,18 +426,6 @@ private function retrieveQuestionId(
         );
     }
 
-    public function retrievePageId(
-        URLBuilderToken $page_id_token
-    ): ?int {
-        return $this->http->wrapper()->query()->retrieve(
-            $page_id_token->getName(),
-            $this->refinery->byTrying([
-                $this->refinery->kindlyTo()->int(),
-                $this->refinery->always(null)
-            ])
-        );
-    }
-
     private function buildStringTrafo(): Transformation
     {
         return $this->refinery->byTrying([
@@ -441,20 +459,13 @@ private function initializeEditMode(
 
     private function setParametersForQuestionCmds(
         URLBuilderToken $question_id_token,
-        string $question_id,
-        URLBuilderToken $page_id_token,
-        int $page_id
+        string $question_id
     ): void {
         $this->ctrl->setParameterByClass(
             \QstsQuestionPageGUI::class,
             $question_id_token->getName(),
             $question_id
         );
-        $this->ctrl->setParameterByClass(
-            \QstsQuestionPageGUI::class,
-            $page_id_token->getName(),
-            $page_id
-        );
     }
 
     private function buildQuestionListSlate(
@@ -503,7 +514,7 @@ private function buildEditStartView(
         URLBuilderToken $step_token,
         URLBuilderToken $page_id_token,
         QuestionImplementation $question
-    ): array {
+    ): EditForm {
         return $question->getEditView(
             $this->lng,
             $this->current_user,
@@ -516,32 +527,32 @@ private function buildEditStartView(
             $url_builder,
             $step_token,
             $page_id_token,
-            ''
+            '',
+            $this->edit_form_factory
         );
     }
 
     private function buildCreateAnswerForm(
         URLBuilder $url_builder
-    ): StandardForm {
+    ): EditForm {
         $if = $this->ui_factory->input();
-        return $if->container()->form()->standard(
-            $url_builder->buildURI()->__toString(),
-            [
-                'form_type' => $if->field()->section(
-                    [
+        return $this->edit_form_factory->getEditForm(
+            $url_builder->buildURI(),
+            $if->field()->section(
+                [
                         $if->field()->select(
                             $this->lng->txt('select_answer_form_type'),
-                            $this->answer_form_factory->getAnswerFormTypesArrayForSelect()
+                            $this->answer_form_factory->getAnswerFormTypesArrayForSelect($this->lng)
                         )->withRequired(true)
                     ],
-                    $this->lng->txt('create_answer_form')
-                )->withAdditionalTransformation(
-                    $this->refinery->custom()->transformation(
-                        fn(array $vs): ?Form => $this->answer_form_factory->buildTypeDefinitionFromSelectValue($vs[0])
-                    )
+                $this->lng->txt('create_answer_form')
+            )->withAdditionalTransformation(
+                $this->refinery->custom()->transformation(
+                    fn(array $vs): ?Definition => $this->answer_form_factory->buildTypeDefinitionFromSelectValue($vs[0])
                 )
-            ]
-        )->withSubmitLabel($this->lng->txt('next'));
+            ),
+            false
+        );
     }
 
     private function checkCapabilities(array $capabilities): void
diff --git a/components/ILIAS/Questions/src/PublicInterface.php b/components/ILIAS/Questions/src/PublicInterface.php
index 6b089127b8ff..85370e839b29 100644
--- a/components/ILIAS/Questions/src/PublicInterface.php
+++ b/components/ILIAS/Questions/src/PublicInterface.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions;
 
-use ILIAS\Questions\Presentation\Edit;
+use ILIAS\Questions\Presentation\Views\Edit;
 
 class PublicInterface
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/ManipulateQuery.php b/components/ILIAS/Questions/src/Question/Persistence/ManipulateQuery.php
index 66880fdc2096..8651f5372fd1 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/ManipulateQuery.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/ManipulateQuery.php
@@ -26,41 +26,8 @@ class ManipulateQuery
     private array $columns = [];
     private array $values = [];
 
-    private ?float $available_points = null;
-    private ?int $image_size = null;
-    private ?bool $shuffle_answer_options = null;
-    private string $additional_text = '';
-
     public function __construct()
     {
         ;
     }
-
-    public function withAvailablePoints(float $available_points): self
-    {
-        $clone = clone $this;
-        $clone->available_points = $available_points;
-        return $clone;
-    }
-
-    public function withImageSize(int $image_size): self
-    {
-        $clone = clone $this;
-        $clone->image_size = $image_size;
-        return $clone;
-    }
-
-    public function withShuffleAnswerOptions(bool $shuffle_answer_options): self
-    {
-        $clone = clone $this;
-        $clone->shuffle_answer_options = $shuffle_answer_options;
-        return $clone;
-    }
-    public function withAddtionalText(string $additional_text): self
-    {
-        $clone = clone $this;
-        $clone->additional_text = $additional_text;
-        return $clone;
-    }
-
 }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Repository.php b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
index 94baea58a872..612464e2a11c 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
@@ -64,6 +64,13 @@ public function __construct(
     ) {
     }
 
+    public function getNew(): QuestionImplementation
+    {
+        return new QuestionImplementation(
+            $this->buildAvailableUuid()
+        );
+    }
+
     /**
      * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
      */
@@ -135,42 +142,34 @@ private function getForWhereClause(string $where): \Generator
      */
     public function store(
         QuestionImplementation|array $questions
-    ): array {
+    ): void {
         if ($questions instanceof QuestionImplementation) {
-            return [$this->storeQuestion($questions)];
+            $this->storeQuestion($questions);
+            return;
         }
 
-        return array_map(
+        array_map(
             fn(QuestionImplementation $v) => $this->storeQuestion($v),
             $questions
         );
     }
 
-    private function storeQuestion(QuestionImplementation $question): Uuid
+    private function storeQuestion(QuestionImplementation $question): void
     {
         if ($question->getPageId() === null) {
             $question = $question->withPageId($this->buildQuestionPage());
         }
 
-        if ($question->getId() === null) {
-            $question = $question->withQuestionId($this->buildAvailableUuid());
-            $this->db->insert(
-                self::QUESTION_TABLE,
-                $question->toStorage()
-            );
-            return $question->getId();
-        }
-        $this->db->update(
+        $this->db->replace(
             self::QUESTION_TABLE,
-            $question->toStorage(),
             [
                 'id' => [
                     \ilDBConstants::T_TEXT,
                     $question->getId()->toString()
                 ]
-            ]
+            ],
+            $question->toStorage()
         );
-        return $question->getId();
     }
 
     private function buildAvailableUuid(): Uuid
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index 25a623087044..0770686aba05 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\Question;
 
-use ILIAS\Questions\AnswerForm\Form;
+use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Uuid;
@@ -37,11 +37,14 @@
 
 class QuestionImplementation implements Question
 {
+    public bool $self_updated = false;
+    public array $updated_answer_forms = [];
+
     /**
      * @param array{string, \ILIAS\Questions\AnswerForm\Form} $answer_forms
      */
     public function __construct(
-        private ?Uuid $id = null,
+        private readonly Uuid $id,
         private ?int $page_id = null,
         private string $title = '',
         private string $author = '',
@@ -49,7 +52,7 @@ public function __construct(
         private string $remarks = '',
         private ?Uuid $original_id = null,
         private ?\DateTimeImmutable $last_update = null,
-        private ?\DateTimeImmutable $created = null,
+        private readonly ?\DateTimeImmutable $created = null,
         private array $answer_forms = [],
         private ?Taxonomies $taxonomies = null,
         private ?ContentForRecapitulation $content_for_recapitulation = null
@@ -61,13 +64,6 @@ public function getId(): ?Uuid
         return $this->id;
     }
 
-    public function withQuestionId(Uuid $question_id): self
-    {
-        $clone = clone $this;
-        $clone->id = $question_id;
-        return $clone;
-    }
-
     public function getPageId(): ?int
     {
         return $this->page_id;
@@ -77,6 +73,7 @@ public function withPageId(int $page_id): self
     {
         $clone = clone $this;
         $clone->page_id = $page_id;
+        $clone->self_updated = true;
         return $clone;
     }
 
@@ -89,6 +86,7 @@ public function withTitle(string $title): self
     {
         $clone = clone $this;
         $clone->title = $title;
+        $clone->self_updated = true;
         return $clone;
     }
 
@@ -101,6 +99,7 @@ public function withAuthor(string $author): self
     {
         $clone = clone $this;
         $clone->author = $author;
+        $clone->self_updated = true;
         return $clone;
     }
 
@@ -113,6 +112,7 @@ public function withLifecycle(Lifecycle $lifecycle): self
     {
         $clone = clone $this;
         $clone->lifecycle = $lifecycle;
+        $clone->self_updated = true;
         return $clone;
     }
 
@@ -125,6 +125,7 @@ public function withRemarks(string $remarks): self
     {
         $clone = clone $this;
         $clone->remarks = $remarks;
+        $clone->self_updated = true;
         return $clone;
     }
 
@@ -137,6 +138,7 @@ public function withOriginalId(Uuid $original_id): self
     {
         $clone = clone $this;
         $clone->original_id = $original_id;
+        $clone->self_updated = true;
         return $clone;
     }
 
@@ -150,26 +152,22 @@ public function getCreated(): ?\DateTimeImmutable
         return $this->created;
     }
 
-    public function withCreated(\DateTimeImmutable $created): self
-    {
-        $clone = clone $this;
-        $clone->created = $created;
-        return $clone;
-    }
-
     public function getAnswerForms(): array
     {
         return $this->answer_forms;
     }
 
-    public function getAnswerForm(Uuid $form_id): ?Form
+    public function getAnswerFormByIdString(string $form_id): ?AnswerFormProperties
     {
-        return $this->answer_forms[$form_id->toString()] ?? null;
+        return $this->answer_forms[$form_id] ?? null;
     }
 
-    public function withAnswerForm(Form $answer_form): self
+    public function withAnswerForm(AnswerFormProperties $answer_form): self
     {
-        $this->answer_forms[$answer_from->getId()->toString()] = $answer_form;
+        $clone = clone $this;
+        $clone->answer_forms[$answer_form->getAnswerFormId()->toString()] = $answer_form;
+        $clone->updated_answer_forms[] = $answer_form->getAnswerFormId();
+        return $clone;
     }
 
     /**
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index e1d9fcab1497..d93121e8c075 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -20,6 +20,8 @@
 
 namespace ILIAS\Questions\Question\Views;
 
+use ILIAS\Questions\Presentation\Definitions\EditForm;
+use ILIAS\Questions\Presentation\Definitions\EditFormFactory;
 use ILIAS\Questions\Question\Question;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
@@ -28,8 +30,8 @@
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
-use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
 use Psr\Http\Message\RequestInterface;
@@ -54,11 +56,20 @@ public function __construct(
     public function create(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
-        string $step
-    ): array|Question {
+        string $step,
+        EditFormFactory $edit_form_factory
+    ): EditForm|Question {
         return match ($step) {
-            self::CMD_SAVE_QUESTION => $this->onBasicPropertiesFormSubmission($url_builder, $step_token),
-            default => [$this->buildBasicPropertiesForm($url_builder, $step_token)]
+            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory
+            ),
+            default => $this->buildBasicPropertiesForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory
+            )
         };
     }
 
@@ -66,43 +77,55 @@ public function edit(
         URLBuilder $url_builder,
         URLBuilderToken $step_token,
         URLBuilderToken $page_id_token,
-        string $step
-    ): array|Question {
+        string $step,
+        EditFormFactory $edit_form_factory
+    ): EditForm|Question {
         return match ($step) {
-            self::CMD_SAVE_QUESTION => $this->onBasicPropertiesFormSubmission($url_builder, $step_token),
-            default => [
-                $this->buildBasicPropertiesForm($url_builder, $step_token),
+            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory
+            ),
+            default => $this->buildBasicPropertiesForm(
+                $url_builder,
+                $step_token,
+                $edit_form_factory
+            )->withContentAfterForm(
                 $this->buildPreviewPanel($url_builder, $page_id_token)
-            ]
+            )
         };
     }
 
     private function buildBasicPropertiesForm(
         URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): StandardForm {
-        return $this->ui_factory->input()->container()->form()->standard(
-            $url_builder->withParameter($step_token, self::CMD_SAVE_QUESTION)
-                ->buildURI()->__toString(),
-            $this->buildBasicPropertiesInputs()
+        URLBuilderToken $step_token,
+        EditFormFactory $edit_form_factory
+    ): EditForm {
+        return $edit_form_factory->getEditForm(
+            $url_builder->withParameter($step_token, self::CMD_SAVE_QUESTION)->buildURI(),
+            $this->buildBasicPropertiesInputs(),
+            true
         );
     }
 
-    private function onBasicPropertiesFormSubmission(
+    private function processBasicPropertiesForm(
         URLBuilder $url_builder,
-        URLBuilderToken $step_token
-    ): array|Question {
-        $form = $this->buildBasicPropertiesForm($url_builder, $step_token)
-            ->withRequest($this->request);
-        $data = $form->getData();
-        if ($data === null) {
-            return [$form];
-        }
+        URLBuilderToken $step_token,
+        EditFormFactory $edit_form_factory
+    ): EditForm|Question {
+        $form = $this->buildBasicPropertiesForm(
+            $url_builder,
+            $step_token,
+            $edit_form_factory
+        )->withRequest($this->request);
 
-        return $data['question'];
+        $data = $form->getData();
+        return $data === null
+            ? $form
+            : $data;
     }
 
-    private function buildBasicPropertiesInputs(): array
+    private function buildBasicPropertiesInputs(): Section
     {
         $ff = $this->ui_factory->input()->field();
         $section = $ff->section(
@@ -127,31 +150,30 @@ function (array $c, Lifecycle $v): array {
             $this->lng->txt('edit_basic_form_properties')
         )->withAdditionalTransformation($this->buildAddBasicPropertiesToQuestionTrafo());
 
-        return [
-            'question' => $section->withValue([
-                'title' => $this->question->getTitle(),
-                'author' => $this->question->getAuthor(),
-                'lifecycle' => $this->question->getLifecycle()->value,
-                'remarks' => $this->question->getRemarks()
-            ])
-        ];
+        return $section->withValue([
+            'title' => $this->question->getTitle(),
+            'author' => $this->question->getAuthor(),
+            'lifecycle' => $this->question->getLifecycle()->value,
+            'remarks' => $this->question->getRemarks()
+        ]);
     }
 
     private function buildAddBasicPropertiesToQuestionTrafo(): Transformation
     {
         return $this->refinery->custom()->transformation(
-            fn(array $vs): QuestionImplementation => new QuestionImplementation(
-                $this->question?->getId(),
-                $this->question?->getPageId(),
-                $vs['title'],
-                $vs['author'],
-                Lifecycle::tryFrom($vs['lifecycle']) ?? Lifecycle::Draft,
-                $vs['remarks'],
-                $this->question?->getOriginalId(),
-                $this->question?->getLastUpdate(),
-                $this->question?->getCreated(),
-                $this->question?->getAnswerForms() ?? []
-            )
+            function (array $vs): QuestionImplementation {
+                $question = $this->question
+                    ->withTitle($vs['title'])
+                    ->withAuthor($vs['author'])
+                    ->withRemarks($vs['remarks']);
+
+                $lifecycle = Lifecycle::tryFrom($vs['lifecycle']);
+                if ($lifecycle !== null) {
+                    return $question->withLifecycle($lifecycle);
+                }
+
+                return $question;
+            }
         );
     }
 

From 5feb0953b80c56262a116e136a7b39783391dbb9 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 19 Dec 2025 08:48:56 +0100
Subject: [PATCH 090/141] Implementing Cloze Question

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       |   9 +-
 .../PageEditor/class.ilPCAnswerForm.php       |   4 +
 .../PageEditor/class.ilPCAnswerFormGUI.php    |   2 +
 .../Questions/src/AnswerForm/Factory.php      |   5 +
 .../Questions/src/AnswerForm/Persistence.php  |   8 +-
 .../Questions/src/AnswerForm/Properties.php   |   4 +
 .../Questions/src/AnswerForm/Views/Edit.php   |  27 +-
 .../src/AnswerFormTypes/Cloze/Persistence.php |  59 ++--
 .../Properties/AnswerForm/Properties.php      |  12 +-
 .../Cloze/Properties/ClozeText/Text.php       |   2 +-
 .../Definitions/ScoringIdentical.php          |   6 +
 .../Cloze/Properties/Gaps/Gap.php             |   2 +-
 .../Cloze/Properties/Gaps/Gaps.php            |   2 +-
 .../Properties/Gaps/Properties/Properties.php |   2 +-
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 231 +++++-------
 .../Presentation/Definitions/EditOverview.php | 129 -------
 .../{ => Layout}/Definitions/CarryWrapper.php |   2 +-
 .../{ => Layout}/Definitions/EditForm.php     |   8 +-
 .../Layout/Definitions/EditOverview.php       |  94 +++++
 .../Layout/Definitions/Environment.php        |  37 ++
 .../Definitions/EnvironmentImplementation.php | 200 +++++++++++
 .../Definitions/Factory.php}                  |  29 +-
 .../{ => Layout}/Definitions/Leaf.php         |   2 +-
 .../Definitions/QuestionsTable.php            |  20 +-
 .../{ => GlobalScreen}/LayoutProvider.php     |   2 +-
 .../Questions/src/Presentation/Views/Edit.php | 329 +++++-------------
 .../src/Question/Persistence/Column.php       |  10 +-
 .../src/Question/Persistence/CoreTables.php   |  93 +++++
 .../src/Question/Persistence/Insert.php       | 103 ++++++
 .../src/Question/Persistence/Join.php         |   2 +-
 .../src/Question/Persistence/Manipulate.php   |  58 +++
 .../src/Question/Persistence/Operator.php     |   8 +-
 .../src/Question/Persistence/Order.php        |   2 +-
 .../{SelectQuery.php => Query.php}            |  52 ++-
 .../src/Question/Persistence/Repository.php   | 172 ++++-----
 .../src/Question/Persistence/Select.php       |   4 +-
 .../{ManipulateQuery.php => Storable.php}     |  11 +-
 .../src/Question/Persistence/Table.php        |  43 +++
 .../Question/Persistence/TableNameBuilder.php |  39 +--
 .../Question/Persistence/TableNameSpace.php   |   2 +-
 .../src/Question/Persistence/TableTypes.php   |  47 +++
 .../src/Question/Persistence/Update.php       |  91 +++++
 .../src/Question/Persistence/Value.php        |   5 +
 .../src/Question/Persistence/Where.php        |   2 +-
 .../ILIAS/Questions/src/Question/Question.php |   2 +-
 .../src/Question/QuestionImplementation.php   |  35 +-
 .../Questions/src/Question/Views/Edit.php     |  76 ++--
 .../src/Setup/ClozeQuestionTables.php         |  11 +-
 48 files changed, 1260 insertions(+), 835 deletions(-)
 delete mode 100644 components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php
 rename components/ILIAS/Questions/src/Presentation/{ => Layout}/Definitions/CarryWrapper.php (96%)
 rename components/ILIAS/Questions/src/Presentation/{ => Layout}/Definitions/EditForm.php (94%)
 create mode 100644 components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditOverview.php
 create mode 100644 components/ILIAS/Questions/src/Presentation/Layout/Definitions/Environment.php
 create mode 100644 components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php
 rename components/ILIAS/Questions/src/Presentation/{Definitions/EditFormFactory.php => Layout/Definitions/Factory.php} (73%)
 rename components/ILIAS/Questions/src/Presentation/{ => Layout}/Definitions/Leaf.php (92%)
 rename components/ILIAS/Questions/src/Presentation/{ => Layout}/Definitions/QuestionsTable.php (87%)
 rename components/ILIAS/Questions/src/Presentation/Layout/{ => GlobalScreen}/LayoutProvider.php (98%)
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/CoreTables.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Insert.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Manipulate.php
 rename components/ILIAS/Questions/src/Question/Persistence/{SelectQuery.php => Query.php} (76%)
 rename components/ILIAS/Questions/src/Question/Persistence/{ManipulateQuery.php => Storable.php} (77%)
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Table.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/TableTypes.php
 create mode 100644 components/ILIAS/Questions/src/Question/Persistence/Update.php

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 783ec2583f02..bb6fdf7339f2 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -25,7 +25,7 @@
 use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\Presentation\Views\Edit;
-use ILIAS\Questions\Presentation\Definitions\EditFormFactory;
+use ILIAS\Questions\Presentation\Layout\Definitions\Factory as DefinitionsFactory;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\DI\Container as ILIASContainer;
@@ -61,9 +61,10 @@ protected static function buildDIC(ILIASContainer $DIC): self
             new QuestionsRepository(
                 $DIC['ilDB'],
                 new UuidFactory(),
+                $c[AnswerFormFactory::class]
             );
-        $dic[EditFormFactory::class] = static fn($c): EditFormFactory =>
-            new EditFormFactory(
+        $dic[DefinitionsFactory::class] = static fn($c): DefinitionsFactory =>
+            new DefinitionsFactory(
                 $DIC['ui.factory'],
                 $DIC['lng']
             );
@@ -81,7 +82,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
             $c[UuidFactory::class],
             $c[AnswerFormFactory::class],
             $c[QuestionsRepository::class],
-            $c[EditFormFactory::class]
+            $c[DefinitionsFactory::class]
         );
 
         $dic[Cloze\Properties\ClozeText\Factory::class] = static fn($c): Cloze\Properties\ClozeText\Factory
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
index 5835d4626104..8881d2f112aa 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
@@ -41,6 +41,10 @@ public function modifyPageContentPostXsl(
         string $mode,
         bool $abstract_only = false
     ): string {
+        if ($this->pg_obj::class !== QstsQuestionPage::class) {
+            return $output;
+        }
+
         /** @var \ILIAS\Questions\Question\QuestionImplementation $question */
         $question = $this->pg_obj->getQuestion();
 
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
index a8e640d3ecbd..d46608aab8b1 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
@@ -72,6 +72,8 @@ public function insertCmd(): void
     public function editCmd(): void
     {
         $this->setInsertTabs();
+        $content_obj = new ilPCAnswerForm($this->pg_obj);
+        $content_obj->setHierId($this->hier_id);
         $this->tpl->setContent(
             $this->edit_view->editAnswerForm(
                 $this->data_factory->uri(
diff --git a/components/ILIAS/Questions/src/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerForm/Factory.php
index 6ff6ec1b1efa..a281dde81f12 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Factory.php
@@ -49,6 +49,11 @@ function (array $c, Definition $v) {
         );
     }
 
+    public function getAvailableDefinitions(): array
+    {
+        return array_values($this->available_answer_form_types);
+    }
+
     /**
      * @return array<string, \ILIAS\Questions\AnswerForm\Definition>
      */
diff --git a/components/ILIAS/Questions/src/AnswerForm/Persistence.php b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
index 9b046e733725..6d97fbe24c5e 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
@@ -21,16 +21,16 @@
 namespace ILIAS\Questions\AnswerForm;
 
 use ILIAS\Questions\Question\Persistence\Column;
-use ILIAS\Questions\Question\Persistence\SelectQuery;
+use ILIAS\Questions\Question\Persistence\Query;
 use ILIAS\Questions\Question\Persistence\TableNameBuilder;
 use ILIAS\Questions\Question\Persistence\TableNameSpace;
 
 interface Persistence
 {
     public function getPublicNameSpace(): TableNameSpace;
-    public function completeSelectQuery(
+    public function completeQuery(
         TableNameBuilder $table_name_builder,
-        SelectQuery $select_query,
+        Query $query,
         Column $base_table_id_column,
-    ): SelectQuery;
+    ): Query;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerForm/Properties.php
index d85e3a6dc339..2a558d7e79ef 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Properties.php
@@ -21,10 +21,14 @@
 namespace ILIAS\Questions\AnswerForm;
 
 use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
 
 interface Properties
 {
     public function getAnswerFormId(): ?Uuid;
     public function getQuestionId(): ?Uuid;
     public function getTypeGenericProperties(): TypeGenericProperties;
+    public function getBasicPropertiesForListing(
+        Language $lng
+    ): array;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
index c59dd1a30d62..4d76d2c80a98 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
@@ -21,34 +21,21 @@
 namespace ILIAS\Questions\AnswerForm\Views;
 
 use ILIAS\Questions\AnswerForm\Properties;
-use ILIAS\Questions\Presentation\Definitions\EditForm;
-use ILIAS\Questions\Presentation\Definitions\EditFormFactory;
-use ILIAS\UI\URLBuilder;
-use ILIAS\UI\URLBuilderToken;
+use ILIAS\Questions\Presentation\Layout\Definitions\EditForm;
+use ILIAS\Questions\Presentation\Layout\Definitions\EditOverview;
+use ILIAS\Questions\Presentation\Layout\Definitions\Environment;
 
 interface Edit
 {
     public function create(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        string $step,
-        EditFormFactory $edit_form_factory,
-        Properties $properties
+        Environment $environment
     ): EditForm|Properties;
 
     public function edit(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        string $step,
-        EditFormFactory $edit_form_factory,
-        Properties $properties
-    ): EditForm|Properties;
+        Environment $environment
+    ): EditOverview|EditForm|Properties;
 
     public function other(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        string $cmd,
-        EditFormFactory $edit_form_factory,
-        Properties $properties,
+        Environment $environment
     ): EditForm|Properties;
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
index 80f03cba1607..8789adabaa70 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
@@ -21,7 +21,8 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze;
 
 use ILIAS\Questions\AnswerForm\Persistence as PersistenceInterface;
-use ILIAS\Questions\Question\Persistence\SelectQuery;
+use ILIAS\Questions\Question\Persistence\TableTypes;
+use ILIAS\Questions\Question\Persistence\Query;
 use ILIAS\Questions\Question\Persistence\Join;
 use ILIAS\Questions\Question\Persistence\Column;
 use ILIAS\Questions\Question\Persistence\JoinType;
@@ -34,26 +35,30 @@ class Persistence implements PersistenceInterface
 {
     private const string ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
     private const array ANSWER_FORM_TABLE_COLUMNS = [
-        'case_sensitive',
-        'identical_responses_valid',
-        'max_chars',
-        'min_auto_complete'
+        'scoring_identical_responses',
+        'combinations_activated'
     ];
 
     private const string ANSWER_INPUTS_TABLE_ID_COLUMN = 'id';
     private const string ANSWER_INPUTS_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
     private const array ANSWER_INPUTS_TABLE_COLUMNS = [
         'id AS answer_input_id',
+        'position',
         'gap_type',
-        'max_chars'
+        'max_chars',
+        'step_size',
+        'text_matching_method',
+        'shuffle_answer_options'
     ];
 
     private const string ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN = 'answer_input_id';
     private const array ANSWER_OPTIONS_TABLE_COLUMNS = [
         'id AS answer_option_id',
         'position',
-        'value',
-        'points'
+        'text_value',
+        'points',
+        'lower_limit',
+        'upper_limit'
     ];
 
     private const string COMBINATIONS_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
@@ -73,67 +78,77 @@ public function getPublicNameSpace(): TableNameSpace
         return $this->table_namespace;
     }
 
-    public function completeSelectQuery(
+    public function completeQuery(
         TableNameBuilder $table_name_builder,
-        SelectQuery $select_query,
+        Query $query,
         Column $base_table_id_column
-    ): SelectQuery {
-        return $select_query->withAdditionalJoin(
+    ): Query {
+        $answer_form_specific_table = TableTypes::TypeSpecificAnswerForms
+            ->getTable($table_name_builder);
+        $answer_input_table = TableTypes::AnswerInputs
+            ->getTable($table_name_builder);
+        $answer_options_table = TableTypes::AnswerOptions
+            ->getTable($table_name_builder);
+        $combinations_table = TableTypes::Additional
+            ->getTable($table_name_builder, 'combinations');
+
+        return $query->withAdditionalJoin(
             new Join(
                 $base_table_id_column,
                 new Column(
-                    $table_name_builder->getTypeSpecificAnswerFormsTableName(),
+                    $answer_form_specific_table,
                     self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
-                )
+                ),
+                JoinType::Left
             )
         )->withAdditionalSelect(
             new Select(
-                $table_name_builder->getTypeSpecificAnswerFormsTableName(),
+                $answer_form_specific_table,
                 self::ANSWER_FORM_TABLE_COLUMNS
             )
         )->withAdditionalJoin(
             new Join(
                 $base_table_id_column,
                 new Column(
-                    $table_name_builder->getAnswerInputsTableName(),
+                    $answer_input_table,
                     self::ANSWER_INPUTS_TABLE_FOREIGN_KEY_COLUMN
                 ),
                 JoinType::Left
             )
         )->withAdditionalSelect(
             new Select(
-                $table_name_builder->getAnswerInputsTableName(),
+                $answer_input_table,
                 self::ANSWER_INPUTS_TABLE_COLUMNS
             )
         )->withAdditionalJoin(
             new Join(
                 new Column(
-                    $table_name_builder->getAnswerInputsTableName(),
+                    $answer_input_table,
                     self::ANSWER_INPUTS_TABLE_ID_COLUMN
                 ),
                 new Column(
-                    $table_name_builder->getAnswerOptionsTableName(),
+                    $answer_options_table,
                     self::ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN
                 ),
                 JoinType::Left
             )
         )->withAdditionalSelect(
             new Select(
-                $table_name_builder->getAnswerOptionsTableName(),
+                $answer_options_table,
                 self::ANSWER_OPTIONS_TABLE_COLUMNS
             )
         )->withAdditionalJoin(
             new Join(
                 $base_table_id_column,
                 new Column(
-                    $table_name_builder->getAdditionalTableName('combinations'),
+                    $combinations_table,
                     self::COMBINATIONS_TABLE_FOREIGN_KEY_COLUMN
                 ),
                 JoinType::Left
             )
         )->withAdditionalSelect(
             new Select(
-                $table_name_builder->getAdditionalTableName('combinations'),
+                $combinations_table,
                 self::COMBINATIONS_TABLE_COLUMNS
             )
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
index 6eb5ef36c89f..b62ea994ed55 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
@@ -27,7 +27,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
-use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
+use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -133,6 +133,16 @@ public function withGaps(Gaps $gaps): self
         return $clone;
     }
 
+    public function getBasicPropertiesForListing(Language $lng): array
+    {
+        return [
+            $lng->txt('cloze_text') => $this->cloze_text
+                ->getRenderedMarkdownForEditingPresentation($this->gaps),
+            $lng->txt('score_identical') => $this->scoring_identical
+                ->getTranslatedOptionName($lng)
+        ];
+    }
+
     public function buildBasicEditingInputs(
         Language $lng,
         FieldFactory $ff,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index cb492e25e1b4..3bb2bed3321b 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -74,7 +74,7 @@ public function getRawRepresentationForPersistence(): string
         return $this->cloze_text->getRawRepresentation();
     }
 
-    public function getRenderedMarkdown(
+    public function getRenderedMarkdownForEditingPresentation(
         Gaps $gaps
     ): string {
         return $this->mustache_engine->render(
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php
index 19e3c1f9a30f..a67115f323e3 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php
@@ -30,6 +30,12 @@ enum ScoringIdentical: string
     case ScoreAll = 'score_all';
     case OnlyScoreDistinct = 'score_distinct';
 
+    public function getTranslatedOptionName(
+        Language $lng
+    ): string {
+        return $lng->txt($this->value);
+    }
+
     public static function buildInput(
         Language $lng,
         FieldFactory $ff,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index 83fca45023b8..5cbc2b73cd3c 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -21,7 +21,7 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
-use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
+use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index caa32f048226..6585d277ae40 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
+use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php
index af03b913a120..3c7d8ebfad70 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php
@@ -21,7 +21,7 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
 
 use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
-use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
+use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 029b91f95416..76e1aa301b34 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -20,24 +20,23 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
 
-use ILIAS\Questions\AnswerForm\Properties as PropertiesInterface;
 use ILIAS\Questions\AnswerForm\Views\Edit as EditViewInterface;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
-use ILIAS\Questions\Presentation\Definitions\EditForm;
-use ILIAS\Questions\Presentation\Definitions\EditFormFactory;
+use ILIAS\Questions\Presentation\Layout\Definitions\Environment;
+use ILIAS\Questions\Presentation\Layout\Definitions\EditForm;
+use ILIAS\Questions\Presentation\Layout\Definitions\EditOverview;
 use ILIAS\HTTP\Services as HTTPServices;
 use ILIAS\Language\Language;
-use ILIAS\UI\URLBuilder;
-use ILIAS\UI\URLBuilderToken;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\Refinery\Factory as Refinery;
 
 class Edit implements EditViewInterface
 {
+    private const string STEP_EDIT_BASIC_PROPERTIES = 'ebp';
     private const string STEP_SET_GAP_TYPES = 'sgt';
     private const string STEP_SET_ANSWER_OPTIONS = 'sao';
     private const string STEP_SET_POINTS = 'sap';
@@ -55,107 +54,95 @@ public function __construct(
     }
 
     public function create(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        string $step,
-        EditFormFactory $edit_form_factory,
-        PropertiesInterface $properties
+        Environment $environment
     ): EditForm|Properties {
-        return match($step) {
+        return match($environment->getStep()) {
             self::STEP_SET_GAP_TYPES => $this->processBasicEditingForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory,
-                $properties->withValuesFromCarry(
-                    $this->refinery,
-                    $this->cloze_text_factory,
-                    $this->gap_factory,
-                    $edit_form_factory->getCarrySectionData(
-                        $this->http->wrapper()->post(),
-                        $this->refinery
+                $environment->withProperties(
+                    $environment->getProperties()->withValuesFromCarry(
+                        $this->refinery,
+                        $this->cloze_text_factory,
+                        $this->gap_factory,
+                        $environment->getDefinitionsFactory()->getCarrySectionData(
+                            $this->http->wrapper()->post(),
+                            $this->refinery
+                        )
                     )
                 )
             ),
             self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory,
-                $properties->withValuesFromCarry(
-                    $this->refinery,
-                    $this->cloze_text_factory,
-                    $this->gap_factory,
-                    $edit_form_factory->getCarrySectionData(
-                        $this->http->wrapper()->post(),
-                        $this->refinery
+                $environment->withProperties(
+                    $environment->getProperties()->withValuesFromCarry(
+                        $this->refinery,
+                        $this->cloze_text_factory,
+                        $this->gap_factory,
+                        $environment->getDefinitionsFactory()->getCarrySectionData(
+                            $this->http->wrapper()->post(),
+                            $this->refinery
+                        )
                     )
                 )
             ),
             self::STEP_SET_POINTS => $this->processAnswerOptionsForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory,
-                $properties->withValuesFromCarry(
-                    $this->refinery,
-                    $this->cloze_text_factory,
-                    $this->gap_factory,
-                    $edit_form_factory->getCarrySectionData(
-                        $this->http->wrapper()->post(),
-                        $this->refinery
+                $environment->withProperties(
+                    $environment->getProperties()->withValuesFromCarry(
+                        $this->refinery,
+                        $this->cloze_text_factory,
+                        $this->gap_factory,
+                        $environment->getDefinitionsFactory()->getCarrySectionData(
+                            $this->http->wrapper()->post(),
+                            $this->refinery
+                        )
                     )
                 )
             ),
             self::STEP_SAVE => $this->processAssignPointsForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory,
-                $properties->withValuesFromCarry(
-                    $this->refinery,
-                    $this->cloze_text_factory,
-                    $this->gap_factory,
-                    $edit_form_factory->getCarrySectionData(
-                        $this->http->wrapper()->post(),
-                        $this->refinery
+                $environment->withProperties(
+                    $environment->getProperties()->withValuesFromCarry(
+                        $this->refinery,
+                        $this->cloze_text_factory,
+                        $this->gap_factory,
+                        $environment->getDefinitionsFactory()->getCarrySectionData(
+                            $this->http->wrapper()->post(),
+                            $this->refinery
+                        )
                     )
                 )
             ),
-            default => $this->buildBasicEditingForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory,
-                $properties
-            )
+            default => $this->buildBasicEditingForm($environment)
         };
     }
 
     public function edit(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        string $step,
-        EditFormFactory $edit_form_factory,
-        PropertiesInterface $properties,
-    ): EditForm|Properties {
-
+        Environment $environment
+    ): EditOverview|EditForm|Properties {
+        return match ($step) {
+            default => $this->buildEditingOverview($environment)
+        };
     }
 
     public function other(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        string $step,
-        EditFormFactory $edit_form_factory,
-        PropertiesInterface $properties
+        Environment $environment
     ): EditForm|Properties {
 
     }
 
+    private function buildEditingOverview(
+        Environment $environment
+    ): EditOverview {
+        return $environment->getDefinitionsFactory()->getEditOverview(
+            $environment->getEditability(),
+            $environment->getUrlBuilderWithStepParameter(self::STEP_EDIT_BASIC_PROPERTIES),
+            $environment->getProperties()
+        );
+    }
+
     private function buildBasicEditingForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        EditFormFactory $edit_form_factory,
-        Properties $properties
+        Environment $environment
     ): EditForm {
-        return $edit_form_factory->getEditForm(
-            $url_builder->withParameter($step_token, self::STEP_SET_GAP_TYPES)->buildURI(),
-            $properties->buildBasicEditingInputs(
+        return $environment->getDefinitionsFactory()->getEditForm(
+            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_GAP_TYPES),
+            $environment->getProperties()->buildBasicEditingInputs(
                 $this->lng,
                 $this->ui_factory->input()->field(),
                 $this->refinery,
@@ -167,38 +154,27 @@ private function buildBasicEditingForm(
     }
 
     private function processBasicEditingForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        EditFormFactory $edit_form_factory,
-        Properties $properties
+        Environment $environment
     ): EditForm {
         $form = $this->buildBasicEditingForm(
-            $url_builder,
-            $step_token,
-            $edit_form_factory,
-            $properties
+            $environment
         )->withRequest($this->http->request());
 
         $data = $form->getData();
         return $data === null
             ? $form
             : $this->buildGapTypesForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory,
-                $data
+                $environment->withProperties($data)
             );
     }
 
     private function buildGapTypesForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        EditFormFactory $edit_form_factory,
-        Properties $properties
+        Environment $environment
     ): EditForm {
+        $properties = $environment->getProperties();
         $ff = $this->ui_factory->input()->field();
-        return $edit_form_factory->getEditForm(
-            $url_builder->withParameter($step_token, self::STEP_SET_ANSWER_OPTIONS)->buildURI(),
+        return $environment->getDefinitionsFactory()->getEditForm(
+            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_ANSWER_OPTIONS),
             $properties->getGaps()->buildGapsTypeInputs(
                 $this->lng,
                 $ff,
@@ -214,38 +190,29 @@ private function buildGapTypesForm(
     }
 
     private function processGapTypesForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        EditFormFactory $edit_form_factory,
-        Properties $properties,
+        Environment $environment
     ): EditForm {
         $form = $this->buildGapTypesForm(
-            $url_builder,
-            $step_token,
-            $edit_form_factory,
-            $properties
+            $environment
         )->withRequest($this->http->request());
 
         $data = $form->getData();
         return $data === null
             ? $form
             : $this->buildAnswerOptionsForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory,
-                $properties->withGaps($data)
+                $environment->withProperties(
+                    $environment->getProperties()->withGaps($data)
+                )
             );
     }
 
     private function buildAnswerOptionsForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        EditFormFactory $edit_form_factory,
-        Properties $properties
+        Environment $environment
     ): EditForm {
+        $properties = $environment->getProperties();
         $ff = $this->ui_factory->input()->field();
-        return $edit_form_factory->getEditForm(
-            $url_builder->withParameter($step_token, self::STEP_SET_POINTS)->buildURI(),
+        return $environment->getDefinitionsFactory()->getEditForm(
+            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_POINTS),
             $properties->getGaps()->buildAnswerOptionsInputs($this->lng, $ff, $this->refinery),
             false,
             $properties->buildCarryInputs($ff)
@@ -255,38 +222,29 @@ private function buildAnswerOptionsForm(
     }
 
     private function processAnswerOptionsForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        EditFormFactory $edit_form_factory,
-        Properties $properties
+        Environment $environment
     ): EditForm {
         $form = $this->buildAnswerOptionsForm(
-            $url_builder,
-            $step_token,
-            $edit_form_factory,
-            $properties
+            $environment
         )->withRequest($this->http->request());
 
         $data = $form->getData();
         return $data === null
             ? $form
             : $this->buildAssignPointsForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory,
-                $properties->withGaps($data)
+                $environment->withProperties(
+                    $environment->getProperties()->withGaps($data)
+                )
             );
     }
 
     private function buildAssignPointsForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        EditFormFactory $edit_form_factory,
-        Properties $properties
+        Environment $environment
     ): EditForm {
+        $properties = $environment->getProperties();
         $ff = $this->ui_factory->input()->field();
-        return $edit_form_factory->getEditForm(
-            $url_builder->withParameter($step_token, self::STEP_SAVE)->buildURI(),
+        return $environment->getDefinitionsFactory()->getEditForm(
+            $environment->getUrlBuilderWithStepParameter(self::STEP_SAVE),
             $properties->getGaps()->buildPointInputs($this->lng, $ff, $this->refinery),
             true,
             $properties->buildCarryInputs($ff)
@@ -296,18 +254,13 @@ private function buildAssignPointsForm(
     }
 
     private function processAssignPointsForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        EditFormFactory $edit_form_factory,
-        Properties $properties
+        Environment $environment
     ): EditForm|Properties {
         $form = $this->buildAssignPointsForm(
-            $url_builder,
-            $step_token,
-            $edit_form_factory,
-            $properties
+            $environment
         )->withRequest($this->http->request());
 
+        $properties = $environment->getProperties();
         $data = $form->getData();
         return $data === null
             ? $form->withContentBeforeForm(
@@ -321,7 +274,7 @@ private function buildClozeTextPanel(
         return $this->ui_factory->panel()->standard(
             $this->lng->txt('cloze_text'),
             $this->ui_factory->legacy()->content(
-                $properties->getClozeText()->getRenderedMarkdown(
+                $properties->getClozeText()->getRenderedMarkdownForEditingPresentation(
                     $properties->getGaps()
                 )
             )
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php b/components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php
deleted file mode 100644
index f854f1df63a7..000000000000
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EditOverview.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\Presentation\Definitions;
-
-use ILIAS\Data\URI;
-use ILIAS\Language\Language;
-use ILIAS\UI\Component\Input\Container\Form\Factory as FormFactory;
-use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
-use ILIAS\UI\Component\Input\Field\Section;
-use ILIAS\UI\Component\Input\Field\Group;
-use ILIAS\UI\Component\Panel\Standard as StandardPanel;
-use ILIAS\UI\Renderer as UIRenderer;
-use Psr\Http\Message\ServerRequestInterface;
-
-class EditOverview
-{
-    private StandardForm $form;
-
-    private ?StandardPanel $content_before_form = null;
-    private ?StandardPanel $content_after_form = null;
-
-    public function __construct(
-        private readonly FormFactory $form_factory,
-        private readonly Language $lng,
-        private readonly URI $target_uri,
-        private readonly Section $main_section_inputs,
-        private readonly bool $is_final_step,
-        private readonly ?Group $carry_inputs
-    ) {
-        $this->form = $this->buildForm();
-    }
-
-    public function withContentBeforeForm(StandardPanel $content): self
-    {
-        $clone = clone $this;
-        $clone->content_before_form = $content;
-        return $clone;
-    }
-
-    public function withContentAfterForm(StandardPanel $content): self
-    {
-        $clone = clone $this;
-        $clone->content_after_form = $content;
-        return $clone;
-    }
-
-    public function render(
-        UIRenderer $ui_renderer
-    ): string {
-        return $ui_renderer->render($this->buildContent());
-    }
-
-    public function withRequest(
-        ServerRequestInterface $request
-    ): self {
-        $clone = clone $this;
-        $clone->form = $clone->form->withRequest($request);
-        return $clone;
-    }
-
-    public function getData(): mixed
-    {
-        $data = $this->form->getData();
-        return $data[self::MAIN_SECTION_NAME] ?? null;
-    }
-
-    private function buildContent(): array
-    {
-        $content = [];
-
-        if ($this->content_before_form !== null) {
-            $content[] = $this->content_before_form;
-        }
-
-        $content[] = $this->form;
-
-        if ($this->content_after_form !== null) {
-            $content[] = $this->content_after_form;
-        }
-
-        return $content;
-    }
-
-    private function buildForm(): StandardForm
-    {
-        $form = $this->form_factory->standard(
-            $this->target_uri->__toString(),
-            $this->buildFormInputs()
-        );
-
-        if ($this->is_final_step) {
-            return $form->withSubmitLabel($this->lng->txt('save'));
-        }
-
-        return $form->withSubmitLabel($this->lng->txt('next'));
-    }
-
-    private function buildFormInputs(): array
-    {
-        $form_inputs = [
-            self::MAIN_SECTION_NAME => $this->main_section_inputs
-        ];
-
-        if ($this->carry_inputs !== null) {
-            $form_inputs[self::CARRY_SECTION_NAME] = $this->carry_inputs
-                ->withDedicatedName(self::CARRY_SECTION_NAME);
-        }
-
-        return $form_inputs;
-    }
-}
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/CarryWrapper.php
similarity index 96%
rename from components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
rename to components/ILIAS/Questions/src/Presentation/Layout/Definitions/CarryWrapper.php
index 9c2762194748..87a4328128a4 100755
--- a/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/CarryWrapper.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Definitions;
+namespace ILIAS\Questions\Presentation\Layout\Definitions;
 
 use ILIAS\Refinery\Transformation;
 
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EditForm.php b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditForm.php
similarity index 94%
rename from components/ILIAS/Questions/src/Presentation/Definitions/EditForm.php
rename to components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditForm.php
index 035e81c01873..dfe92b2075b8 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EditForm.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditForm.php
@@ -18,15 +18,15 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Definitions;
+namespace ILIAS\Questions\Presentation\Layout\Definitions;
 
-use ILIAS\Data\URI;
 use ILIAS\Language\Language;
 use ILIAS\UI\Component\Input\Container\Form\Factory as FormFactory;
 use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\UI\URLBuilder;
 use ILIAS\UI\Renderer as UIRenderer;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -43,7 +43,7 @@ class EditForm
     public function __construct(
         private readonly FormFactory $form_factory,
         private readonly Language $lng,
-        private readonly URI $target_uri,
+        private readonly URLBuilder $url_builder,
         private readonly Section $main_section_inputs,
         private readonly bool $is_final_step,
         private readonly ?Group $carry_inputs
@@ -105,7 +105,7 @@ private function buildContent(): array
     private function buildForm(): StandardForm
     {
         $form = $this->form_factory->standard(
-            $this->target_uri->__toString(),
+            $this->url_builder->buildURI()->__toString(),
             $this->buildFormInputs()
         );
 
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditOverview.php b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditOverview.php
new file mode 100644
index 000000000000..eee4451940e2
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditOverview.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation\Layout\Definitions;
+
+use ILIAS\Questions\AnswerForm\Properties;
+use ILIAS\Language\Language;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\UI\Renderer as UIRenderer;
+use Psr\Http\Message\ServerRequestInterface;
+
+class EditOverview
+{
+    private bool $orderable = false;
+
+    public function __construct(
+        private readonly UIFactory $ui_factory,
+        private readonly Language $lng,
+        private readonly Editability $editability,
+        private readonly URLBuilder $url_builder,
+        private readonly Properties $answer_form_properties
+    ) {
+        $this->form = $this->buildForm();
+    }
+
+    public function render(
+        UIRenderer $ui_renderer
+    ): string {
+        return $ui_renderer->render($this->buildContent());
+    }
+
+    public function withRequest(
+        ServerRequestInterface $request
+    ): self {
+        $clone = clone $this;
+        $clone->form = $clone->form->withRequest($request);
+        return $clone;
+    }
+
+    public function withOrderable(bool $orderable): self
+    {
+        $clone = clone $this;
+        $clone->orderable = $orderable;
+        return $clone;
+    }
+
+    private function buildContent(): array
+    {
+        return [
+            $this->buildBasicAnswerFormPanel(),
+            $this->answer_form_properties->getOverviewTable()
+        ];
+    }
+
+    private function buildBasicAnswerFormPanel(): StandardPanel
+    {
+        $content = [
+            $this->ui_factory->listing()->descriptive(
+                $this->answer_form_properties->getBasicPropertiesForListing($this->lng)
+            )
+        ];
+
+        if ($this->editability === Editability::Full) {
+            $content[] = $this->ui_factory->button()->standard(
+                $this->lng->txt('edit_basic_answer_form_properties'),
+                $this->url_builder->buildURI()->__toString()
+            );
+        }
+
+        return $this->ui_factory->panel()->standard(
+            $this->lng->txt('basic_answer_form_properites'),
+            $content
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Environment.php b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Environment.php
new file mode 100644
index 000000000000..151bfd712cee
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Environment.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation\Layout\Definitions;
+
+use ILIAS\Questions\AnswerForm\Properties;
+use ILIAS\Questions\Presentation\Definitions\Editability;
+use ILIAS\UI\URLBuilder;
+
+interface Environment
+{
+    public function getDefinitionsFactory(): Factory;
+    public function getUrlBuilder(): URLBuilder;
+    public function getUrlBuilderWithStepParameter(string $step): URLBuilder;
+    public function getStep(): string;
+    public function withDefaultStep(): self;
+    public function getEditability(): Editability;
+    public function getProperties(): ?Properties;
+    public function withProperties(Properties $properties): self;
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php
new file mode 100644
index 000000000000..ac538405df51
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation\Layout\Definitions;
+
+use ILIAS\Questions\AnswerForm\Properties;
+use ILIAS\Questions\Presentation\Definitions\Editability;
+use ILIAS\Data\URI;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\HTTP\Services as HTTPServices;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
+
+class EnvironmentImplementation implements Environment
+{
+    private const array QUERY_PARAMETER_NAME_SPACE = ['q'];
+    private const string TOKEN_STRING_ACTION = 'a';
+    private const string TOKEN_STRING_STEP = 's';
+    private const string TOKEN_STRING_QUESTION_ID = 'q';
+    private const string TOKEN_TYPE_HASH = 't';
+
+    private ?Properties $properties = null;
+
+    private bool $default_step = false;
+
+    private URLBuilder $url_builder;
+    private readonly URLBuilderToken $action_token;
+    private readonly URLBuilderToken $step_token;
+    private readonly URLBuilderToken $question_id_token;
+    private readonly URLBuilderToken $type_hash_token;
+
+    public function __construct(
+        private readonly \ilCtrl $ctrl,
+        private readonly HTTPServices $http,
+        private readonly Refinery $refinery,
+        private readonly UuidFactory $uuid_factory,
+        private readonly Factory $definitions_factory,
+        private readonly Editability $editability,
+        URI $base_uri
+    ) {
+        $this->acquireURLBuilderAndParameters($base_uri);
+    }
+
+    public function getDefinitionsFactory(): Factory
+    {
+        return $this->definitions_factory;
+    }
+
+    public function getUrlBuilder(): URLBuilder
+    {
+        return $this->url_builder;
+    }
+
+    public function getUrlBuilderWithStepParameter(string $step): URLBuilder
+    {
+        return $this->getUrlBuilder()->withParameter($this->step_token, $step);
+    }
+
+    public function withDefaultStep(): self
+    {
+        $clone = clone $this;
+        $clone->default_step = true;
+        return $clone;
+    }
+
+    public function getStep(): string
+    {
+        return $this->default_step
+            ? ''
+            : $this->retrieveStringValueForToken($this->step_token, self::TOKEN_STRING_STEP);
+    }
+
+    public function getEditability(): Editability
+    {
+        return $this->editability;
+    }
+
+    public function getProperties(): ?Properties
+    {
+        return $this->properties;
+    }
+
+    public function withProperties(Properties $properties): self
+    {
+        $clone = clone $this;
+        $clone->properties = $properties;
+        return $clone;
+    }
+
+    public function getAction(): string
+    {
+        return $this->retrieveStringValueForToken($this->action_token);
+    }
+
+    public function withActionParameter(string $action): self
+    {
+        $clone = clone $this;
+        $clone->url_builder = $this->url_builder
+            ->withParameter($this->action_token, $action);
+        return $clone;
+    }
+
+    public function withQuestionIdParameter(Uuid $question_id): self
+    {
+        $clone = clone $this;
+        $clone->url_builder = $this->url_builder
+            ->withParameter($this->question_id_token, $question_id->toString());
+        return $clone;
+    }
+
+    public function withAnswerFormTypeHashParameter(string $type_hash): URLBuilder
+    {
+        $clone = clone $this;
+        $clone->url_builder = $this->url_builder
+            ->withParameter($this->type_hash_token, $type_hash);
+        return $clone;
+    }
+
+    public function getQuestionId(): ?Uuid
+    {
+        return $this->http->wrapper()->query()->retrieve(
+            $this->question_id_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->custom()->transformation(
+                    fn($v): Uuid => $this->uuid_factory->fromString($v)
+                ),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
+    public function getTypeClassHast(): string
+    {
+        return $this->retrieveStringValueForToken($this->type_hash_token);
+    }
+
+    public function setParametersForQuestionCmds(): void
+    {
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            $this->question_id_token->getName(),
+            $this->getQuestionId()->toString()
+        );
+    }
+
+    private function acquireURLBuilderAndParameters(URI $base_uri): void
+    {
+        [
+            $this->url_builder,
+            $this->action_token,
+            $this->step_token,
+            $this->question_id_token,
+            $this->type_hash_token
+        ] = (new URLBuilder($base_uri))
+            ->acquireParameters(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::TOKEN_STRING_ACTION,
+                self::TOKEN_STRING_STEP,
+                self::TOKEN_STRING_QUESTION_ID,
+                self::TOKEN_TYPE_HASH
+            );
+    }
+
+    private function retrieveStringValueForToken(
+        URLBuilderToken $token
+    ): string {
+        return $this->http->wrapper()->query()->retrieve(
+            $token->getName(),
+            $this->buildStringTrafo()
+        );
+    }
+
+    private function buildStringTrafo(): Transformation
+    {
+        return $this->refinery->byTrying([
+            $this->refinery->kindlyTo()->string(),
+            $this->refinery->always('')
+        ]);
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Factory.php
similarity index 73%
rename from components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php
rename to components/ILIAS/Questions/src/Presentation/Layout/Definitions/Factory.php
index 38a86f09be5e..d5ee413e8c5f 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EditFormFactory.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Factory.php
@@ -18,17 +18,20 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Definitions;
+namespace ILIAS\Questions\Presentation\Layout\Definitions;
 
-use ILIAS\Data\URI;
+use ILIAS\Questions\AnswerForm\Properties;
 use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\URLBuilder;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Table\Data as DataTable;
+use ILIAS\UI\Component\Table\Ordering as OrderingTable;
 
-class EditFormFactory
+class Factory
 {
     public function __construct(
         private readonly UIFactory $ui_factory,
@@ -36,8 +39,24 @@ public function __construct(
     ) {
     }
 
+    public function getEditOverview(
+        Editability $editability,
+        URLBuilder $url_builder,
+        DataTable|OrderingTable $answer_elements_table,
+        Properties $answer_form_properties
+    ): EditOverview {
+        return new EditOverview(
+            $this->ui_factory,
+            $this->lng,
+            $editability,
+            $url_builder,
+            $answer_elements_table,
+            $answer_form_properties
+        );
+    }
+
     public function getEditForm(
-        URI $target_uri,
+        URLBuilder $url_builder,
         Section $main_section_inputs,
         bool $is_final_step,
         ?Group $carry_inputs = null
@@ -45,7 +64,7 @@ public function getEditForm(
         return new EditForm(
             $this->ui_factory->input()->container()->form(),
             $this->lng,
-            $target_uri,
+            $url_builder,
             $main_section_inputs,
             $is_final_step,
             $carry_inputs
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Leaf.php
similarity index 92%
rename from components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
rename to components/ILIAS/Questions/src/Presentation/Layout/Definitions/Leaf.php
index 55e80b2bc9a3..66e8e0bf572d 100755
--- a/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Leaf.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Definitions;
+namespace ILIAS\Questions\Presentation\Layout\Definitions;
 
 class Leaf
 {
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/QuestionsTable.php
similarity index 87%
rename from components/ILIAS/Questions/src/Presentation/Definitions/QuestionsTable.php
rename to components/ILIAS/Questions/src/Presentation/Layout/Definitions/QuestionsTable.php
index 197d90742ae5..b099f2a16737 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/QuestionsTable.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/QuestionsTable.php
@@ -18,16 +18,15 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Definitions;
+namespace ILIAS\Questions\Presentation\Layout\Definitions;
 
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\Presentation\Views\Edit;
+use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Question\Persistence\Repository;
 use ILIAS\Data\Range;
 use ILIAS\Data\Order;
 use ILIAS\UI\Component\Table;
-use ILIAS\UI\URLBuilder;
-use ILIAS\UI\URLBuilderToken;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Renderer as UIRenderer;
 use ILIAS\UI\Component\Input\Container\Filter\Standard as Filter;
@@ -42,9 +41,7 @@ public function __construct(
         private readonly ServerRequestInterface $request,
         private readonly AnswerFormFactory $answer_form_factory,
         private readonly Repository $questions_repository,
-        private readonly URLBuilder $url_builder,
-        private readonly URLBuilderToken $action_token,
-        private readonly URLBuilderToken $row_id_token
+        private readonly EnvironmentImplementation $environment
     ) {
         $lng->loadLanguageModule('qpl');
     }
@@ -74,15 +71,14 @@ public function getRows(
         mixed $filter_data,
         mixed $additional_parameters
     ): \Generator {
+        $environment_with_action = $this->environment->withActionParameter(
+            Edit::CMD_EDIT_QUESTION
+        );
         foreach ($this->questions_repository->getAllQuestions() as $question) {
             yield $question->toTableRow(
                 $row_builder,
                 $this->ui_factory,
-                $this->url_builder->withParameter(
-                    $this->action_token,
-                    Edit::CMD_EDIT_QUESTION
-                ),
-                $this->row_id_token
+                $environment_with_action
             );
         }
     }
@@ -98,7 +94,7 @@ public function getTotalRowCount(
     private function buildContent(): array
     {
         return [
-            $this->buildFilter($this->url_builder->buildURI()->__toString()),
+            $this->buildFilter($this->environment->getUrlBuilder()->buildURI()->__toString()),
             $this->ui_factory->table()->data(
                 $this,
                 $this->lng->txt('questions'),
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/LayoutProvider.php b/components/ILIAS/Questions/src/Presentation/Layout/GlobalScreen/LayoutProvider.php
similarity index 98%
rename from components/ILIAS/Questions/src/Presentation/Layout/LayoutProvider.php
rename to components/ILIAS/Questions/src/Presentation/Layout/GlobalScreen/LayoutProvider.php
index 4d83083e2ed4..e3a9cb948116 100755
--- a/components/ILIAS/Questions/src/Presentation/Layout/LayoutProvider.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/GlobalScreen/LayoutProvider.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Layout;
+namespace ILIAS\Questions\Presentation\Layout\GlobalScreen;
 
 use ILIAS\GlobalScreen\Scope\Layout\Factory\BreadCrumbsModification;
 use ILIAS\GlobalScreen\Scope\Layout\Factory\MainBarModification;
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 16cb2ebab6e4..c6437358efbb 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -20,11 +20,12 @@
 
 namespace ILIAS\Questions\Presentation\Views;
 
-use ILIAS\Questions\Presentation\Definitions\EditForm;
-use ILIAS\Questions\Presentation\Definitions\EditFormFactory;
+use ILIAS\Questions\Presentation\Layout\Definitions\EditForm;
+use ILIAS\Questions\Presentation\Layout\Definitions\Factory as DefinitionsFactory;
 use ILIAS\Questions\Presentation\Definitions\Editability;
-use ILIAS\Questions\Presentation\Definitions\QuestionsTable;
-use ILIAS\Questions\Presentation\Layout\LayoutProvider;
+use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
+use ILIAS\Questions\Presentation\Layout\Definitions\QuestionsTable;
+use ILIAS\Questions\Presentation\Layout\GlobalScreen\LayoutProvider;
 use ILIAS\Questions\AnswerForm\Definition;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
@@ -33,27 +34,18 @@
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\URI;
 use ILIAS\Data\UUID\Factory as UuidFactory;
-use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\Refinery\Transformation;
 use ILIAS\HTTP\Services as HTTP;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Renderer as UIRenderer;
 use ILIAS\UI\Component\Item\Standard as StandardItem;
 use ILIAS\UI\Component\Item\Group as ItemGroup;
 use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
-use ILIAS\UI\URLBuilder;
-use ILIAS\UI\URLBuilderToken;
 use ILIAS\GlobalScreen\Services as GlobalScreen;
 
 class Edit
 {
-    private const array QUERY_PARAMETER_NAME_SPACE = ['q'];
-    private const string TOKEN_STRING_ACTION = 'a';
-    private const string TOKEN_STRING_STEP = 's';
-    private const string TOKEN_STRING_QUESTION_ID = 'q';
-    private const string TOKEN_TYPE_HASH = 't';
     private const string CMD_CREATE_QUESTION = 'create';
     public const string CMD_EDIT_QUESTION = 'edit';
     private const string CMD_CREATE_ANSWER_FORM = 'create_af';
@@ -77,9 +69,8 @@ public function __construct(
         private readonly UuidFactory $uuid_factory,
         private readonly AnswerFormFactory $answer_form_factory,
         private readonly Repository $questions_repository,
-        private readonly EditFormFactory $edit_form_factory
+        private readonly DefinitionsFactory $definitions_factory
     ) {
-
     }
 
     public function withRequiredCapabilities(array $capability_class_names): self
@@ -108,34 +99,11 @@ public function view(
         \ilToolbarGUI $toolbar,
         URI $base_uri
     ): QuestionsTable|EditForm {
-        [
-            $url_builder,
-            $action_token,
-            $step_token,
-            $question_id_token,
-            $page_id_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-        return match($this->retrieveStringValueForToken($action_token)) {
-            self::CMD_CREATE_QUESTION => $this->createQuestion(
-                $url_builder,
-                $action_token,
-                $step_token,
-                $question_id_token,
-                $page_id_token
-            ),
-            self::CMD_EDIT_QUESTION => $this->editQuestion(
-                $url_builder,
-                $action_token,
-                $step_token,
-                $question_id_token,
-                $page_id_token
-            ),
-            default => $this->showTable(
-                $toolbar,
-                $url_builder,
-                $action_token,
-                $question_id_token
-            )
+        $environment = $this->buildEnvironment($base_uri);
+        return match($environment->getAction()) {
+            self::CMD_CREATE_QUESTION => $this->createQuestion($environment),
+            self::CMD_EDIT_QUESTION => $this->editQuestion($environment),
+            default => $this->showTable($toolbar, $environment)
         };
     }
 
@@ -143,25 +111,20 @@ public function forwardPageCmds(
         \ilGlobalTemplateInterface $tpl,
         URI $base_uri,
     ): void {
-        [
-            0 => $url_builder,
-            1 => $action_token,
-            3 => $question_id_token,
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $question_id = $this->retrieveQuestionId($question_id_token);
-        $this->setParametersForQuestionCmds($question_id_token, $question_id->toString());
+        $environment = $this->buildEnvironment($base_uri);
+        $this->initializeEditMode($environment);
+        $environment->setParametersForQuestionCmds();
 
         $tpl->setContent(
             $this->ctrl->forwardCommand(
                 new \QstsQuestionPageGUI(
-                    $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION)
-                        ->withParameter($question_id_token, $question_id->toString())
+                    $environment
+                        ->withActionParameter(self::CMD_EDIT_QUESTION)
+                        ->withQuestionIdParameter($environment->getQuestionId())
+                        ->getUrlBuilder()
                         ->buildURI(),
                     $this,
-                    $this->questions_repository->getForQuestionId($question_id)
+                    $this->questions_repository->getForQuestionId($environment->getQuestionId())
                 )
             )
         );
@@ -170,40 +133,29 @@ public function forwardPageCmds(
     public function createAnswerForm(
         URI $base_uri,
         QuestionImplementation $question,
-        \ilPCAnswerForm $content_obj
+        \ilPCAnswerForm $content_object
     ): EditForm {
-        [
-            $url_builder,
-            $action_token,
-            $step_token,
-            $question_id_token,
-            $type_hash_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-
-        $url_builder_with_params = $url_builder
-                ->withParameter($question_id_token, $question->getId()->toString())
-                ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
-
-        $answer_form_type_class_hash = $this->retrieveStringValueForToken($type_hash_token);
+        $environment = $this->buildEnvironment($base_uri)
+            ->withActionParameter(self::CMD_CREATE_ANSWER_FORM)
+            ->withQuestionIdParameter($question->getId());
+
+        $answer_form_type_class_hash = $environment->getTypeClassHast();
         if ($answer_form_type_class_hash !== '') {
             return $this->forwardCreateAnswerFormCmd(
-                $url_builder_with_params->withParameter($type_hash_token, $answer_form_type_class_hash),
-                $step_token,
-                $content_obj,
+                $environment->withAnswerFormTypeHashParameter($answer_form_type_class_hash),
+                $content_object,
                 $this->answer_form_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
                 $this->answer_form_factory->getDefaultTypeGenericProperties($question->getId())
             );
         }
 
-        return match($this->retrieveStringValueForToken($action_token)) {
+        return match($environment->getAction()) {
             self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
-                $url_builder_with_params,
-                $step_token,
-                $type_hash_token,
-                $content_obj,
+                $environment,
+                $content_object,
                 $this->answer_form_factory->getDefaultTypeGenericProperties($question->getId())
             ),
-            default => $this->buildCreateAnswerForm($url_builder_with_params)
+            default => $this->buildCreateAnswerForm($environment)
         };
     }
 
@@ -212,36 +164,20 @@ public function editAnswerForm(
         QuestionImplementation $question,
         \ilPCAnswerForm $content_obj
     ): EditForm|EditOverview {
-        [
-            $url_builder,
-            $action_token,
-            $step_token,
-            $question_id_token
-        ] = $this->acquireURLBuilderAndParameters($base_uri);
-
-        $url_builder_with_params = $url_builder
-                ->withParameter($question_id_token, $question->getId()->toString())
-                ->withParameter($action_token, self::CMD_CREATE_ANSWER_FORM);
-
-        return match($this->retrieveStringValueForToken($action_token)) {
+        $environment = $this->buildEnvironment($base_uri)
+            ->withActionParameter(self::CMD_EDIT_ANSWER_FORM)
+            ->withQuestionIdParameter($question->getId());
+
+        return match($environment->getAction()) {
             self::CMD_EDIT_ANSWER_FORM => $this->processCreateAnswerForm($url_builder),
-            default => $this->forwardEditAnswerFormCmd(
-                $url_builder_with_params,
-                $step_token,
-                $content_obj,
-                $this->answer_form_factory->getDefaultTypeGenericProperties($question->getId())
-            )
+            default => $this->forwardEditAnswerFormCmd($environment)
         };
     }
 
     private function createQuestion(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $question_id_token,
-        URLBuilderToken $page_id_token
+        EnvironmentImplementation $environment
     ): EditForm {
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
+        $this->initializeEditMode($environment);
 
         $create = $this->questions_repository->getNew()->getEditView(
             $this->lng,
@@ -252,10 +188,7 @@ private function createQuestion(
             $this->ctrl,
             $this->data_factory
         )->create(
-            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION),
-            $step_token,
-            $this->retrieveStringValueForToken($step_token),
-            $this->edit_form_factory
+            $environment->withActionParameter(self::CMD_CREATE_QUESTION)
         );
 
         if ($create instanceof EditForm) {
@@ -264,26 +197,21 @@ private function createQuestion(
 
         $this->questions_repository->store($create);
         return $this->buildEditStartView(
-            $url_builder->withParameter($question_id_token, $create->getId()->toString()),
-            $step_token,
-            $page_id_token,
+            $environment
+                ->withDefaultStep()
+                ->withActionParameter(self::CMD_EDIT_QUESTION)
+                ->withQuestionIdParameter($create->getId()),
             $create
         );
 
     }
 
     private function editQuestion(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $step_token,
-        URLBuilderToken $question_id_token,
-        URLBuilderToken $page_id_token
+        EnvironmentImplementation $environment
     ): EditForm {
-        $this->initializeEditMode($url_builder, $action_token, $question_id_token);
-
-        $question_id = $this->retrieveQuestionId($question_id_token);
+        $this->initializeEditMode($environment);
 
-        $url_builder_with_row_id = $url_builder->withParameter($question_id_token, $question_id->toString());
+        $question_id = $environment->getQuestionId();
 
         $edit = $this->questions_repository->getForQuestionId($question_id)->getEditView(
             $this->lng,
@@ -294,11 +222,9 @@ private function editQuestion(
             $this->ctrl,
             $this->data_factory
         )->edit(
-            $url_builder_with_row_id->withParameter($action_token, self::CMD_EDIT_QUESTION),
-            $step_token,
-            $page_id_token,
-            $this->retrieveStringValueForToken($step_token),
-            $this->edit_form_factory
+            $environment
+                ->withActionParameter(self::CMD_EDIT_QUESTION)
+                ->withQuestionIdParameter($question_id)
         );
 
         if ($edit instanceof EditForm) {
@@ -307,23 +233,22 @@ private function editQuestion(
 
         $this->questions_repository->store($edit);
         return $this->buildEditStartView(
-            $url_builder_with_row_id,
-            $step_token,
-            $page_id_token,
+            $environment->withQuestionIdParameter($question_id),
             $edit
         );
     }
 
     private function showTable(
         \ilToolbarGUI $toolbar,
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
+        EnvironmentImplementation $environment
     ): QuestionsTable {
         $toolbar->addComponent(
             $this->ui_factory->button()->standard(
                 $this->lng->txt('create'),
-                $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()->__toString()
+                $environment->withActionParameter(self::CMD_CREATE_QUESTION)
+                    ->getUrlBuilder()
+                    ->buildURI()
+                    ->__toString()
             )
         );
 
@@ -334,27 +259,24 @@ private function showTable(
             $this->http->request(),
             $this->answer_form_factory,
             $this->questions_repository,
-            $url_builder,
-            $action_token,
-            $question_id_token
+            $environment
         );
     }
 
     private function processCreateAnswerForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        URLBuilderToken $type_hash_token,
+        EnvironmentImplementation $environment,
         \ilPCAnswerForm $content_obj,
         TypeGenericProperties $generic_answer_form_properties
     ): EditForm {
-        $form = $this->buildCreateAnswerForm($url_builder)->withRequest($this->http->request());
+        $form = $this->buildCreateAnswerForm($environment)->withRequest($this->http->request());
 
         $data = $form->getData();
         return $data === null
             ? $form
             : $this->forwardCreateAnswerFormCmd(
-                $url_builder->withParameter($type_hash_token, $this->answer_form_factory->getHashedClass($data::class)),
-                $step_token,
+                $environment->withAnswerFormTypeHashParameterParameter(
+                    $this->answer_form_factory->getHashedClass($data::class)
+                ),
                 $content_obj,
                 $data,
                 $generic_answer_form_properties
@@ -362,82 +284,30 @@ private function processCreateAnswerForm(
     }
 
     private function forwardCreateAnswerFormCmd(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
+        EnvironmentImplementation $environment,
         \ilPCAnswerForm $content_obj,
         Definition $type,
         TypeGenericProperties $type_generic_properties,
     ): ?EditForm {
         $create = $type->getEditView()->create(
-            $url_builder,
-            $step_token,
-            $this->retrieveStringValueForToken($step_token),
-            $this->edit_form_factory,
-            $type->buildProperties($type_generic_properties, [])
+            $environment->withProperties(
+                $type->buildProperties($type_generic_properties, [])
+            )
         );
 
         if ($create instanceof EditForm) {
             return $create;
         }
 
-        $this->questions_repository->store(
-            $this->questions_repository->getForQuestionId(
-                $create->getTypeGenericProperties()->getQuestionId()
-            )->withAnswerForm($create)
-        );
+        $this->questions_repository->store($create);
         $content_obj->create($create->getAnswerFormId());
         $content_obj->getPage()->update();
 
         $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
     }
 
-    private function acquireURLBuilderAndParameters(URI $base_uri): array
-    {
-        return (new URLBuilder($base_uri))
-            ->acquireParameters(
-                self::QUERY_PARAMETER_NAME_SPACE,
-                self::TOKEN_STRING_ACTION,
-                self::TOKEN_STRING_STEP,
-                self::TOKEN_STRING_QUESTION_ID,
-                self::TOKEN_TYPE_HASH
-            );
-    }
-
-    private function retrieveStringValueForToken(
-        URLBuilderToken $token
-    ): string {
-        return $this->http->wrapper()->query()->retrieve(
-            $token->getName(),
-            $this->buildStringTrafo()
-        );
-    }
-
-    private function retrieveQuestionId(
-        URLBuilderToken $question_id_token
-    ): ?Uuid {
-        return $this->http->wrapper()->query()->retrieve(
-            $question_id_token->getName(),
-            $this->refinery->byTrying([
-                $this->refinery->custom()->transformation(
-                    fn($v): Uuid => $this->uuid_factory->fromString($v)
-                ),
-                $this->refinery->always(null)
-            ])
-        );
-    }
-
-    private function buildStringTrafo(): Transformation
-    {
-        return $this->refinery->byTrying([
-            $this->refinery->kindlyTo()->string(),
-            $this->refinery->always('')
-        ]);
-    }
-
     private function initializeEditMode(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
+        EnvironmentImplementation $environment
     ): void {
         $this->global_screen->tool()->context()->current()->addAdditionalData(
             LayoutProvider::MODE_ENABLED,
@@ -445,33 +315,23 @@ private function initializeEditMode(
         );
         $this->global_screen->tool()->context()->current()->addAdditionalData(
             LayoutProvider::QUESTIONLIST_ENTRY,
-            $this->buildQuestionListSlate($url_builder, $action_token, $question_id_token)
+            $this->buildQuestionListSlate($environment)
         );
         $this->global_screen->tool()->context()->current()->addAdditionalData(
             LayoutProvider::URL_CLOSE_MODE_INFO,
-            $url_builder->buildURI()
+            $environment->getUrlBuilder()->buildURI()
         );
         $this->global_screen->tool()->context()->current()->addAdditionalData(
             LayoutProvider::URL_CREATE_QUESTION,
-            $url_builder->withParameter($action_token, self::CMD_CREATE_QUESTION)->buildURI()
-        );
-    }
-
-    private function setParametersForQuestionCmds(
-        URLBuilderToken $question_id_token,
-        string $question_id
-    ): void {
-        $this->ctrl->setParameterByClass(
-            \QstsQuestionPageGUI::class,
-            $question_id_token->getName(),
-            $question_id
+            $environment
+            ->withActionParameter(self::CMD_CREATE_QUESTION)
+            ->getUrlBuilder()
+            ->buildURI()
         );
     }
 
     private function buildQuestionListSlate(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
+        EnvironmentImplementation $environment
     ): LegacySlate {
         return $this->ui_factory->mainControls()->slate()->legacy(
             $this->lng->txt('mainbar_button_label_questionlist'),
@@ -481,7 +341,7 @@ private function buildQuestionListSlate(
                     $this->ui_factory->panel()->secondary()->listing(
                         $this->lng->txt('mainbar_button_label_questionlist'),
                         [
-                            $this->buildItemGroupForQuestionListSlate($url_builder, $action_token, $question_id_token)
+                            $this->buildItemGroupForQuestionListSlate($environment)
                         ]
                     )
                 )
@@ -490,9 +350,7 @@ private function buildQuestionListSlate(
     }
 
     private function buildItemGroupForQuestionListSlate(
-        URLBuilder $url_builder,
-        URLBuilderToken $action_token,
-        URLBuilderToken $question_id_token
+        EnvironmentImplementation $environment
     ): ItemGroup {
         return $this->ui_factory->item()->group(
             '',
@@ -500,8 +358,7 @@ private function buildItemGroupForQuestionListSlate(
                 fn(QuestionImplementation $v): StandardItem => $this->ui_factory->item()->standard(
                     $v->toEditLink(
                         $this->ui_factory->link(),
-                        $url_builder->withParameter($action_token, self::CMD_EDIT_QUESTION),
-                        $question_id_token
+                        $environment->withActionParameter(self::CMD_EDIT_QUESTION)
                     )
                 ),
                 iterator_to_array($this->questions_repository->getAllQuestions())
@@ -510,9 +367,7 @@ private function buildItemGroupForQuestionListSlate(
     }
 
     private function buildEditStartView(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        URLBuilderToken $page_id_token,
+        EnvironmentImplementation $environment,
         QuestionImplementation $question
     ): EditForm {
         return $question->getEditView(
@@ -523,21 +378,15 @@ private function buildEditStartView(
             $this->http->request(),
             $this->ctrl,
             $this->data_factory
-        )->edit(
-            $url_builder,
-            $step_token,
-            $page_id_token,
-            '',
-            $this->edit_form_factory
-        );
+        )->edit($environment);
     }
 
     private function buildCreateAnswerForm(
-        URLBuilder $url_builder
+        EnvironmentImplementation $environemt
     ): EditForm {
         $if = $this->ui_factory->input();
         return $this->edit_form_factory->getEditForm(
-            $url_builder->buildURI(),
+            $environemt->getUrlBuilder(),
             $if->field()->section(
                 [
                         $if->field()->select(
@@ -563,4 +412,18 @@ private function checkCapabilities(array $capabilities): void
             }
         }
     }
+
+    public function buildEnvironment(
+        URI $base_uri
+    ): EnvironmentImplementation {
+        return new EnvironmentImplementation(
+            $this->ctrl,
+            $this->http,
+            $this->refinery,
+            $this->uuid_factory,
+            $this->definitions_factory,
+            $this->editability,
+            $base_uri
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Column.php b/components/ILIAS/Questions/src/Question/Persistence/Column.php
index 1565f3f35e82..f25e35cbe660 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Column.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Column.php
@@ -23,18 +23,18 @@
 class Column
 {
     public function __construct(
-        private readonly string $table,
+        private readonly Table $table,
         private readonly string $column
     ) {
     }
 
-    public function getTable(): string
+    public function getTableName(): string
     {
-        return $this->table;
+        return $this->table->getName();
     }
 
-    public function toColumnString(): string
+    public function getColumnString(): string
     {
-        return "{$this->table}.{$this->column}";
+        return "{$this->table->getName()}.{$this->column}";
     }
 }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/CoreTables.php b/components/ILIAS/Questions/src/Question/Persistence/CoreTables.php
new file mode 100644
index 000000000000..a8778109cc7a
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/CoreTables.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+enum CoreTables: string
+{
+    private const string QUESTION_TABLE_ID_COLUMN = 'id';
+    private const array QUESTION_TABLE_COLUMNS = [
+        'id',
+        'page_id',
+        'title',
+        'author',
+        'lifecycle',
+        'remarks',
+        'original_id',
+        'last_update',
+        'created'
+    ];
+
+    private const string ANSWER_FORM_TABLE_ID_COLUMN = 'id';
+    private const string ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN = 'question_id';
+    private const array ANSWER_FORM_TABLE_COLUMNS = [
+        'id AS answer_form_id',
+        'type',
+        'available_points',
+        'image_size',
+        'shuffle_answer_options',
+        'additional_text',
+        'additional_text_legacy'
+    ];
+
+    case Questions = 'qsts_questions';
+    case AnswerForms = 'qsts_answer_forms';
+    case Responses = 'qsts_responses';
+    case Linking = 'qsts_linking';
+    case PageEditor = 'page_object';
+
+    public function getTable(): Table
+    {
+        return new Table($this);
+    }
+
+    public function getColumnsForSelect(): array
+    {
+        return match($this) {
+            self::Questions => self::QUESTION_TABLE_COLUMNS,
+            self::AnswerForms => self::ANSWER_FORM_TABLE_COLUMNS
+        };
+    }
+
+    public function getIdColumn(): Column
+    {
+        return match($this) {
+            self::Questions => new Column(
+                $this->getTable(),
+                self::QUESTION_TABLE_ID_COLUMN
+            ),
+            self::AnswerForms => new Column(
+                $this->getTable(),
+                self::ANSWER_FORM_TABLE_ID_COLUMN
+            )
+        };
+    }
+
+    public function getForeignKeyColumn(): ?Column
+    {
+        return match($this) {
+            self::AnswerForms => new Column(
+                $this->getTable(),
+                self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
+            ),
+            default => null
+        };
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Insert.php b/components/ILIAS/Questions/src/Question/Persistence/Insert.php
new file mode 100644
index 000000000000..1d60dfddad15
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Insert.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ * ******************************************************************* */
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class Insert
+{
+    private array $values_to_insert = [];
+
+    /**
+     * @param array<\ILIAS\Questions\Question\Persistence\Column> $columns
+     */
+    public function __construct(
+        private readonly Table $table,
+        private readonly array $columns
+    ) {
+        foreach ($columns as $column) {
+            if ($column->getTableName() !== $this->table->getName()) {
+                throw new \InvalidArgumentException(
+                    "You can only add Columns of the table {$this->table->getName()} to this Insert."
+                );
+            }
+        }
+    }
+
+    public function getTableName(): string
+    {
+        return $this->table->getName();
+    }
+
+    /**
+     *
+     * @param array<\ILIAS\Questions\Question\Persistence\Value> $values
+     * @return self
+     */
+    public function withAdditionalDataSet(
+        array $values
+    ): self {
+        if (count($this->columns) !== count($values)) {
+            throw new \InvalidArgumentException(
+                "There MUST be the same amount of Values as there are Columns."
+            );
+        }
+
+        $clone = clone $this;
+        $clone->values_to_insert[] = $values;
+        return $clone;
+    }
+
+    public function toManipulateString(\ilDBInterface $db): string
+    {
+        return "INSERT INTO {$this->table->getName()} "
+            . $this->buildColumnsString() . PHP_EOL
+            . $this->buildValuesString($db);
+    }
+
+    private function buildColumnsString(): string
+    {
+        return '('
+            . implode(
+                ', ',
+                array_map(
+                    fn(Column $v): string => $v->getColumnString(),
+                    $this->columns
+                )
+            ) . ')';
+    }
+
+    private function buildValuesString(\ilDBInterface $db): string
+    {
+        $return = [];
+        foreach ($this->values_to_insert as $values) {
+            $return[] = '(' . implode(
+                ', ',
+                array_map(
+                    fn(Value $v): string => $v->getQuotedValue($db),
+                    $values
+                )
+            ) . ')';
+        }
+
+        return 'VALUES ' . implode(
+            ',' . PHP_EOL,
+            $return
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Join.php b/components/ILIAS/Questions/src/Question/Persistence/Join.php
index e4848d4d5d47..993fd58124f9 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Join.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Join.php
@@ -31,7 +31,7 @@ public function __construct(
 
     public function toSql(): string
     {
-        return "{$this->type->value} JOIN {$this->right->getTable()} ON {$this->left->toColumnString()} = {$this->right->toColumnString()}";
+        return "{$this->type->value} JOIN {$this->right->getTableName()} ON {$this->left->getColumnString()} = {$this->right->getColumnString()}";
     }
 
     public function getLeft(): Column
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Manipulate.php b/components/ILIAS/Questions/src/Question/Persistence/Manipulate.php
new file mode 100644
index 000000000000..861cf97cc7a7
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Manipulate.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class Manipulate
+{
+    private array $statements;
+
+    public function __construct(
+        private readonly \ilDBInterface $db
+    ) {
+    }
+
+    public function withAdditionalStatement(
+        Insert|Update $statement
+    ): self {
+        $clone = clone $this;
+        $clone->statements[] = $statement;
+        return $clone;
+    }
+
+    public function run(): void
+    {
+        $atom_query = $this->db->buildAtomQuery();
+
+        $manipulates = [];
+        foreach ($this->statements as $statement) {
+            $atom_query->addTableLock($statement->getTableName());
+            $manipulates[] = $statement->toManipulateString($this->db);
+        }
+        $atom_query->addQueryCallable(
+            function () use ($manipulates): void {
+                foreach ($manipulates as $manipulate) {
+                    $this->db->manipulate($manipulate);
+                }
+            }
+        );
+        $atom_query->run();
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Operator.php b/components/ILIAS/Questions/src/Question/Persistence/Operator.php
index 70a6124f4a48..41c577f25b13 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Operator.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Operator.php
@@ -25,7 +25,7 @@ enum Operator: string
     case Equal = '=';
     case Unequal = '<>';
     case Greater = '>';
-    case Less = '>';
+    case Less = '<';
     case GreaterOrEqual = '>=';
     case LessOrEqual = '<=';
     case In = 'IN';
@@ -42,9 +42,9 @@ public function toSql(Column $left, int $nr_of_values): string
         }
 
         return match($this) {
-            self::In => "{$left->toColumnString()} {$this->value} ({$placeholders})",
-            self::Between => "{$left->toColumnString()} {$this->value} %s AND %s",
-            default => "{$left->toColumnString()} {$this->value} %s"
+            self::In => "{$left->getColumnString()} {$this->value} ({$placeholders})",
+            self::Between => "{$left->getColumnString()} {$this->value} %s AND %s",
+            default => "{$left->getColumnString()} {$this->value} %s"
         };
     }
 }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Order.php b/components/ILIAS/Questions/src/Question/Persistence/Order.php
index c0b4d27d2ea1..97e974e809fd 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Order.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Order.php
@@ -30,6 +30,6 @@ public function __construct(
 
     public function toSql(): string
     {
-        return "{$this->column->toColumnString()} {$this->direction->value}";
+        return "{$this->column->getColumnString()} {$this->direction->value}";
     }
 }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/SelectQuery.php b/components/ILIAS/Questions/src/Question/Persistence/Query.php
similarity index 76%
rename from components/ILIAS/Questions/src/Question/Persistence/SelectQuery.php
rename to components/ILIAS/Questions/src/Question/Persistence/Query.php
index aad33592fdc7..d8baf6a558cf 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/SelectQuery.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Query.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\Question\Persistence;
 
-class SelectQuery
+class Query
 {
     private array $select = [];
     private array $where = [];
@@ -32,47 +32,35 @@ class SelectQuery
     private array $binding_values = [];
 
     public function __construct(
-        private readonly \ilDBInterface $db,
-        array $answer_form_ids
+        private readonly \ilDBInterface $db
     ) {
-        $this->select[] = new Select(
-            Repository::QUESTION_TABLE,
-            Repository::QUESTION_TABLE_COLUMNS
-        );
+
+        $questions_table_definition = CoreTables::Questions;
+        $answer_form_table_definition = CoreTables::AnswerForms;
+        $questions_id_column = $questions_table_definition->getIdColumn();
 
         $this->select[] = new Select(
-            Repository::ANSWER_FORM_TABLE,
-            Repository::ANSWER_FORM_TABLE_COLUMNS
+            $questions_table_definition->getTable(),
+            $questions_table_definition->getColumnsForSelect()
         );
 
-        $left = new Column(
-            Repository::QUESTION_TABLE,
-            Repository::QUESTION_TABLE_ID_COLUMN
+        $this->select[] = new Select(
+            $answer_form_table_definition->getTable(),
+            $answer_form_table_definition->getColumnsForSelect()
         );
 
         $this->joins[] = new Join(
-            $left,
-            new Column(
-                Repository::ANSWER_FORM_TABLE,
-                Repository::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
-            )
-        );
-
-        $this->where[] = new Where(
-            $left,
-            new Value(
-                \ilDBConstants::T_INTEGER,
-                $answer_form_ids
-            ),
-            Operator::In
+            $questions_id_column,
+            $answer_form_table_definition->getForeignKeyColumn(),
+            JoinType::Left
         );
 
         $this->order[] = new Order(
-            Repository::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
+            $questions_id_column
         );
 
         $this->order[] = new Order(
-            Repository::ANSWER_FORM_TABLE_ID_COLUMN
+            $answer_form_table_definition->getIdColumn()
         );
     }
 
@@ -111,7 +99,7 @@ public function withLimit(int $limit): self
         return $clone;
     }
 
-    public function toSql(): string
+    public function toSql(): \ilDBStatement
     {
         return $this->db->queryF(
             'SELECT ' . implode(
@@ -121,14 +109,14 @@ public function toSql(): string
                     static fn(array $c, Select $v): array => [...$c, ...$v->toColumnsArray()],
                     []
                 )
-            ) . ' FROM ' . self::QUESTION_TABLE
+            ) . ' FROM ' . CoreTables::Questions->value
             . array_reduce(
                 $this->joins,
                 static fn(string $c, Join $v): string => $c . PHP_EOL . $v->toSql(),
                 ''
             ) . PHP_EOL
             . $this->buildWhereString()
-            . $this->limit !== null ? "LIMIT = {$this->limit}" : '',
+            . ($this->limit !== null ? "LIMIT = {$this->limit}" : ''),
             $this->binding_types,
             $this->binding_values
         );
@@ -146,7 +134,7 @@ function (?string $c, Where $v): string {
 
                 return "{$c}{$v->getLogicalOperator()} {$v->toSql()}" . PHP_EOL;
             }
-        );
+        ) ?? '';
     }
 
     private function addValueToBinding(Value $value): void
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Repository.php b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
index 612464e2a11c..cfa7ee494150 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Repository.php
@@ -20,8 +20,8 @@
 
 namespace ILIAS\Questions\Question\Persistence;
 
+use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\AnswerForm\Definition;
-use ILIAS\Questions\AnswerFormTypes\Factory as FormTypesFactory;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\UUID\Factory as UuidFactory;
@@ -29,38 +29,10 @@
 
 class Repository
 {
-    public const string QUESTION_TABLE = 'qsts_questions';
-    public const string QUESTION_TABLE_ID_COLUMN = 'id';
-    public const array QUESTION_TABLE_COLUMNS = [
-        'id',
-        'page_id',
-        'title',
-        'author',
-        'lifecycle',
-        'remarks',
-        'original_id',
-        'last_update',
-        'created'
-    ];
-
-    public const string ANSWER_FORM_TABLE = 'qsts_answer_forms';
-    public const string ANSWER_FORM_TABLE_ID_COLUMN = 'id';
-    public const string ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN = 'question_id';
-    public const array ANSWER_FORM_TABLE_COLUMNS = [
-        'id AS answer_form_id',
-        'type',
-        'available_points',
-        'image_size',
-        'shuffle_answer_options',
-        'additional_text',
-        'additional_text_legacy'
-    ];
-
-    private const string PAGE_EDITOR_TABLE = 'page_object';
-
     public function __construct(
         private readonly \ilDBInterface $db,
-        private readonly UuidFactory $uuid_factory
+        private readonly UuidFactory $uuid_factory,
+        private readonly AnswerFormFactory $answer_form_factory
     ) {
     }
 
@@ -76,13 +48,22 @@ public function getNew(): QuestionImplementation
      */
     public function getAllQuestions(): \Generator
     {
-        yield from $this->getForWhereClause('');
+        yield from $this->getForBaseQuery(new Query($this->db));
     }
 
     public function getForQuestionId(Uuid $question_id): ?QuestionImplementation
     {
-        return $this->getForWhereClause(
-            "q.id={$this->db->quote($question_id->toString(), \ilDBConstants::T_TEXT)}"
+        return $this->getForBaseQuery(
+            (new Query($this->db))->withAdditionalWhere(
+                new Where(
+                    CoreTables::Questions->getIdColumn(),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        $question_id->toString()
+                    ),
+                    Operator::Equal
+                )
+            )
         )->current();
     }
 
@@ -93,83 +74,84 @@ public function getForQuestionId(Uuid $question_id): ?QuestionImplementation
      */
     public function getForQuestionIds(array $question_ids): \Generator
     {
-        yield from $this->getForWhereClause(
-            $this->db->in(
-                'q.question_id',
-                $question_ids,
-                false,
-                \ilDBConstants::T_INTEGER
+        yield from $this->getForBaseQuery(
+            (new Query($this->db))->withAdditionalWhere(
+                new Where(
+                    CoreTables::Questions->getIdColumn(),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        array_map(
+                            fn(Uuid $v): string => $v->toString(),
+                            $question_ids
+                        )
+                    ),
+                    Operator::In
+                )
             )
         );
     }
 
-    private function buildQuestionFromDBRecords(\stdClass $db_record): QuestionImplementation
+    /**
+     * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
+     */
+    private function getForBaseQuery(Query $query): \Generator
     {
-        return new QuestionImplementation(
-            $this->uuid_factory->fromString($db_record->id),
-            $db_record->page_id,
-            $db_record->title,
-            $db_record->author,
-            Lifecycle::from($db_record->lifecycle),
-            $db_record->remarks,
-            $db_record->original_id === null ? null : $this->uuid_factory->fromString($db_record->original_id),
-            new \DateTimeImmutable('@' . $db_record->last_update, new \DateTimeZone('UTC')),
-            new \DateTimeImmutable('@' . $db_record->created, new \DateTimeZone('UTC'))
-        );
+        $result = array_reduce(
+            $this->answer_form_factory->getAvailableDefinitions(),
+            fn(Query $c, Definition $v) => $v->getPersistence()->completeQuery(
+                new TableNameBuilder($v->getPersistence()->getPublicNameSpace()),
+                $c,
+                CoreTables::Questions->getIdColumn()
+            ),
+            $query
+        )->toSql();
+
+        $question_records = [$this->db->fetchObject($result)];
+        if ($question_records[0] === null) {
+            return null;
+        }
+        while (($db_record = $this->db->fetchObject($result)) !== null) {
+            if ($db_record->id === $question_records[0]->id) {
+                $question_records[] = $db_record;
+                continue;
+            }
+            yield $this->buildQuestionFromDBRecords($question_records);
+            $question_records = [$db_record];
+        }
+        yield $this->buildQuestionFromDBRecords($question_records);
     }
 
-    /**
-     * @return \Generator<ILIAS\Questions\Question\Question>
-     */
-    private function getForWhereClause(string $where): \Generator
+    private function buildQuestionFromDBRecords(array $db_record): QuestionImplementation
     {
-        $query_result = $this->db->query(
-            'SELECT q.id, q.page_id, q.title, q.author, q.lifecycle, q.remarks,' . PHP_EOL
-            . 'q.original_id, q.last_update, q.created' . PHP_EOL
-            . 'FROM ' . self::QUESTION_TABLE . ' q' . PHP_EOL
-            . ($where === '' ? '' : 'WHERE ' . $where)
+        $basic_properties = $db_record[0];
+        return new QuestionImplementation(
+            $this->uuid_factory->fromString($basic_properties->id),
+            $basic_properties->page_id,
+            $basic_properties->title,
+            $basic_properties->author,
+            Lifecycle::from($basic_properties->lifecycle),
+            $basic_properties->remarks,
+            $basic_properties->original_id === null
+                ? null
+                : $this->uuid_factory->fromString($basic_properties->original_id),
+            new \DateTimeImmutable('@' . $basic_properties->last_update, new \DateTimeZone('UTC')),
+            new \DateTimeImmutable('@' . $basic_properties->created, new \DateTimeZone('UTC'))
         );
-
-        while (($db_record = $this->db->fetchObject($query_result)) !== null) {
-            yield $this->buildQuestionFromDBRecords($db_record);
-        }
     }
 
     /**
      *
-     * @param ILIAS\Questions\Question\Question|array<ILIAS\Questions\Question\QuestionImplementation> $questions
+     * @param array<\ILIAS\Questions\Question\Persistence\Storable> $storable
      * @return array<ILIAS\Data\UUID\Uuid>
      */
     public function store(
-        QuestionImplementation|array $questions
+        array $storable
     ): void {
-        if ($questions instanceof QuestionImplementation) {
-            $this->storeQuestion($questions);
-            return;
-        }
-
-        array_map(
-            fn(QuestionImplementation $v) => $this->storeQuestion($v),
-            $questions
-        );
-    }
-
-    private function storeQuestion(QuestionImplementation $question): void
-    {
-        if ($question->getPageId() === null) {
-            $question = $question->withPageId($this->buildQuestionPage());
-        }
-
-        $this->db->replace(
-            self::QUESTION_TABLE,
-            [
-                'id' => [
-                    \ilDBConstants::T_TEXT,
-                    $question->getId()->toString()
-                ]
-            ],
-            $question->toStorage()
-        );
+        array_reduce(
+            $storable,
+            fn(Manipulate $c, Storable $v): Manipulate => $v->toStorage($c),
+            new Manipulate($this->db)
+        )->run();
     }
 
     private function buildAvailableUuid(): Uuid
@@ -205,7 +187,7 @@ private function getNextAvailableQuestionPageId(): int
 
         $last_id = $this->db->fetchObject(
             $this->db->query(
-                'SELECT MAX(page_id) AS last FROM ' . self::PAGE_EDITOR_TABLE
+                'SELECT MAX(page_id) AS last FROM ' . CoreTables::PageEditor->value
                     . ' WHERE parent_type = "qsts"'
             )
         )->last;
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Select.php b/components/ILIAS/Questions/src/Question/Persistence/Select.php
index ab166ef0201f..5e39990d2380 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Select.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Select.php
@@ -23,7 +23,7 @@
 class Select
 {
     public function __construct(
-        private readonly string $table,
+        private readonly Table $table,
         private readonly array $columns
     ) {
     }
@@ -31,7 +31,7 @@ public function __construct(
     public function toColumnsArray(): array
     {
         return array_map(
-            fn(string $v): string => "{$this->table}.{$v}",
+            fn(string $v): string => "{$this->table->getName()}.{$v}",
             $this->columns
         );
     }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/ManipulateQuery.php b/components/ILIAS/Questions/src/Question/Persistence/Storable.php
similarity index 77%
rename from components/ILIAS/Questions/src/Question/Persistence/ManipulateQuery.php
rename to components/ILIAS/Questions/src/Question/Persistence/Storable.php
index 8651f5372fd1..6f29a0ea7b8b 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/ManipulateQuery.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Storable.php
@@ -20,14 +20,7 @@
 
 namespace ILIAS\Questions\Question\Persistence;
 
-class ManipulateQuery
+interface Storable
 {
-    private array $tables = [];
-    private array $columns = [];
-    private array $values = [];
-
-    public function __construct()
-    {
-        ;
-    }
+    public function toStorage(Manipulate $manipulate): Manipulate;
 }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Table.php b/components/ILIAS/Questions/src/Question/Persistence/Table.php
new file mode 100644
index 000000000000..facf9b3640de
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Table.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class Table
+{
+    public function __construct(
+        private readonly CoreTables|TableTypes $table_definition,
+        private readonly ?TableNameBuilder $table_name_builder = null,
+        private readonly string $table_identifier = ''
+    ) {
+    }
+
+    public function getName(): string
+    {
+        if ($this->table_definition instanceof CoreTables) {
+            return $this->table_definition->value;
+        }
+
+        return $this->table_name_builder->getTableNameFor(
+            $this->table_definition,
+            $this->table_identifier
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php b/components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php
index f65b225418e9..f686cf99346d 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php
@@ -30,28 +30,21 @@ public function __construct(
         $this->type_specific_part = $table_name_space->getTypeSpecificTableNamePart();
     }
 
-    public function getTypeSpecificAnswerFormsTableName(): string
-    {
-        return "qsts_answer_forms_{$this->type_specific_part}";
-    }
-
-    public function getAnswerInputsTableName(): string
-    {
-        return "qsts_answer_inputs_{$this->type_specific_part}";
-    }
-
-    public function getAnswerOptionsTableName(): string
-    {
-        return "qsts_answer_options_{$this->type_specific_part}";
-    }
-
-    public function getResponsesTableName(): string
-    {
-        return "qsts_responses_{$this->type_specific_part}";
-    }
-
-    public function getAdditionalTableName(string $table_identifier): string
-    {
-        return "qsts_{$this->type_specific_part}_{$table_identifier}";
+    public function getTableNameFor(
+        TableTypes $type,
+        string $identifier = ''
+    ): string {
+        if ($type === TableTypes::Additional && $identifier === '') {
+            throw \InvalidArgumentException(
+                'Identifier cannot be empty for type ' . TableTypes::Additional->name . '.'
+            );
+        }
+        return match ($type) {
+            TableTypes::TypeSpecificAnswerForms => "qsts_answer_forms_{$this->type_specific_part}",
+            TableTypes::AnswerInputs => "qsts_answer_inputs_{$this->type_specific_part}",
+            TableTypes::AnswerOptions => "qsts_answer_options_{$this->type_specific_part}",
+            TableTypes::Responses => "qsts_responses_{$this->type_specific_part}",
+            TableTypes::Additional => "qsts_{$this->type_specific_part}_{$identifier}"
+        };
     }
 }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php b/components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php
index d6779d1692ce..fc7c0051d485 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php
@@ -32,7 +32,7 @@ public function __construct(
     ) {
         if (mb_strlen($vendor) > 4 || mb_strlen($answer_form_id) > 8) {
             throw new \InvalidArgumentException(
-                'Neither $vendor nor $answer_form_id can be longer then 4 characters.'
+                '$vendor cannot be longer than 4, $answer_form_id can be longer then 8 characters.'
             );
         }
     }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/TableTypes.php b/components/ILIAS/Questions/src/Question/Persistence/TableTypes.php
new file mode 100644
index 000000000000..4ab28142e239
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/TableTypes.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+enum TableTypes
+{
+    case TypeSpecificAnswerForms;
+    case AnswerInputs;
+    case AnswerOptions;
+    case Responses;
+    case Additional;
+
+    public function getTable(
+        TableNameBuilder $table_name_builder,
+        ?string $table_identifier = null
+    ): Table {
+        return match($this) {
+            self::Additional => new Table(
+                $this,
+                $table_name_builder,
+                $table_identifier
+            ),
+            default => new Table(
+                $this,
+                $table_name_builder
+            )
+        };
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Update.php b/components/ILIAS/Questions/src/Question/Persistence/Update.php
new file mode 100644
index 000000000000..087b30d746e2
--- /dev/null
+++ b/components/ILIAS/Questions/src/Question/Persistence/Update.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Question\Persistence;
+
+class Update
+{
+    public function __construct(
+        private readonly Table $table,
+        private readonly array $columns,
+        private readonly array $values,
+        private readonly array $where
+    ) {
+        foreach ($columns as $column) {
+            if ($column->getTableName() !== $this->table->getName()) {
+                throw new \InvalidArgumentException(
+                    "You can only add Columns of the table {$this->table->getName()} to this Insert."
+                );
+            }
+        }
+
+        if (count(columns) !== count($values)) {
+            throw new \InvalidArgumentException(
+                "There MUST be the same amount of Values as there are Columns."
+            );
+        }
+    }
+
+    public function getTableName(): string
+    {
+        return $this->table->getName();
+    }
+
+    public function toManipulateString(\ilDBInterface $db): string
+    {
+        return "UPDATE {$this->table->getName()}" . PHP_EOL
+            . $this->buildSetterString($db) . PHP_EOL
+            . $this->buildWhereString($db);
+    }
+
+    private function buildSetterString(\ilDBInterface $db): string
+    {
+        return trim(
+            array_reduce(
+                array_keys($this->columns),
+                fn(string $c, int $v): string => $c
+                    . "{$this->columns[$v]->getColumnString()} = {$this->values[$v]->getQuotedValue()},",
+                'SET '
+            ),
+            ','
+        );
+    }
+
+    private function buildWhereString(\ilDBInterface $db): string
+    {
+        $values = [];
+
+        return sprintf(
+            array_reduce(
+                $this->where,
+                function (?string $c, Where $v) use ($db, &$values): string {
+                    $values[] = $v->getRight()->getQuotedValue($db);
+
+                    if ($c === null) {
+                        return "WHERE {$v->toSql()}" . PHP_EOL;
+                    }
+
+                    return "{$c}{$v->getLogicalOperator()} {$v->toSql()}" . PHP_EOL;
+                }
+            ),
+            $values
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Value.php b/components/ILIAS/Questions/src/Question/Persistence/Value.php
index 3fca04d0d4f2..c459a68367f9 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Value.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Value.php
@@ -38,6 +38,11 @@ public function getValue(): string|int|array
         return $this->value;
     }
 
+    public function getQuotedValue(\ilDBInterface $db): string
+    {
+        return $db->quote($this->value, $this->type);
+    }
+
     public function getNumberOfElements(): int
     {
         if (is_array($this->value)) {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Where.php b/components/ILIAS/Questions/src/Question/Persistence/Where.php
index d155b7f96612..d14febb99cf1 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Where.php
+++ b/components/ILIAS/Questions/src/Question/Persistence/Where.php
@@ -40,7 +40,7 @@ public function toSql(): string
             );
     }
 
-    public function getRight(): int|string
+    public function getRight(): Value
     {
         return $this->right;
     }
diff --git a/components/ILIAS/Questions/src/Question/Question.php b/components/ILIAS/Questions/src/Question/Question.php
index a57d35e274f6..c5e8a96776bd 100644
--- a/components/ILIAS/Questions/src/Question/Question.php
+++ b/components/ILIAS/Questions/src/Question/Question.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\Question;
 
-interface Question
+interface Question extends Persistence\Storable
 {
     public function getParticipantView(): Views\Participant;
 }
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index 0770686aba05..0beba1272155 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -21,6 +21,8 @@
 namespace ILIAS\Questions\Question;
 
 use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
+use ILIAS\Questions\Question\Persistence\Manipulate;
+use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Uuid;
@@ -30,8 +32,6 @@
 use ILIAS\UI\Component\Link\Standard as StandardLink;
 use ILIAS\UI\Component\Table\DataRowBuilder;
 use ILIAS\UI\Component\Table\DataRow;
-use ILIAS\UI\URLBuilder;
-use ILIAS\UI\URLBuilderToken;
 use ILIAS\Refinery\Factory as Refinery;
 use Psr\Http\Message\RequestInterface;
 
@@ -200,43 +200,40 @@ public function getParticipantView(): Views\Participant
 
     public function toEditLink(
         LinkFactory $link_factory,
-        URLBuilder $url_builder,
-        URLBuilderToken $row_id_token
+        EnvironmentImplementation $environment
     ): StandardLink {
         return $link_factory->standard(
             $this->title,
-            $url_builder->withParameter(
-                $row_id_token,
-                $this->id->toString()
-            )->buildURI()->__toString()
+            $environment->withQuestionIdParameter($this->id)
+                ->getUrlBuilder()
+                ->buildURI()
+                ->__toString()
         );
     }
 
     public function toTableRow(
         DataRowBuilder $row_builder,
         UIFactory $ui_factory,
-        URLBuilder $url_builder,
-        URLBuilderToken $row_id_token
+        EnvironmentImplementation $environment
     ): DataRow {
         return $row_builder->buildDataRow(
             $this->id->toString(),
             [
                 'title' => $ui_factory->link()->standard(
                     $this->title,
-                    $url_builder->withParameter(
-                        $row_id_token,
-                        $this->id->toString()
-                    )->buildURI()->__toString()
+                    $environment->withQuestionIdParameter(
+                        $this->id
+                    )->getUrlBuilder()
+                    ->buildURI()
+                    ->__toString()
                 )
             ]
         );
     }
 
-    /**
-     * @return array<string, mixed>
-     */
-    public function toStorage(): array
-    {
+    public function toStorage(
+        Manipulate $manipulate
+    ): Manipulate {
         return [
             'id' => [\ilDBConstants::T_TEXT, $this->id->toString()],
             'page_id' => [\ilDBConstants::T_INTEGER, $this->page_id],
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index d93121e8c075..98632822c5a3 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -20,8 +20,9 @@
 
 namespace ILIAS\Questions\Question\Views;
 
-use ILIAS\Questions\Presentation\Definitions\EditForm;
-use ILIAS\Questions\Presentation\Definitions\EditFormFactory;
+use ILIAS\Questions\Presentation\Layout\Definitions\EditForm;
+use ILIAS\Questions\Presentation\Layout\Definitions\Factory as DefinitionsFactory;
+use ILIAS\Questions\Presentation\Layout\Definitions\Environment;
 use ILIAS\Questions\Question\Question;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
@@ -54,69 +55,40 @@ public function __construct(
     }
 
     public function create(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        string $step,
-        EditFormFactory $edit_form_factory
+        Environment $environment
     ): EditForm|Question {
-        return match ($step) {
-            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory
-            ),
-            default => $this->buildBasicPropertiesForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory
-            )
+        return match ($environment->getStep()) {
+            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm($environment),
+            default => $this->buildBasicPropertiesForm($environment)
         };
     }
 
     public function edit(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        URLBuilderToken $page_id_token,
-        string $step,
-        EditFormFactory $edit_form_factory
+        Environment $environment
     ): EditForm|Question {
-        return match ($step) {
-            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory
-            ),
-            default => $this->buildBasicPropertiesForm(
-                $url_builder,
-                $step_token,
-                $edit_form_factory
-            )->withContentAfterForm(
-                $this->buildPreviewPanel($url_builder, $page_id_token)
+        return match ($environment->getStep()) {
+            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm($environment),
+            default => $this->buildBasicPropertiesForm($environment)->withContentAfterForm(
+                $this->buildPreviewPanel($environment)
             )
         };
     }
 
     private function buildBasicPropertiesForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        EditFormFactory $edit_form_factory
+        Environment $environment
     ): EditForm {
-        return $edit_form_factory->getEditForm(
-            $url_builder->withParameter($step_token, self::CMD_SAVE_QUESTION)->buildURI(),
+        return $environment->getDefinitionsFactory()->getEditForm(
+            $environment->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION),
             $this->buildBasicPropertiesInputs(),
             true
         );
     }
 
     private function processBasicPropertiesForm(
-        URLBuilder $url_builder,
-        URLBuilderToken $step_token,
-        EditFormFactory $edit_form_factory
+        Environment $environment
     ): EditForm|Question {
         $form = $this->buildBasicPropertiesForm(
-            $url_builder,
-            $step_token,
-            $edit_form_factory
+            $environment
         )->withRequest($this->request);
 
         $data = $form->getData();
@@ -177,10 +149,8 @@ function (array $vs): QuestionImplementation {
         );
     }
 
-    private function buildPreviewPanel(
-        URLBuilder $url_builder,
-        URLBuilderToken $page_id_token
-    ): StandardPanel {
+    private function buildPreviewPanel(): StandardPanel
+    {
         return $this->ui_factory->panel()->standard(
             $this->lng->txt('preview'),
             $this->ui_factory->legacy()->content($this->question->getTitle())
@@ -188,13 +158,7 @@ private function buildPreviewPanel(
             $this->ui_factory->dropdown()->standard([
                 $this->ui_factory->link()->standard(
                     $this->lng->txt('edit'),
-                    $url_builder
-                        ->withURI(
-                            $this->data_factory->uri(
-                                ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(\QstsQuestionPageGUI::class, 'edit')
-                            )
-                        )->withParameter($page_id_token, (string) $this->question->getPageId())
-                        ->buildURI()->__toString()
+                    $this->ctrl->getLinkTargetByClass(\QstsQuestionPageGUI::class, 'edit')
                 )
             ])
         );
diff --git a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
index 1237fd2d08e9..b49a7a69e37b 100644
--- a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
@@ -21,6 +21,7 @@
 namespace ILIAS\Questions\Setup;
 
 use ILIAS\Questions\Question\Persistence\TableNameBuilder;
+use ILIAS\Questions\Question\Persistence\TableTypes;
 
 class ClozeQuestionTables implements \ilDatabaseUpdateSteps
 {
@@ -38,7 +39,7 @@ public function prepare(\ilDBInterface $db): void
 
     public function step_1(): void
     {
-        $table_name = $this->table_name_builder->getTypeSpecificAnswerFormsTableName();
+        $table_name = $this->table_name_builder->getTableNameFor(TableTypes::TypeSpecificAnswerForms);
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
                 'answer_form_id' => [
@@ -66,7 +67,7 @@ public function step_1(): void
 
     public function step_2(): void
     {
-        $table_name = $this->table_name_builder->getAnswerInputsTableName();
+        $table_name = $this->table_name_builder->getTableNameFor(TableTypes::AnswerInputs);
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
                 'id' => [
@@ -127,7 +128,7 @@ public function step_2(): void
 
     public function step_3(): void
     {
-        $table_name = $this->table_name_builder->getAnswerOptionsTableName();
+        $table_name = $this->table_name_builder->getTableNameFor(TableTypes::AnswerOptions);
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
                 'id' => [
@@ -176,7 +177,7 @@ public function step_3(): void
 
     public function step_4(): void
     {
-        $table_name = $this->table_name_builder->getAdditionalTableName('combinations');
+        $table_name = $this->table_name_builder->getTableNameFor(TableTypes::Additional, 'combinations');
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
                 'id' => [
@@ -212,7 +213,7 @@ public function step_4(): void
 
     public function step_5(): void
     {
-        $table_name = $this->table_name_builder->getResponsesTableName();
+        $table_name = $this->table_name_builder->getTableNameFor(TableTypes::Responses);
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
                 'id' => [

From ee633016180fdeb84a109574de5c441caa79b46a Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Tue, 23 Dec 2025 14:38:50 +0100
Subject: [PATCH 091/141] Implementing Persistence

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       |   5 +-
 .../PageEditor/class.ilPCAnswerForm.php       |  14 -
 .../Questions/src/AnswerForm/Factory.php      |  25 +-
 .../Questions/src/AnswerForm/Persistence.php  |  20 +-
 .../Questions/src/AnswerForm/Properties.php   |   3 +-
 .../src/AnswerForm/TypeGenericProperties.php  |  67 +++-
 .../src/AnswerFormTypes/Cloze/Persistence.php | 115 ++++--
 .../Cloze/Properties/AnswerForm/Factory.php   |   6 +-
 .../Properties/AnswerForm/Properties.php      | 116 +++++-
 .../Cloze/Properties/ClozeText/Text.php       |  21 +-
 .../AnswerOption.php                          |  36 +-
 .../AnswerOptions.php                         |  49 ++-
 .../{Properties => AnswerOptions}/Factory.php |  23 +-
 .../Properties.php                            | 141 ++++++-
 .../Cloze/Properties/Gaps/Factory.php         |   6 +-
 .../Cloze/Properties/Gaps/Gap.php             | 370 +++++++++++++++---
 .../Cloze/Properties/Gaps/Gaps.php            | 101 ++++-
 .../Cloze/Properties/Gaps/LongMenu.php        |  51 +--
 .../Cloze/Properties/Gaps/Numeric.php         |  46 ++-
 .../Cloze/Properties/Gaps/Select.php          |  28 +-
 .../Cloze/Properties/Gaps/Text.php            |  38 +-
 .../Cloze/Properties/Gaps/Type.php            |  12 +-
 components/ILIAS/Questions/src/Collector.php  |   2 +-
 .../src/{Question => }/Persistence/Column.php |  16 +-
 .../{Question => }/Persistence/CoreTables.php |  22 +-
 .../Questions/src/Persistence/Delete.php      |  59 +++
 .../src/{Question => }/Persistence/Insert.php |  50 +--
 .../src/{Question => }/Persistence/Join.php   |   2 +-
 .../{Question => }/Persistence/JoinType.php   |   2 +-
 .../{Question => }/Persistence/Junctor.php    |   2 +-
 .../{Question => }/Persistence/Manipulate.php |  35 +-
 .../src/Persistence/ManipulationType.php      |  27 ++
 .../{Question => }/Persistence/Operator.php   |   2 +-
 .../src/{Question => }/Persistence/Order.php  |   2 +-
 .../Persistence/OrderDirection.php            |   2 +-
 .../src/{Question => }/Persistence/Query.php  |  65 ++-
 .../Questions/src/Persistence/Replace.php     |  32 ++
 .../{Question => }/Persistence/Repository.php | 118 ++++--
 .../src/{Question => }/Persistence/Select.php |   8 +-
 .../{Question => }/Persistence/Storable.php   |   2 +-
 .../src/{Question => }/Persistence/Table.php  |   2 +-
 .../Persistence/TableNameBuilder.php          |   2 +-
 .../Persistence/TableNameSpace.php            |   2 +-
 .../Persistence/TableNameSpaceCore.php        |   2 +-
 .../{Question => }/Persistence/TableTypes.php |   2 +-
 .../src/{Question => }/Persistence/Update.php |  32 +-
 .../src/{Question => }/Persistence/Value.php  |   4 +-
 .../src/{Question => }/Persistence/Where.php  |   2 +-
 .../Definitions/EnvironmentImplementation.php |   2 +-
 .../Layout/Definitions/QuestionsTable.php     |   2 +-
 .../Questions/src/Presentation/Views/Edit.php |  29 +-
 .../ILIAS/Questions/src/Question/Question.php |   7 +-
 .../src/Question/QuestionImplementation.php   | 123 +++++-
 .../Questions/src/Question/Views/Edit.php     |  19 +-
 .../ILIAS/Questions/src/Setup/Agent.php       |   4 +-
 .../src/Setup/ClozeQuestionTables.php         |   4 +-
 56 files changed, 1540 insertions(+), 439 deletions(-)
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/{Properties => AnswerOptions}/AnswerOption.php (72%)
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/{Properties => AnswerOptions}/AnswerOptions.php (84%)
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/{Properties => AnswerOptions}/Factory.php (85%)
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/{Properties => AnswerOptions}/Properties.php (67%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Column.php (65%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/CoreTables.php (80%)
 create mode 100644 components/ILIAS/Questions/src/Persistence/Delete.php
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Insert.php (59%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Join.php (96%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/JoinType.php (92%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Junctor.php (93%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Manipulate.php (58%)
 create mode 100644 components/ILIAS/Questions/src/Persistence/ManipulationType.php
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Operator.php (96%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Order.php (94%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/OrderDirection.php (92%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Query.php (68%)
 create mode 100644 components/ILIAS/Questions/src/Persistence/Replace.php
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Repository.php (60%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Select.php (81%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Storable.php (93%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Table.php (95%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/TableNameBuilder.php (97%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/TableNameSpace.php (96%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/TableNameSpaceCore.php (94%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/TableTypes.php (95%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Update.php (76%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Value.php (92%)
 rename components/ILIAS/Questions/src/{Question => }/Persistence/Where.php (96%)

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index bb6fdf7339f2..ea0c19fc09a1 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -20,9 +20,9 @@
 
 namespace ILIAS\Questions\Legacy;
 
-use ILIAS\Questions\Question\Persistence\Repository as QuestionsRepository;
+use ILIAS\Questions\Persistence\Repository as QuestionsRepository;
 use ILIAS\Questions\AnswerFormTypes\Cloze;
-use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
+use ILIAS\Questions\Persistence\TableNameSpaceCore;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Presentation\Layout\Definitions\Factory as DefinitionsFactory;
@@ -60,6 +60,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic[QuestionsRepository::class] = static fn($c): QuestionsRepository =>
             new QuestionsRepository(
                 $DIC['ilDB'],
+                $DIC['refinery'],
                 new UuidFactory(),
                 $c[AnswerFormFactory::class]
             );
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
index 8881d2f112aa..ae04f8a19f66 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
@@ -77,20 +77,6 @@ public function create(
         );
     }
 
-    private function getAnswerFormIds(): array
-    {
-        return array_reduce(
-            $this->dom_util->path(
-                $this->getPage()->getDomDoc(),
-                '//' . self::ANSWER_FORM_ELEMENT_TAG
-            ),
-            function (array $c, \DomNode $node): Uuid {
-                $node->getAttribute(self::ANSWER_FORM_ID_ATTRIBUT);
-            },
-            []
-        );
-    }
-
     public static function handleCopiedContent(
         DOMDocument $a_domdoc,
         bool $a_self_ass = true,
diff --git a/components/ILIAS/Questions/src/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerForm/Factory.php
index a281dde81f12..db5e18c1e3fa 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Factory.php
@@ -54,11 +54,22 @@ public function getAvailableDefinitions(): array
         return array_values($this->available_answer_form_types);
     }
 
+    public function getDefinitionForClass(
+        string $class
+    ): Definition {
+        $definition = $this->available_answer_form_types[$this->getHashedClass($class)] ?? null;
+        if ($definition === null) {
+            throw new InvalidArgumentException('This type of answer form does not exist.');
+        }
+        return $definition;
+    }
+
     /**
      * @return array<string, \ILIAS\Questions\AnswerForm\Definition>
      */
-    public function getAnswerFormTypesArrayForSelect(Language $lng): array
-    {
+    public function getAnswerFormTypesArrayForSelect(
+        Language $lng
+    ): array {
         return array_reduce(
             $this->available_answer_form_types,
             function (array $c, Definition $v) use ($lng): array {
@@ -74,8 +85,9 @@ public function getHashedClass(string $class): string
         return md5($class);
     }
 
-    public function buildTypeDefinitionFromSelectValue(string $value): Definition
-    {
+    public function buildTypeDefinitionFromSelectValue(
+        string $value
+    ): Definition {
         $type = $this->available_answer_form_types[$value] ?? null;
         if ($type === null) {
             throw new InvalidArgumentException('This type of answer form does not exist.');
@@ -83,8 +95,9 @@ public function buildTypeDefinitionFromSelectValue(string $value): Definition
         return $type;
     }
 
-    public function getDefaultTypeGenericProperties(Uuid $question_id): TypeGenericProperties
-    {
+    public function getDefaultTypeGenericProperties(
+        Uuid $question_id
+    ): TypeGenericProperties {
         return new TypeGenericProperties(
             $this->uuid_factory->uuid4(),
             $question_id
diff --git a/components/ILIAS/Questions/src/AnswerForm/Persistence.php b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
index 6d97fbe24c5e..f81f70a0cad9 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
@@ -20,14 +20,26 @@
 
 namespace ILIAS\Questions\AnswerForm;
 
-use ILIAS\Questions\Question\Persistence\Column;
-use ILIAS\Questions\Question\Persistence\Query;
-use ILIAS\Questions\Question\Persistence\TableNameBuilder;
-use ILIAS\Questions\Question\Persistence\TableNameSpace;
+use ILIAS\Questions\Persistence\Column;
+use ILIAS\Questions\Persistence\Query;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableNameSpace;
+use ILIAS\Questions\Persistence\TableTypes;
 
 interface Persistence
 {
     public function getPublicNameSpace(): TableNameSpace;
+    public function getColumns(
+        TableNameBuilder $table_name_builder,
+        TableTypes $table_type,
+        ?string $table_identifier = null,
+        array $columns_to_skip = []
+    ): array;
+    public function getIdColumn(
+        TableNameBuilder $table_name_builder,
+        TableTypes $table_type,
+        ?string $table_identifier = null
+    ): Column;
     public function completeQuery(
         TableNameBuilder $table_name_builder,
         Query $query,
diff --git a/components/ILIAS/Questions/src/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerForm/Properties.php
index 2a558d7e79ef..6897d1d0b1ab 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Properties.php
@@ -20,10 +20,11 @@
 
 namespace ILIAS\Questions\AnswerForm;
 
+use ILIAS\Questions\Persistence\Storable;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 
-interface Properties
+interface Properties extends Storable
 {
     public function getAnswerFormId(): ?Uuid;
     public function getQuestionId(): ?Uuid;
diff --git a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
index 7a452ad0c979..fe66ab6934bc 100644
--- a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
@@ -20,13 +20,22 @@
 
 namespace ILIAS\Questions\AnswerForm;
 
+use ILIAS\Questions\Persistence\CoreTables;
+use ILIAS\Questions\Persistence\Insert;
+use ILIAS\Questions\Persistence\Manipulate;
+use ILIAS\Questions\Persistence\ManipulationType;
+use ILIAS\Questions\Persistence\Storable;
+use ILIAS\Questions\Persistence\Update;
+use ILIAS\Questions\Persistence\Value;
+use ILIAS\Questions\Persistence\Where;
 use ILIAS\Data\UUID\Uuid;
 
-class TypeGenericProperties
+class TypeGenericProperties implements Storable
 {
     public function __construct(
         private readonly Uuid $answer_form_id,
         private readonly Uuid $question_id,
+        private readonly ?string $definition_class = null,
         private ?float $available_points = null,
         private ?int $image_size = null,
         private ?bool $shuffle_answer_options = null,
@@ -69,4 +78,60 @@ public function getAdditionalTextLegacy(): string
     {
         return $this->additional_text_legacy;
     }
+
+    public function toStorage(Manipulate $manipulate): Manipulate
+    {
+        if ($this->definition_class === null) {
+            throw new \UnexpectedValueException(
+                'You cannot save a Answer Form without a Type!'
+            );
+        }
+        return $manipulate->withAdditionalStatement(
+            $manipulate->getManipulationType() === ManipulationType::Create
+                ? $this->buildInsertStatement()
+                : $this->buildUpdateStatement()
+        );
+    }
+
+    private function buildInsertStatement(): Insert
+    {
+        return new Insert(
+            CoreTables::AnswerForms->getColumns(),
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
+                new Value(\ilDBConstants::T_TEXT, $this->definition_class),
+                new Value(\ilDBConstants::T_TEXT, $this->question_id->toString()),
+                new Value(\ilDBConstants::T_FLOAT, $this->available_points),
+                new Value(\ilDBConstants::T_INTEGER, $this->image_size),
+                new Value(\ilDBConstants::T_INTEGER, $this->shuffle_answer_options ? 1 : 0),
+                new Value(\ilDBConstants::T_TEXT, $this->additional_text),
+                new Value(\ilDBConstants::T_TEXT, $this->additional_text_legacy)
+
+            ]
+        );
+    }
+
+    private function buildUpdateStatement(): Update
+    {
+        $answer_form_table_definition = CoreTables::AnswerForms;
+        return new Update(
+            $answer_form_table_definition->getColumns([
+                $answer_form_table_definition->getIdColumn(),
+                'type',
+                'question_id',
+                'additional_text_legacy'
+            ]),
+            [
+                new Value(\ilDBConstants::T_FLOAT, $this->available_points),
+                new Value(\ilDBConstants::T_INT, $this->image_size),
+                new Value(\ilDBConstants::T_INT, $this->shuffle_answer_options ? 1 : 0),
+                new Value(\ilDBConstants::T_TEXT, $this->additional_text)
+
+            ],
+            new Where(
+                $answer_form_table_definition->getIdColumn(),
+                $this->answer_form_id->toString()
+            )
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
index 8789adabaa70..5b12a3cd294c 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
@@ -21,39 +21,45 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze;
 
 use ILIAS\Questions\AnswerForm\Persistence as PersistenceInterface;
-use ILIAS\Questions\Question\Persistence\TableTypes;
-use ILIAS\Questions\Question\Persistence\Query;
-use ILIAS\Questions\Question\Persistence\Join;
-use ILIAS\Questions\Question\Persistence\Column;
-use ILIAS\Questions\Question\Persistence\JoinType;
-use ILIAS\Questions\Question\Persistence\Select;
-use ILIAS\Questions\Question\Persistence\TableNameBuilder;
-use ILIAS\Questions\Question\Persistence\TableNameSpace;
-use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Query;
+use ILIAS\Questions\Persistence\Join;
+use ILIAS\Questions\Persistence\Column;
+use ILIAS\Questions\Persistence\JoinType;
+use ILIAS\Questions\Persistence\Select;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableNameSpace;
+use ILIAS\Questions\Persistence\TableNameSpaceCore;
 
 class Persistence implements PersistenceInterface
 {
+    private const string ID_COLUMN = 'id';
+
+    private const string ANSWER_FORM_TABLE_ID_COLUMN = 'answer_form_id';
     private const string ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
     private const array ANSWER_FORM_TABLE_COLUMNS = [
+        'answer_form_id',
         'scoring_identical_responses',
         'combinations_activated'
     ];
 
-    private const string ANSWER_INPUTS_TABLE_ID_COLUMN = 'id';
     private const string ANSWER_INPUTS_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
     private const array ANSWER_INPUTS_TABLE_COLUMNS = [
-        'id AS answer_input_id',
+        'id',
+        'answer_form_id',
         'position',
         'gap_type',
         'max_chars',
         'step_size',
         'text_matching_method',
+        'min_autocomplete',
         'shuffle_answer_options'
     ];
 
     private const string ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN = 'answer_input_id';
     private const array ANSWER_OPTIONS_TABLE_COLUMNS = [
-        'id AS answer_option_id',
+        'id',
+        'answer_input_id',
         'position',
         'text_value',
         'points',
@@ -61,9 +67,11 @@ class Persistence implements PersistenceInterface
         'upper_limit'
     ];
 
+    private const string COMBINATIONS_TABLE_IDENTIFIER = 'combinations';
     private const string COMBINATIONS_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
     private const array COMBINATIONS_TABLE_COLUMNS = [
-        'id AS combination_id',
+        'id',
+        'answer_form_id',
         'answer_options',
         'points'
     ];
@@ -78,33 +86,69 @@ public function getPublicNameSpace(): TableNameSpace
         return $this->table_namespace;
     }
 
+    public function getColumns(
+        TableNameBuilder $table_name_builder,
+        TableTypes $table_type,
+        ?string $table_identifier = null,
+        array $columns_to_skip = []
+    ): array {
+        $table = $table_type->getTable($table_name_builder, $table_identifier);
+        $column_identifiers = match($table_type) {
+            TableTypes::TypeSpecificAnswerForms => self::ANSWER_FORM_TABLE_COLUMNS,
+            TableTypes::AnswerInputs => self::ANSWER_INPUTS_TABLE_COLUMNS,
+            TableTypes::AnswerOptions => self::ANSWER_OPTIONS_TABLE_COLUMNS,
+            TableTypes::Additional => self::COMBINATIONS_TABLE_COLUMNS
+        };
+        return array_map(
+            fn(string $v): Column => new Column($table, $v),
+            array_filter(
+                $column_identifiers,
+                fn(string $v) => !in_array($v, $columns_to_skip)
+            )
+        );
+    }
+
+    public function getIdColumn(
+        TableNameBuilder $table_name_builder,
+        TableTypes $table_type,
+        ?string $table_identifier = null
+    ): Column {
+        return match($table_type) {
+            TableTypes::TypeSpecificAnswerForms => new Column(
+                $table_type->getTable($table_name_builder),
+                self::ANSWER_FORM_TABLE_ID_COLUMN
+            ),
+            default => new Column(
+                $table_type->getTable($table_name_builder, $table_identifier),
+                self::ID_COLUMN
+            )
+        };
+    }
+
     public function completeQuery(
         TableNameBuilder $table_name_builder,
         Query $query,
         Column $base_table_id_column
     ): Query {
-        $answer_form_specific_table = TableTypes::TypeSpecificAnswerForms
-            ->getTable($table_name_builder);
-        $answer_input_table = TableTypes::AnswerInputs
-            ->getTable($table_name_builder);
-        $answer_options_table = TableTypes::AnswerOptions
+        $answer_form_specific_table_definition = TableTypes::TypeSpecificAnswerForms;
+        $answer_input_table_definition = TableTypes::AnswerInputs;
+        $answer_input_table = $answer_input_table_definition
             ->getTable($table_name_builder);
-        $combinations_table = TableTypes::Additional
-            ->getTable($table_name_builder, 'combinations');
+        $answer_options_table_definition = TableTypes::AnswerOptions;
+        $combinations_table_definition = TableTypes::Additional;
 
         return $query->withAdditionalJoin(
             new Join(
                 $base_table_id_column,
                 new Column(
-                    $answer_form_specific_table,
+                    $answer_form_specific_table_definition->getTable($table_name_builder),
                     self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
                 ),
                 JoinType::Left
             )
         )->withAdditionalSelect(
             new Select(
-                $answer_form_specific_table,
-                self::ANSWER_FORM_TABLE_COLUMNS
+                $this->getColumns($table_name_builder, $answer_form_specific_table_definition)
             )
         )->withAdditionalJoin(
             new Join(
@@ -117,39 +161,46 @@ public function completeQuery(
             )
         )->withAdditionalSelect(
             new Select(
-                $answer_input_table,
-                self::ANSWER_INPUTS_TABLE_COLUMNS
+                $this->getColumns($table_name_builder, $answer_input_table_definition)
             )
         )->withAdditionalJoin(
             new Join(
                 new Column(
                     $answer_input_table,
-                    self::ANSWER_INPUTS_TABLE_ID_COLUMN
+                    self::ID_COLUMN
                 ),
                 new Column(
-                    $answer_options_table,
+                    $answer_options_table_definition->getTable($table_name_builder),
                     self::ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN
                 ),
                 JoinType::Left
             )
         )->withAdditionalSelect(
             new Select(
-                $answer_options_table,
-                self::ANSWER_OPTIONS_TABLE_COLUMNS
+                $this->getColumns(
+                    $table_name_builder,
+                    $answer_input_table_definition
+                )
             )
         )->withAdditionalJoin(
             new Join(
                 $base_table_id_column,
                 new Column(
-                    $combinations_table,
+                    $combinations_table_definition->getTable(
+                        $table_name_builder,
+                        self::COMBINATIONS_TABLE_IDENTIFIER
+                    ),
                     self::COMBINATIONS_TABLE_FOREIGN_KEY_COLUMN
                 ),
                 JoinType::Left
             )
         )->withAdditionalSelect(
             new Select(
-                $combinations_table,
-                self::COMBINATIONS_TABLE_COLUMNS
+                $this->getColumns(
+                    $table_name_builder,
+                    $combinations_table_definition,
+                    self::COMBINATIONS_TABLE_IDENTIFIER
+                )
             )
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
index 1bde6f2050c1..58bc67d186d4 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
@@ -69,7 +69,11 @@ public function fromForm(
         ScoringIdentical $scoring_of_identical_responses,
         bool $combinations_enabled
     ): Properties {
-        $updated_gaps = $cloze_text->updateGapsFromMarkdown($properties->getGaps());
+        $updated_gaps = $cloze_text->updateGapsFromMarkdown(
+            $properties->getAnswerFormId(),
+            $properties->getGaps()
+        );
+
         return $properties
             ->withClozeText(
                 $cloze_text->withIdsOfNewGapsInClozeText($updated_gaps->getUndefinedGaps())
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
index b62ea994ed55..845e6ba93c9f 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
@@ -20,13 +20,23 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm;
 
+use ILIAS\Questions\AnswerForm\Persistence;
 use ILIAS\Questions\AnswerForm\Properties as PropertiesInterface;
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
+use ILIAS\Questions\Persistence\Insert;
+use ILIAS\Questions\Persistence\Update;
+use ILIAS\Questions\Persistence\Manipulate;
+use ILIAS\Questions\Persistence\ManipulationType;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Value;
+use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
@@ -72,6 +82,7 @@ public function getTypeGenericProperties(): TypeGenericProperties
         return new TypeGenericProperties(
             $this->answer_form_id,
             $this->question_id,
+            Definition::class,
             null,
             null,
             null,
@@ -85,8 +96,9 @@ public function getClozeText(): Text
         return $this->cloze_text;
     }
 
-    public function withClozeText(Text $cloze_text): self
-    {
+    public function withClozeText(
+        Text $cloze_text
+    ): self {
         $clone = clone $this;
         $clone->cloze_text = $cloze_text;
         return $clone;
@@ -102,8 +114,9 @@ public function getScoringOfIdenticalResponses(): ScoringIdentical
         return $this->scoring_identical;
     }
 
-    public function withScoringOfIdenticalResponses(ScoringIdentical $scoring_identical): self
-    {
+    public function withScoringOfIdenticalResponses(
+        ScoringIdentical $scoring_identical
+    ): self {
         $clone = clone $this;
         $clone->scoring_identical = $scoring_identical;
         return $clone;
@@ -114,8 +127,9 @@ public function areCombinationsEnabled(): bool
         return $this->combinations_enabled;
     }
 
-    public function withCombinationsEnabled(bool $combinations_enabled): self
-    {
+    public function withCombinationsEnabled(
+        bool $combinations_enabled
+    ): self {
         $clone = clone $this;
         $clone->combinations_enabled = $combinations_enabled;
         return $clone;
@@ -126,15 +140,17 @@ public function getGaps(): Gaps
         return $this->gaps;
     }
 
-    public function withGaps(Gaps $gaps): self
-    {
+    public function withGaps(
+        Gaps $gaps
+    ): self {
         $clone = clone $this;
         $clone->gaps = $gaps;
         return $clone;
     }
 
-    public function getBasicPropertiesForListing(Language $lng): array
-    {
+    public function getBasicPropertiesForListing(
+        Language $lng
+    ): array {
         return [
             $lng->txt('cloze_text') => $this->cloze_text
                 ->getRenderedMarkdownForEditingPresentation($this->gaps),
@@ -240,13 +256,83 @@ public function withValuesFromCarry(
 
         $clone->gaps = $carry->retrieve(
             self::FORM_KEY_GAPS_TO_EDIT,
-            $clone->cloze_text->updateGapsFromMarkdown($this->getGaps())
-                ->getFromCarryTransformation(
-                    $refinery,
-                    $gaps_factory
-                )
+            $clone->cloze_text->updateGapsFromMarkdown(
+                $this->getAnswerFormId(),
+                $this->getGaps()
+            )->getFromCarryTransformation(
+                $refinery,
+                $gaps_factory
+            )
         );
 
         return $clone;
     }
+
+    public function toStorage(
+        Manipulate $manipulate
+    ): Manipulate {
+        $persistence = $manipulate->getPersistenceForDefinitionClass(Definition::class);
+        $table_name_builder = $manipulate->getTableNameBuilder(Definition::class);
+
+        $answer_form_statement = $manipulate->getManipulationType() === ManipulationType::Create
+            ? $this->buildInsertAnswerFormStatement(
+                $persistence,
+                $table_name_builder
+            ) : $this->buildUpdateAnswerFormStatement(
+                $persistence,
+                $table_name_builder
+            );
+
+        return $this->gaps->toStorage(
+            $manipulate->withAdditionalStatement(
+                $answer_form_statement
+            ),
+            $persistence,
+            $table_name_builder
+        );
+    }
+
+    private function buildInsertAnswerFormStatement(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Insert {
+        $table_definition = TableTypes::TypeSpecificAnswerForms;
+        return new Insert(
+            $persistence->getColumns(
+                $table_name_builder,
+                $table_definition
+            ),
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
+                new Value(\ilDBConstants::T_TEXT, $this->scoring_identical->value),
+                new Value(\ilDBConstants::T_INTEGER, $this->combinations_enabled ? 1 : 0)
+            ]
+        );
+    }
+
+    private function buildUpdateAnswerFormStatement(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Update {
+        $table_definition = TableTypes::TypeSpecificAnswerForms;
+        return new Update(
+            $persistence->getColumns(
+                $table_name_builder,
+                $table_definition
+            ),
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->scoring_identical->value),
+                new Value(\ilDBConstants::T_INTEGER, $this->combinations_enabled ? 1 : 0)
+            ],
+            [
+                new Where(
+                    $persistence->getIdColumn(
+                        $table_name_builder,
+                        $table_definition
+                    ),
+                    new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString())
+                )
+            ]
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 3bb2bed3321b..49ca76b35e41 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -24,6 +24,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
 use ILIAS\Data\Text\Markdown;
 use ILIAS\Data\Text\Factory as TextFactory;
+use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
@@ -84,6 +85,7 @@ public function getRenderedMarkdownForEditingPresentation(
     }
 
     public function updateGapsFromMarkdown(
+        Uuid $answer_form_id,
         Gaps $pre_existing_gaps
     ): Gaps {
         if ($this->cloze_text->getRawRepresentation() === '') {
@@ -93,22 +95,33 @@ public function updateGapsFromMarkdown(
         $position = 0;
         return array_reduce(
             $this->mustache_engine->getTokenizer()->scan($this->cloze_text->getRawRepresentation()),
-            function (Gaps $c, array $v) use (&$position): Gaps {
+            function (Gaps $c, array $v) use ($answer_form_id, &$position): Gaps {
                 if ($v['type'] !== '_v'
                     || !str_starts_with($v['name'], Gap::GAP_PLACEHOLDER_NAME)) {
                     return $c;
                 }
 
                 if ($v['name'] === Gap::GAP_PLACEHOLDER_NAME) {
-                    return $c->withNewGap($position++);
+                    return $c->withNewGap($answer_form_id, $position++);
                 }
 
                 $gap = $c->getGapByTagName($v['name']);
                 if ($gap !== null) {
-                    return $c->withPosition($position++);
+                    return $c->withGap(
+                        $gap->withProperties(
+                            $gap->getProperties()->withPosition(
+                                $answer_form_id,
+                                $position++
+                            )
+                        )
+                    );
                 }
 
-                return $c->withAdditionalGapFromTagName($v['name'], $position++);
+                return $c->withAdditionalGapFromTagName(
+                    $answer_form_id,
+                    $v['name'],
+                    $position++
+                );
             },
             $pre_existing_gaps
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
similarity index 72%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOption.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
index 69140125a5f5..ab041de5359c 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOption.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
@@ -20,7 +20,10 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
 
-use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Questions\Persistence\Replace;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Data\UUID\Uuid;
 
 class AnswerOption
@@ -34,6 +37,7 @@ class AnswerOption
 
     public function __construct(
         private readonly Uuid $answer_option_id,
+        private readonly Uuid $answer_input_id,
         private int $position,
         private string $text_value = '',
         private ?float $lower_limit = null,
@@ -130,8 +134,36 @@ public function buildArrayForHiddenInput(): array
         return $values;
     }
 
-    public function toPersistence(ManipulateQuery $query): ManipulateQuery
+    public function buildReplace(
+        ?Replace $replace,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Replace {
+        $table_definition = TableTypes::AnswerOptions;
+
+        if ($replace === null) {
+            return new Replace(
+                $persistence->getColumns($table_name_builder, $table_definition),
+                $this->buildValuesForGapReplace()
+            );
+        }
+
+        return $replace->withAdditionalValues(
+            $this->buildValuesForGapReplace()
+        );
+    }
+
+    private function buildValuesForGapReplace(): array
     {
+        return [
+            new Value(\ilDBConstants::T_TEXT, $this->answer_option_id->toString()),
+            new Value(\ilDBConstants::T_TEXT, $this->answer_input_id->toString()),
+            new Value(\ilDBConstants::T_INTEGER, $this->position),
+            new Value(\ilDBConstants::T_TEXT, $this->text_value),
+            new Value(\ilDBConstants::T_FLOAT, $this->points),
+            new Value(\ilDBConstants::T_FLOAT, $this->lower_limit),
+            new Value(\ilDBConstants::T_FLOAT, $this->upper_limit)
 
+        ];
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
similarity index 84%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOptions.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
index 4bf7df0f3f20..ab521230ad03 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/AnswerOptions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
@@ -20,7 +20,10 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
 
-use ILIAS\Questions\Question\Persistence\ManipulateQuery;
+use ILIAS\Questions\Persistence\Replace;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Data\UUID\Uuid;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 
@@ -35,10 +38,12 @@ public function __construct(
         $this->answer_options_awarding_points = $this->buildAnswerOptionsAwardingPointsFromAnswerOptions($answer_options);
     }
 
-    public function getAnswerOptionForPositionOrNew(int $position): AnswerOption
-    {
+    public function getAnswerOptionForPositionOrNew(
+        Uuid $answer_input_id,
+        int $position
+    ): AnswerOption {
         return $this->answer_options[$position]
-            ?? $this->factory->getDefaultAnswerOptionForPosition($position);
+            ?? $this->factory->getDefaultAnswerOptionForPosition($answer_input_id, $position);
     }
 
     public function getTagsArrayFromAnswerOptions(): array
@@ -54,8 +59,9 @@ public function getAnswerOptionsAwardingPoints(): array
         return $this->answer_options_awarding_points;
     }
 
-    public function withAnswerOptionsAwardingPoints(array $options): self
-    {
+    public function withAnswerOptionsAwardingPoints(
+        array $options
+    ): self {
         $clone = clone $this;
         $clone->answer_options_awarding_points = array_reduce(
             $options,
@@ -71,14 +77,16 @@ function (array $c, string $v): array {
         return $clone;
     }
 
-    public function withAnswerOptions(array $answer_options): self
-    {
+    public function withAnswerOptions(
+        array $answer_options
+    ): self {
         $clone = clone $this;
         $clone->answer_options = $answer_options;
         return $clone;
     }
 
     public function withValuesFromHiddenInputValue(
+        Uuid $answer_input_id,
         ?string $value
     ): self {
         if ($value === null
@@ -93,6 +101,7 @@ public function withValuesFromHiddenInputValue(
         $clone->answer_options = array_map(
             fn(array $vs): AnswerOption => $this->factory->buildAnswerOption(
                 $vs[AnswerOption::FORM_KEY_ID],
+                $answer_input_id,
                 $vs[AnswerOption::FORM_KEY_POSITION],
                 $vs[AnswerOption::FORM_KEY_TEXT_VALUE],
                 $vs[AnswerOption::FORM_KEY_LOWER_LIMIT] ?? null,
@@ -114,13 +123,15 @@ public function withValuesFromHiddenInputValue(
     }
 
     public function withAnswerOptionsFromTags(
+        Uuid $answer_input_id,
         array $tags
     ): self {
         $clone = clone $this;
         $position = 0;
         $clone->answer_options = array_map(
-            function (string $v) use (&$position): AnswerOption {
+            function (string $v) use ($answer_input_id, &$position): AnswerOption {
                 return $this->buildAnswerOptionFromTag(
+                    $answer_input_id,
                     $position++,
                     $v
                 );
@@ -186,9 +197,20 @@ function (array $c, AnswerOption $v) use ($ff, $build_label): array {
         );
     }
 
-    public function toPersistence(ManipulateQuery $query): ManipulateQuery
-    {
-
+    public function buildReplace(
+        ?Replace $replace,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Replace {
+        return array_reduce(
+            $this->answer_options,
+            fn(AnswerOption $v): Replace => $v->buildReplace(
+                $replace,
+                $persistence,
+                $table_name_builder
+            ),
+            $replace
+        );
     }
 
     private function buildAnswerOptionsAwardingPointsFromAnswerOptions(
@@ -201,11 +223,12 @@ private function buildAnswerOptionsAwardingPointsFromAnswerOptions(
     }
 
     private function buildAnswerOptionFromTag(
+        Uuid $answer_input_id,
         int $position,
         string $text_value
     ): AnswerOption {
         $answer_option = $this->retrieveAnswerOptionByTextValue($text_value)
-            ?? $this->factory->getDefaultAnswerOptionForPosition($position);
+            ?? $this->factory->getDefaultAnswerOptionForPosition($answer_input_id, $position);
         return $answer_option
             ->withPosition($position)
             ->withTextValue($text_value);
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
similarity index 85%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Factory.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
index 09e2cbd9a0de..469e504ea011 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
@@ -32,28 +32,28 @@ public function __construct(
     ) {
     }
 
-    public function getDefaultProperties(
-        Uuid $answer_input_id
-    ): Properties {
-        return new Properties(
-            $answer_input_id,
-            new AnswerOptions(
-                $this,
-                []
-            )
+    public function getDefaultAnswerOptions(): AnswerOptions
+    {
+        return new AnswerOptions(
+            $this,
+            []
         );
     }
 
-    public function getDefaultAnswerOptionForPosition(int $position): AnswerOption
-    {
+    public function getDefaultAnswerOptionForPosition(
+        Uuid $answer_input_id,
+        int $position
+    ): AnswerOption {
         return new AnswerOption(
             $this->uuid_factory->uuid4(),
+            $answer_input_id,
             $position
         );
     }
 
     public function buildAnswerOption(
         string $answer_option_id,
+        Uuid $answer_input_id,
         int $position,
         string $text_value,
         ?string $lower_limit,
@@ -62,6 +62,7 @@ public function buildAnswerOption(
     ): AnswerOption {
         return new AnswerOption(
             $this->uuid_factory->fromString($answer_option_id),
+            $answer_input_id,
             $position,
             $text_value,
             $this->convertToFloatOrNull($lower_limit),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Properties.php
similarity index 67%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Properties.php
index 3c7d8ebfad70..a2bcda506eb9 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Properties.php
@@ -20,6 +20,12 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
 
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Type;
+use ILIAS\Questions\Persistence\Replace;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
 use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
@@ -30,6 +36,7 @@
 
 class Properties
 {
+    private const string FORM_KEY_TYPE = 'type';
     private const string FORM_KEY_MAX_CHARS = 'max_chars';
     private const string FORM_KEY_STEP_SIZE = 'step_size';
     private const string FORM_KEY_TEXT_MATCHING_METHOD = 'matching_method';
@@ -42,7 +49,10 @@ class Properties
      */
     public function __construct(
         private readonly Uuid $answer_input_id,
+        private readonly Uuid $answer_form_id,
+        private int $position,
         private AnswerOptions $answer_options,
+        private ?Type $type = null,
         private ?int $max_chars = null,
         private ?float $step_size = null,
         private ?TextMatchingOptions $text_matching_method = null,
@@ -56,13 +66,40 @@ public function getAnswerInputId(): Uuid
         return $this->answer_input_id;
     }
 
+    public function getPosition(): int
+    {
+        return $this->position;
+    }
+
+    public function withPosition(
+        int $position
+    ): self {
+        $clone = clone $this;
+        $clone->position = $position;
+        return $clone;
+    }
+
+    public function getType(): ?Type
+    {
+        return $this->type;
+    }
+
+    public function withType(
+        Type $type
+    ): self {
+        $clone = clone $this;
+        $clone->type = $type;
+        return $clone;
+    }
+
     public function getMaxChars(): ?int
     {
         return $this->max_chars;
     }
 
-    public function withMaxChars(?int $max_chars): self
-    {
+    public function withMaxChars(
+        ?int $max_chars
+    ): self {
         $clone = clone $this;
         $clone->max_chars = $max_chars;
         return $clone;
@@ -73,8 +110,9 @@ public function getStepSize(): ?float
         return $this->step_size;
     }
 
-    public function withStepSize(float $step_size): self
-    {
+    public function withStepSize(
+        float $step_size
+    ): self {
         $clone = clone $this;
         $clone->step_size = $step_size;
         return $clone;
@@ -85,8 +123,9 @@ public function getTextMatchingMethod(): ?TextMatchingOptions
         return $this->text_matching_method;
     }
 
-    public function withTextMatchingMethod(TextMatchingOptions $matching_method): self
-    {
+    public function withTextMatchingMethod(
+        TextMatchingOptions $matching_method
+    ): self {
         $clone = clone $this;
         $clone->text_matching_method = $matching_method;
         return $clone;
@@ -97,8 +136,9 @@ public function getMinAutocomplete(): ?int
         return $this->min_autocomplete;
     }
 
-    public function withMinAutocomplete(int $min_autocomplete): self
-    {
+    public function withMinAutocomplete(
+        int $min_autocomplete
+    ): self {
         $clone = clone $this;
         $clone->min_autocomplete = $min_autocomplete;
         return $clone;
@@ -109,8 +149,9 @@ public function getShuffleAnswerOptions(): ?bool
         return $this->shuffle_answer_options;
     }
 
-    public function withShuffleAnswerOptions(bool $shuffle_answer_options): self
-    {
+    public function withShuffleAnswerOptions(
+        bool $shuffle_answer_options
+    ): self {
         $clone = clone $this;
         $clone->shuffle_answer_options = $shuffle_answer_options;
         return $clone;
@@ -121,16 +162,23 @@ public function getAnswerOptions(): AnswerOptions
         return $this->answer_options;
     }
 
-    public function withAnswerOptions(AnswerOptions $answer_options): self
-    {
+    public function withAnswerOptions(
+        AnswerOptions $answer_options
+    ): self {
         $clone = clone $this;
         $clone->answer_options = $answer_options;
         return $clone;
     }
 
-    public function getCarryInputs(FieldFactory $ff): Group
-    {
+    public function getCarryInputs(
+        FieldFactory $ff
+    ): Group {
         $inputs = [];
+        if ($this->type !== null) {
+            $inputs[self::FORM_KEY_TYPE] = $ff->hidden()->withValue($this->type?->getIdentifier() ?? '')
+                ->withDedicatedName(self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId());
+        }
+
         if ($this->max_chars !== null) {
             $inputs[self::FORM_KEY_MAX_CHARS] = $ff->hidden()->withValue($this->getMaxChars())
                 ->withDedicatedName(self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId());
@@ -163,11 +211,13 @@ public function getCarryInputs(FieldFactory $ff): Group
     }
 
     public function getFromCarryTransformation(
-        Refinery $refinery
+        Refinery $refinery,
+        array $available_gap_types
     ): Transformation {
         return $refinery->custom()->transformation(
-            function (CarryWrapper $v) use ($refinery): self {
+            function (CarryWrapper $v) use ($refinery, $available_gap_types): self {
                 $clone = clone $this;
+                $this->type = $this->retrieveTypeFromCarry($refinery, $v, $available_gap_types);
                 $clone->max_chars = $this->retrieveMaxCharsFromCarry($refinery, $v);
                 $clone->step_size = $this->retrieveStepSizeFromCarry($refinery, $v);
                 $clone->text_matching_method = $this->retrieveTextMatchingMethodFromCarry($refinery, $v);
@@ -179,6 +229,60 @@ function (CarryWrapper $v) use ($refinery): self {
         );
     }
 
+    public function buildReplace(
+        ?Replace $replace,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Replace {
+        if ($this->type === null) {
+            throw new \UnexpectedValueException(
+                'Gap Properties without Type cannot be stored.'
+            );
+        }
+
+        $table_definition = TableTypes::AnswerInputs;
+
+        if ($replace === null) {
+            return new Replace(
+                $persistence->getColumns($table_name_builder, $table_definition),
+                $this->buildValuesForGapReplace()
+            );
+        }
+
+        return $replace->withAdditionalValues(
+            $this->buildValuesForGapReplace()
+        );
+    }
+
+    private function buildValuesForGapReplace(): array
+    {
+        return [
+            new Value(\ilDBConstants::T_TEXT, $this->answer_input_id->toString()),
+            new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
+            new Value(\ilDBConstants::T_INTEGER, $this->position),
+            new Value(\ilDBConstants::T_TEXT, $this->type->getIdentifier()),
+            new Value(\ilDBConstants::T_INTEGER, $this->max_chars),
+            new Value(\ilDBConstants::T_FLOAT, $this->step_size),
+            new Value(\ilDBConstants::T_INTEGER, $this->text_matching_method->value),
+            new Value(\ilDBConstants::T_INTEGER, $this->min_autocomplete),
+            new Value(\ilDBConstants::T_INTEGER, $this->shuffle_answer_options ? 1 : 0)
+
+        ];
+    }
+
+    private function retrieveTypeFromCarry(
+        Refinery $refinery,
+        CarryWrapper $carry,
+        array $available_gap_types
+    ): ?Type {
+        return $carry->retrieve(
+            self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId(),
+            $refinery->custom()->transformation(
+                fn(?string $v): ?Type => $available_gap_types[$v] ?? $this->getType()
+            )
+        );
+    }
+
     private function retrieveMaxCharsFromCarry(
         Refinery $refinery,
         CarryWrapper $carry
@@ -252,7 +356,10 @@ private function retrieveAnswerOptionsFromCarry(
         return $carry->retrieve(
             self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
             $refinery->custom()->transformation(
-                fn(?string $v): AnswerOptions => $this->answer_options->withValuesFromHiddenInputValue($v)
+                fn(?string $v): AnswerOptions => $this->answer_options->withValuesFromHiddenInputValue(
+                    $this->answer_input_id,
+                    $v
+                )
             )
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index 996257b5e236..0d311e76ba9c 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -22,6 +22,7 @@
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Factory as PropertiesFactory;
 use ILIAS\Language\Language;
+use ILIAS\Data\UUID\Uuid;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 
 class Factory
@@ -53,16 +54,19 @@ public function getAvailableGapTypesOptionsArray(
     }
 
     public function getNewGap(
+        Uuid $answer_form_id,
         int $position,
         string $id = ''
     ): Gap {
         $answer_input_id = $id !== ''
             ? $this->uuid_factory->fromString($id)
             : $this->uuid_factory->uuid4();
+
         return new Gap(
             $answer_input_id,
+            $answer_form_id,
             $position,
-            $this->data_factory->getDefaultProperties($answer_input_id)
+            $this->data_factory->getDefaultAnswerOptions()
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index 5cbc2b73cd3c..f7cb6a4765f1 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -20,77 +20,246 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
+use ILIAS\Questions\AnswerForm\Persistence;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
+use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\Refinery\Transformation;
 
 class Gap
 {
     public const string GAP_PLACEHOLDER_NAME = 'GAP';
 
     private const string FORM_KEY_TYPE = 'type';
-    private const string FORM_KEY_DATA = 'data';
+    private const string FORM_KEY_MAX_CHARS = 'max_chars';
+    private const string FORM_KEY_STEP_SIZE = 'step_size';
+    private const string FORM_KEY_TEXT_MATCHING_METHOD = 'matching_method';
+    private const string FORM_KEY_MIN_AUTOCOMPLETE = 'min_autocomplete';
+    private const string FORM_KEY_SHUFFLE_ANSWER_OPTIONS = 'shuffle';
+    private const string FORM_KEY_ANSWER_OPTIONS = 'answer_options';
 
+    /**
+     * @param array<ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption> $answer_options
+     */
     public function __construct(
-        private Uuid $answer_input_id,
+        private readonly Uuid $answer_input_id,
+        private readonly Uuid $answer_form_id,
         private int $position,
-        private Properties $properties,
-        private ?Type $type = null
+        private AnswerOptions $answer_options,
+        private ?Type $type = null,
+        private ?int $max_chars = null,
+        private ?float $step_size = null,
+        private ?TextMatchingOptions $text_matching_method = null,
+        private ?int $min_autocomplete = null,
+        private ?bool $shuffle_answer_options = null
     ) {
     }
 
-    public function getAnswerInputId(): ?Uuid
+    public function getAnswerInputId(): Uuid
     {
         return $this->answer_input_id;
     }
 
-    public function withAnswerInputId(Uuid $answer_input_id): self
+    public function getPosition(): int
     {
+        return $this->position;
+    }
+
+    public function withPosition(
+        int $position
+    ): self {
         $clone = clone $this;
-        $clone->answer_input_id = $answer_input_id;
+        $clone->position = $position;
         return $clone;
     }
 
-    public function getPosition(): int
+    public function isUndefined(): bool
     {
-        return $this->position;
+        return $this->type === null;
     }
 
-    public function withPosition(int $position): self
+    public function getType(): ?Type
     {
+        return $this->type;
+    }
+
+    public function withType(
+        Type $type
+    ): self {
         $clone = clone $this;
-        $clone->position = $position;
+        $clone->type = $type;
         return $clone;
     }
 
-    public function withType(Type $type): self
+    public function getMaxChars(): ?int
     {
+        return $this->max_chars;
+    }
+
+    public function withMaxChars(
+        ?int $max_chars
+    ): self {
         $clone = clone $this;
-        $clone->type = $type;
+        $clone->max_chars = $max_chars;
         return $clone;
     }
 
-    public function getProperties(): Properties
+    public function getStepSize(): ?float
     {
-        return $this->properties;
+        return $this->step_size;
+    }
+
+    public function withStepSize(
+        float $step_size
+    ): self {
+        $clone = clone $this;
+        $clone->step_size = $step_size;
+        return $clone;
     }
 
-    public function withProperties(Properties $properties): self
+    public function getTextMatchingMethod(): ?TextMatchingOptions
     {
+        return $this->text_matching_method;
+    }
+
+    public function withTextMatchingMethod(
+        TextMatchingOptions $matching_method
+    ): self {
         $clone = clone $this;
-        $clone->properties = $properties;
+        $clone->text_matching_method = $matching_method;
         return $clone;
     }
 
-    public function isUndefined(): bool
+    public function getMinAutocomplete(): ?int
     {
-        return $this->type === null;
+        return $this->min_autocomplete;
+    }
+
+    public function withMinAutocomplete(
+        int $min_autocomplete
+    ): self {
+        $clone = clone $this;
+        $clone->min_autocomplete = $min_autocomplete;
+        return $clone;
+    }
+
+    public function getShuffleAnswerOptions(): ?bool
+    {
+        return $this->shuffle_answer_options;
+    }
+
+    public function withShuffleAnswerOptions(
+        bool $shuffle_answer_options
+    ): self {
+        $clone = clone $this;
+        $clone->shuffle_answer_options = $shuffle_answer_options;
+        return $clone;
+    }
+
+    public function getAnswerOptions(): AnswerOptions
+    {
+        return $this->answer_options;
+    }
+
+    public function withAnswerOptions(
+        AnswerOptions $answer_options
+    ): self {
+        $clone = clone $this;
+        $clone->answer_options = $answer_options;
+        return $clone;
+    }
+
+    public function getCarryInputs(
+        FieldFactory $ff
+    ): Group {
+        $inputs = [];
+        if ($this->type !== null) {
+            $inputs[self::FORM_KEY_TYPE] = $ff->hidden()->withValue($this->type?->getIdentifier() ?? '')
+                ->withDedicatedName(self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId());
+        }
+
+        if ($this->max_chars !== null) {
+            $inputs[self::FORM_KEY_MAX_CHARS] = $ff->hidden()->withValue($this->getMaxChars())
+                ->withDedicatedName(self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId());
+        }
+
+        if ($this->step_size !== null) {
+            $inputs[self::FORM_KEY_STEP_SIZE] = $ff->hidden()->withValue($this->getStepSize())
+                ->withDedicatedName(self::FORM_KEY_STEP_SIZE . $this->getShortenedAnswerInputId());
+        }
+
+        if ($this->text_matching_method !== null) {
+            $inputs[self::FORM_KEY_TEXT_MATCHING_METHOD] = $ff->hidden()->withValue($this->getTextMatchingMethod()->value)
+                ->withDedicatedName(self::FORM_KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId());
+        }
+
+        if ($this->min_autocomplete !== null) {
+            $inputs[self::FORM_KEY_MIN_AUTOCOMPLETE] = $ff->hidden()->withValue($this->getMinAutocomplete())
+                ->withDedicatedName(self::FORM_KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId());
+        }
+
+        if ($this->shuffle_answer_options !== null) {
+            $inputs[self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->getShuffleAnswerOptions() ? '1' : '0')
+                ->withDedicatedName(self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId());
+        }
+
+        $inputs[self::FORM_KEY_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->answer_options->buildHiddenInputValue())
+            ->withDedicatedName(self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId());
+
+        return $ff->group($inputs);
+    }
+
+    public function getFromCarryTransformation(
+        Refinery $refinery,
+        Factory $gaps_factory
+    ): Transformation {
+        return $refinery->custom()->transformation(
+            function (CarryWrapper $v) use ($refinery, $gaps_factory): self {
+                $clone = clone $this;
+                $clone->type = $this->retrieveTypeFromCarry($refinery, $v, $gaps_factory->getAvailableGapTypes());
+                $clone->max_chars = $this->retrieveMaxCharsFromCarry($refinery, $v);
+                $clone->step_size = $this->retrieveStepSizeFromCarry($refinery, $v);
+                $clone->text_matching_method = $this->retrieveTextMatchingMethodFromCarry($refinery, $v);
+                $clone->min_autocomplete = $this->retrieveMinAutocompleteFromCarry($refinery, $v);
+                $clone->shuffle_answer_options = $this->retrieveShuffleAnswerOptionsFromCarry($refinery, $v);
+                $clone->answer_options = $this->retrieveAnswerOptionsFromCarry($refinery, $v);
+                return $clone;
+            }
+        );
+    }
+
+    public function buildReplace(
+        ?Replace $replace,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Replace {
+        if ($this->type === null) {
+            throw new \UnexpectedValueException(
+                'A Gap without Type cannot be stored.'
+            );
+        }
+
+        $table_definition = TableTypes::AnswerInputs;
+
+        if ($replace === null) {
+            return new Replace(
+                $persistence->getColumns($table_name_builder, $table_definition),
+                $this->buildValuesForGapReplace()
+            );
+        }
+
+        return $replace->withAdditionalValues(
+            $this->buildValuesForGapReplace()
+        );
     }
 
     public function getGapPlaceholder(): string
@@ -110,26 +279,27 @@ public function buildShortenedGapRepresentation(): string
 
     public function buildGapPlaceholderNameWithId(): string
     {
-        return self::GAP_PLACEHOLDER_NAME . '_' . $this->answer_input_id->toString();
+        return self::GAP_PLACEHOLDER_NAME . '_' . $this->getAnswerInputId()->toString();
     }
 
     public function getEditAnswerOptionsSection(
         Language $lng,
         FieldFactory $ff
     ): Section {
+        $type = $this->getType();
         $section = $ff->section(
-            $this->type->getEditAnswerOptionsInputs($this->properties),
-            "{$this->buildShortenedGapName()} ({$lng->txt("{$this->type->getIdentifier()}_gap")})"
+            $type->getEditAnswerOptionsInputs($this),
+            "{$this->buildShortenedGapName()} ({$lng->txt("{$type->getIdentifier()}_gap")})"
         );
 
-        $edit_section_constraint = $this->type->getEditAnswerOptionsSectionConstraint();
+        $edit_section_constraint = $type->getEditAnswerOptionsSectionConstraint();
         if ($edit_section_constraint !== null) {
             $section = $section->withAdditionalTransformation($edit_section_constraint);
         }
 
 
         return $section->withAdditionalTransformation(
-            $this->type->getBuildGapTransformation($this)
+            $type->getBuildGapTransformation($this)
         );
     }
 
@@ -137,60 +307,130 @@ public function getEditPointsSection(
         Language $lng,
         FieldFactory $ff
     ): Section {
+        $type = $this->getType();
         $section = $ff->section(
-            $this->type->getEditPointsInputs($this->properties->getAnswerOptions()),
-            "{$this->buildShortenedGapName()} ({$lng->txt("{$this->type->getIdentifier()}_gap")})"
+            $type->getEditPointsInputs($this->getAnswerOptions()),
+            "{$this->buildShortenedGapName()} ({$lng->txt("{$type->getIdentifier()}_gap")})"
         );
 
-        $edit_section_constraint = $this->type->getEditPointsSectionConstraint();
+        $edit_section_constraint = $type->getEditPointsSectionConstraint();
         if ($edit_section_constraint !== null) {
             $section = $section->withAdditionalTransformation($edit_section_constraint);
         }
 
 
         return $section->withAdditionalTransformation(
-            $this->type->getAddPointsTransformation($this)
+            $type->getAddPointsTransformation($this)
         );
     }
 
-    public function getCarryInputs(
-        FieldFactory $ff
-    ): Group {
-        return $ff->group([
-            self::FORM_KEY_TYPE => $ff->hidden()->withValue($this->type?->getIdentifier() ?? '')
-                ->withDedicatedName(self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId()),
-            self::FORM_KEY_DATA => $this->properties->getCarryInputs($ff)
-            ->withDedicatedName(self::FORM_KEY_DATA . $this->getShortenedAnswerInputId())
-        ]);
+    private function buildValuesForGapReplace(): array
+    {
+        return [
+            new Value(\ilDBConstants::T_TEXT, $this->answer_input_id->toString()),
+            new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
+            new Value(\ilDBConstants::T_INTEGER, $this->position),
+            new Value(\ilDBConstants::T_TEXT, $this->type->getIdentifier()),
+            new Value(\ilDBConstants::T_INTEGER, $this->max_chars),
+            new Value(\ilDBConstants::T_FLOAT, $this->step_size),
+            new Value(\ilDBConstants::T_INTEGER, $this->text_matching_method->value),
+            new Value(\ilDBConstants::T_INTEGER, $this->min_autocomplete),
+            new Value(\ilDBConstants::T_INTEGER, $this->shuffle_answer_options ? 1 : 0)
+
+        ];
     }
 
-    public function getFromCarryTransformation(
+    private function retrieveTypeFromCarry(
         Refinery $refinery,
-        Factory $gaps_factory
-    ): Transformation {
-        return $refinery->custom()->transformation(
-            function (?CarryWrapper $v) use ($refinery, $gaps_factory): self {
-                if ($v === null) {
-                    return $this;
-                }
-                $available_gap_types = $gaps_factory->getAvailableGapTypes();
-                return $v->retrieve(
-                    self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId(),
-                    $refinery->byTrying([
-                        $refinery->custom()->transformation(
-                            fn(?string $v): self => $available_gap_types[$v]
-                                ? $this->withType($available_gap_types[$v])
-                                : $this
-                        ),
-                        $refinery->always($this)
-                    ])
-                )->withProperties(
-                    $v->retrieve(
-                        self::FORM_KEY_DATA . $this->getShortenedAnswerInputId(),
-                        $this->properties->getFromCarryTransformation($refinery)
-                    )
-                );
-            }
+        CarryWrapper $carry,
+        array $available_gap_types
+    ): ?Type {
+        return $carry->retrieve(
+            self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId(),
+            $refinery->custom()->transformation(
+                fn(?string $v): ?Type => $available_gap_types[$v] ?? $this->getType()
+            )
+        );
+    }
+
+    private function retrieveMaxCharsFromCarry(
+        Refinery $refinery,
+        CarryWrapper $carry
+    ): ?int {
+        return $carry->retrieve(
+            self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId(),
+            $refinery->byTrying([
+                $refinery->kindlyTo()->int(),
+                $refinery->always($this->getMaxChars())
+            ])
+        );
+    }
+
+    private function retrieveStepSizeFromCarry(
+        Refinery $refinery,
+        CarryWrapper $carry
+    ): ?float {
+        return $carry->retrieve(
+            self::FORM_KEY_STEP_SIZE . $this->getShortenedAnswerInputId(),
+            $refinery->byTrying([
+                $refinery->kindlyTo()->float(),
+                $refinery->always($this->getStepSize())
+            ])
+        );
+    }
+
+    private function retrieveTextMatchingMethodFromCarry(
+        Refinery $refinery,
+        CarryWrapper $carry
+    ): ?TextMatchingOptions {
+        return $carry->retrieve(
+            self::FORM_KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId(),
+            $refinery->custom()->transformation(
+                fn(?string $v): ?TextMatchingOptions => $v !== null
+                    ? TextMatchingOptions::tryFrom($v)
+                    : $this->getTextMatchingMethod()
+            )
+        );
+    }
+
+    private function retrieveMinAutocompleteFromCarry(
+        Refinery $refinery,
+        CarryWrapper $carry
+    ): ?int {
+        return $carry->retrieve(
+            self::FORM_KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId(),
+            $refinery->byTrying([
+                $refinery->kindlyTo()->int(),
+                $refinery->always($this->getMinAutocomplete())
+            ])
+        );
+    }
+
+    private function retrieveShuffleAnswerOptionsFromCarry(
+        Refinery $refinery,
+        CarryWrapper $carry
+    ): ?bool {
+        return $carry->retrieve(
+            self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
+            $refinery->byTrying([
+                $refinery->kindlyTo()->bool(),
+                $refinery->always($this->getShuffleAnswerOptions())
+            ])
+        );
+    }
+
+    private function retrieveAnswerOptionsFromCarry(
+        Refinery $refinery,
+        CarryWrapper $carry
+    ): AnswerOptions {
+        return $carry->retrieve(
+            self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
+            $refinery->custom()->transformation(
+                fn(?string $v): AnswerOptions => $this->answer_options->withValuesFromHiddenInputValue(
+                    $this->answer_input_id,
+                    $v
+                )
+            )
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 6585d277ae40..f081d31ebe3b 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -20,6 +20,15 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
+use ILIAS\Questions\Persistence\Delete;
+use ILIAS\Questions\Persistence\Junctor;
+use ILIAS\Questions\Persistence\Manipulate;
+use ILIAS\Questions\Persistence\Operator;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Value;
+use ILIAS\Questions\Persistence\Where;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
@@ -37,13 +46,15 @@ public function __construct(
     ) {
     }
 
-    public function getGapById(Uuid $gap_id): ?Gap
-    {
+    public function getGapById(
+        Uuid $gap_id
+    ): ?Gap {
         return $this->gaps[$gap_id->toString()] ?? null;
     }
 
-    public function getGapByTagName(string $tag_name): ?Gap
-    {
+    public function getGapByTagName(
+        string $tag_name
+    ): ?Gap {
         return $this->gaps[$this->extractIdFromTagName($tag_name)] ?? null;
     }
 
@@ -52,26 +63,36 @@ public function hasAtLeastOneGap(): bool
         return $this->gaps !== [];
     }
 
-    public function withGap(Gap $gap): self
-    {
+    public function withGap(
+        Gap $gap
+    ): self {
         $clone = clone $this;
         $clone->gaps[$gap->getAnswerInputId()->toString()] = $gap;
         return $clone;
     }
 
-    public function withNewGap(int $position): self
-    {
-        $new_gap = $this->factory->getNewGap($position);
+    public function withNewGap(
+        Uuid $answer_form_id,
+        int $position
+    ): self {
+        $new_gap = $this->factory->getNewGap($answer_form_id, $position);
         $clone = clone $this;
         $clone->gaps[$new_gap->getAnswerInputId()->toString()] = $new_gap;
         return $clone;
     }
 
-    public function withAdditionalGapFromTagName(string $tag_name, $position): self
-    {
-        $id = $this->extractIdFromTagName($tag_name);
+    public function withAdditionalGapFromTagName(
+        Uuid $answer_form_id,
+        string $tag_name,
+        int $position
+    ): self {
+        $answer_input_id = $this->extractIdFromTagName($tag_name);
         $clone = clone $this;
-        $clone->gaps[$id] = $this->factory->getNewGap($position, $id);
+        $clone->gaps[$answer_input_id] = $this->factory->getNewGap(
+            $answer_form_id,
+            $position,
+            $answer_input_id
+        );
         return $clone;
     }
 
@@ -238,6 +259,60 @@ function (?CarryWrapper $v) use ($refinery, $gaps_factory): self {
         );
     }
 
+    public function toStorage(
+        Manipulate $manipulate,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Manipulate {
+        $table_definition = TableTypes::AnswerInputs;
+        $manipulate->withAdditionalStatement(
+            new Delete(
+                $table_definition->getTable($table_name_builder),
+                [
+                    new Where(
+                        $persistence->getIdColumn($table_name_builder, $table_definition),
+                        new Value(
+                            \ilDBConstants::T_TEXT,
+                            array_map(
+                                fn(Gap $v): string => $v->getAnswerInputId()->toString(),
+                                $this->gaps
+                            )
+                        ),
+                        Operator::In,
+                        Junctor::Conjunction,
+                        true
+                    )
+                ]
+            )
+        );
+
+        [
+            'gaps' => $replace_for_gaps,
+            'answer_options' => $replace_for_answer_options
+        ] = array_reduce(
+            $this->gaps,
+            fn(array $c, Gap $v): Manipulate => [
+                $v->getProperties()->buildReplace(
+                    $c['gaps'],
+                    $persistence,
+                    $table_name_builder
+                ),
+                $v->getProperties()->getAnswerOptions()->buildReplace(
+                    $c['answer_options'],
+                    $persistence,
+                    $table_name_builder
+                )
+            ],
+            [
+                'gaps' => null,
+                'answer_options' => null
+            ]
+        );
+
+        return $manipulate->withAdditionalStatement($replace_for_gaps)
+            ->withAdditionalStatement($replace_for_answer_options);
+    }
+
     private function extractIdFromTagName(string $tag_name): string
     {
         return mb_substr($tag_name, mb_strlen(Gap::GAP_PLACEHOLDER_NAME) + 1);
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
index 7d23ee8c2c66..c5fbc340964a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
@@ -48,14 +48,15 @@ public function getIdentifier(): string
         return 'long_menu';
     }
 
-    public function getEditAnswerOptionsInputs(Properties $properties): array
-    {
+    public function getEditAnswerOptionsInputs(
+        Gap $gap
+    ): array {
         $ff = $this->ui_factory->input()->field();
         return [
             'answer_options' => $ff->tag(
                 $this->lng->txt('answer_options'),
                 []
-            )->withValue($properties->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
+            )->withValue($gap->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
             'upload_answer_options' => $ff->file(
                 new UploadAnswerOptionsGUI(),
                 $this->lng->txt('upload_answer_options'),
@@ -64,16 +65,16 @@ public function getEditAnswerOptionsInputs(Properties $properties): array
             'min_autocomplete' => $ff->numeric(
                 $this->lng->txt('min_autocomplete')
             )->withRequired(true)
-            ->withValue($properties->getMinAutocomplete() ?? self::DEFAULT_MIN_AUTOCOMPLETE),
+            ->withValue($gap->getMinAutocomplete() ?? self::DEFAULT_MIN_AUTOCOMPLETE),
             'options_awarding_points' => $ff->tag(
                 $this->lng->txt('answer_options'),
-                $properties->getAnswerOptions()->getTagsArrayFromAnswerOptions()
+                $gap->getAnswerOptions()->getTagsArrayFromAnswerOptions()
             )
             ->withRequired(true)
             ->withValue(
                 array_map(
                     fn(AnswerOption $v): string => $v->getTextValue(),
-                    $properties->getAnswerOptions()->getAnswerOptionsAwardingPoints()
+                    $gap->getAnswerOptions()->getAnswerOptionsAwardingPoints()
                 )
             )
         ];
@@ -97,8 +98,9 @@ function (array $vs): bool {
         );
     }
 
-    public function getEditPointsInputs(AnswerOptions $answer_options): array
-    {
+    public function getEditPointsInputs(
+        AnswerOptions $answer_options
+    ): array {
         return $answer_options->getEditPointsInputs(
             $this->ui_factory->input()->field(),
             fn(AnswerOption $v): string => $v->getTextValue(),
@@ -121,21 +123,21 @@ function (array $vs): bool {
         );
     }
 
-    public function getBuildGapTransformation(Gap $gap): Transformation
-    {
+    public function getBuildGapTransformation(
+        Gap $gap
+    ): Transformation {
         return $this->refinery->custom()->transformation(
-            fn(array $vs): Gap => $gap->withProperties(
-                $gap->getProperties()
-                    ->withMinAutocomplete($vs['min_autocomplete'])
-                    ->withAnswerOptions(
-                        $gap->getProperties()->getAnswerOptions()->withAnswerOptionsFromTags(
-                            array_merge(
-                                $vs['answer_options'],
-                                $this->retrieveAnswerOptionsArrayFromUpload($vs['upload_answer_options'])
-                            )
-                        )->withAnswerOptionsAwardingPoints($vs['options_awarding_points'])
-                    )
-            )
+            fn(array $vs): Gap => $gap
+                ->withMinAutocomplete($vs['min_autocomplete'])
+                ->withAnswerOptions(
+                    $gap->getAnswerOptions()->withAnswerOptionsFromTags(
+                        $gap->getAnswerInputId(),
+                        array_merge(
+                            $vs['answer_options'],
+                            $this->retrieveAnswerOptionsArrayFromUpload($vs['upload_answer_options'])
+                        )
+                    )->withAnswerOptionsAwardingPoints($vs['options_awarding_points'])
+                )
         );
     }
 
@@ -144,8 +146,9 @@ public function getAnswerInput(): \ilFormPropertyGUI
         ;
     }
 
-    private function retrieveAnswerOptionsArrayFromUpload(?array $upload_value): array
-    {
+    private function retrieveAnswerOptionsArrayFromUpload(
+        ?array $upload_value
+    ): array {
         if ($upload_value === null
             || ($decoded_value = base64_decode($upload_value[0] ?? '')) === '') {
             return [];
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
index d58ba257a21b..477a62f3b5e1 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
@@ -47,22 +47,27 @@ public function getIdentifier(): string
         return 'numeric';
     }
 
-    public function getEditAnswerOptionsInputs(Properties $properties): array
-    {
-        $answer_option = $properties->getAnswerOptions()->getAnswerOptionForPositionOrNew(0);
+    public function getEditAnswerOptionsInputs(
+        Gap $gap
+    ): array {
+        $answer_option = $gap->getAnswerOptions()->getAnswerOptionForPositionOrNew(
+            $gap->getAnswerInputId(),
+            0
+        );
+
         $ff = $this->ui_factory->input()->field();
         return [
             'lower_limit' => $ff->numeric($this->lng->txt('lower_limit'))
-                ->withStepSize($properties->getStepSize() ?? self::DEFAULT_STEP_SIZE)
+                ->withStepSize($gap->getStepSize() ?? self::DEFAULT_STEP_SIZE)
                 ->withRequired(true)
                 ->withValue($answer_option->getLowerLimit()),
             'upper_limit' => $ff->numeric($this->lng->txt('upper_limit'))
-                ->withStepSize($properties->getStepSize() ?? self::DEFAULT_STEP_SIZE)
+                ->withStepSize($gap->getStepSize() ?? self::DEFAULT_STEP_SIZE)
                 ->withValue($answer_option->getUpperLimit()),
             'step_size' => $ff->numeric($this->lng->txt('step_size'))
                 ->withStepSize(0.000001)
                 ->withRequired(true)
-                ->withValue($properties->getStepSize() ?? self::DEFAULT_STEP_SIZE)
+                ->withValue($gap->getStepSize() ?? self::DEFAULT_STEP_SIZE)
         ];
     }
 
@@ -76,8 +81,9 @@ public function getEditAnswerOptionsSectionConstraint(): ?Constraint
         );
     }
 
-    public function getEditPointsInputs(AnswerOptions $answer_options): array
-    {
+    public function getEditPointsInputs(
+        AnswerOptions $answer_options
+    ): array {
         $inputs = $answer_options->getEditPointsInputs(
             $this->ui_factory->input()->field(),
             function (AnswerOption $v): string {
@@ -106,19 +112,19 @@ public function getEditPointsSectionConstraint(): ?Constraint
         return null;
     }
 
-    public function getBuildGapTransformation(Gap $gap): Transformation
-    {
-        $properties = $gap->getProperties();
+    public function getBuildGapTransformation(
+        Gap $gap
+    ): Transformation {
         return $this->refinery->custom()->transformation(
-            fn(array $vs): Gap => $gap->withProperties(
-                $properties->withAnswerOptions(
-                    $properties->getAnswerOptions()->withAnswerOptions([
-                        $properties->getAnswerOptions()->getAnswerOptionForPositionOrNew(0)
-                            ->withLowerLimit($vs['lower_limit'])
-                            ->withUpperLimit($vs['upper_limit'])
-                        ])
-                )->withStepSize($vs['step_size'])
-            )
+            fn(array $vs): Gap => $gap->withAnswerOptions(
+                $gap->getAnswerOptions()->withAnswerOptions([
+                    $gap->getAnswerOptions()->getAnswerOptionForPositionOrNew(
+                        $gap->getAnswerInputId(),
+                        0
+                    )->withLowerLimit($vs['lower_limit'])
+                    ->withUpperLimit($vs['upper_limit'])
+                ])
+            )->withStepSize($vs['step_size'])
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
index 54847e55d77e..afdc9f537534 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
@@ -22,7 +22,6 @@
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
@@ -46,18 +45,19 @@ public function getIdentifier(): string
         return 'select';
     }
 
-    public function getEditAnswerOptionsInputs(Properties $properties): array
-    {
+    public function getEditAnswerOptionsInputs(
+        Gap $gap
+    ): array {
         $ff = $this->ui_factory->input()->field();
         return [
             'answer_options' => $ff->tag(
                 $this->lng->txt('answer_options'),
                 []
             )->withRequired(true)
-            ->withValue($properties->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
+            ->withValue($gap->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
             'shuffle_answer_options' => $ff->checkbox(
                 $this->lng->txt('shuffle_answers')
-            )->withValue($properties?->getShuffleAnswerOptions() ?? self::DEFAULT_SHUFFLE_ANSWER_OPTIONS)
+            )->withValue($gap?->getShuffleAnswerOptions() ?? self::DEFAULT_SHUFFLE_ANSWER_OPTIONS)
         ];
     }
 
@@ -66,8 +66,9 @@ public function getEditAnswerOptionsSectionConstraint(): ?Constraint
         return null;
     }
 
-    public function getEditPointsInputs(AnswerOptions $answer_options): array
-    {
+    public function getEditPointsInputs(
+        AnswerOptions $answer_options
+    ): array {
         return $answer_options->getEditPointsInputs(
             $this->ui_factory->input()->field(),
             fn(AnswerOption $v): string => $v->getTextValue()
@@ -89,13 +90,16 @@ function (array $vs): bool {
         );
     }
 
-    public function getBuildGapTransformation(Gap $gap): Transformation
-    {
-        $properties = $gap->getProperties();
+    public function getBuildGapTransformation(
+        Gap $gap
+    ): Transformation {
         return $this->refinery->custom()->transformation(
             fn(array $vs): Gap => $gap->withProperties(
-                $properties->withAnswerOptions(
-                    $properties->getAnswerOptions()->withAnswerOptionsFromTags($vs['answer_options'])
+                $gap->withAnswerOptions(
+                    $gap->getAnswerOptions()->withAnswerOptionsFromTags(
+                        $gap->getAnswerInputId(),
+                        $vs['answer_options']
+                    )
                 )
             )
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
index 4f99af8a7b10..927c8001642e 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
@@ -22,7 +22,6 @@
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
 use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -47,23 +46,24 @@ public function getIdentifier(): string
         return 'text';
     }
 
-    public function getEditAnswerOptionsInputs(Properties $properties): array
-    {
+    public function getEditAnswerOptionsInputs(
+        Gap $gap
+    ): array {
         $ff = $this->ui_factory->input()->field();
         return [
             'answer_options' => $ff->tag(
                 $this->lng->txt('answer_options'),
                 []
             )->withRequired(true)
-            ->withValue($properties->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
+            ->withValue($gap->getAnswerOptions()->getTagsArrayFromAnswerOptions()),
             'matching_method' => $ff->select(
                 $this->lng->txt('matching_method'),
                 TextMatchingOptions::buildOptionsList($this->lng)
             )->withRequired(true)
-            ->withValue($properties->getTextMatchingMethod()?->value ?? self::DEFAULT_TECT_MATCHING_METHOD->value),
+            ->withValue($gap->getTextMatchingMethod()?->value ?? self::DEFAULT_TECT_MATCHING_METHOD->value),
             'max_chars' => $ff->numeric(
                 $this->lng->txt('max_chars'),
-            )->withValue($properties->getMaxChars())
+            )->withValue($gap->getMaxChars())
         ];
     }
 
@@ -78,8 +78,9 @@ public function getEditAnswerOptionsSectionConstraint(): ?Constraint
         );
     }
 
-    public function getEditPointsInputs(AnswerOptions $answer_options): array
-    {
+    public function getEditPointsInputs(
+        AnswerOptions $answer_options
+    ): array {
         return $answer_options->getEditPointsInputs(
             $this->ui_factory->input()->field(),
             fn(AnswerOption $v): string => $v->getTextValue()
@@ -101,17 +102,20 @@ function (array $vs): bool {
         );
     }
 
-    public function getBuildGapTransformation(Gap $gap): Transformation
-    {
-        $properties = $gap->getProperties();
+    public function getBuildGapTransformation(
+        Gap $gap
+    ): Transformation {
         return $this->refinery->custom()->transformation(
-            fn(array $vs): Gap => $gap->withProperties(
-                $properties->withMaxChars($vs['max_chars'])
-                    ->withTextMatchingMethod(TextMatchingOptions::tryFrom($vs['matching_method']) ?? self::DEFAULT_TECT_MATCHING_METHOD)
-                    ->withAnswerOptions(
-                        $properties->getAnswerOptions()->withAnswerOptionsFromTags($vs['answer_options'])
+            fn(array $vs): Gap => $gap->withMaxChars($vs['max_chars'])
+                ->withTextMatchingMethod(
+                    TextMatchingOptions::tryFrom($vs['matching_method'])
+                        ?? self::DEFAULT_TECT_MATCHING_METHOD
+                )->withAnswerOptions(
+                    $gap->getAnswerOptions()->withAnswerOptionsFromTags(
+                        $gap->getAnswerInputId(),
+                        $vs['answer_options']
                     )
-            )
+                )
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
index 6bcb0a700e6a..447cad7f557b 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
@@ -21,7 +21,6 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
 use ILIAS\Refinery\Transformation;
@@ -34,7 +33,7 @@ public function __construct(
     }
 
     abstract public function getIdentifier(): string;
-    abstract public function getEditAnswerOptionsInputs(Properties $data): array;
+    abstract public function getEditAnswerOptionsInputs(Gap $gap): array;
     abstract public function getEditAnswerOptionsSectionConstraint(): ?Constraint;
     abstract public function getEditPointsInputs(AnswerOptions $answer_options): array;
     abstract public function getEditPointsSectionConstraint(): ?Constraint;
@@ -43,13 +42,10 @@ abstract public function getAnswerInput(): \ilFormPropertyGUI;
 
     public function getAddPointsTransformation(Gap $gap): Transformation
     {
-        $properties = $gap->getProperties();
         return $this->refinery->custom()->transformation(
-            fn(array $vs): Gap => $gap->withProperties(
-                $properties->withAnswerOptions(
-                    $properties->getAnswerOptions()
-                        ->withAnswerOptionsWithAddedPointsFromForm($this->refinery, $vs)
-                )
+            fn(array $vs): Gap => $gap->withAnswerOptions(
+                $gap->getAnswerOptions()
+                    ->withAnswerOptionsWithAddedPointsFromForm($this->refinery, $vs)
             )
         );
     }
diff --git a/components/ILIAS/Questions/src/Collector.php b/components/ILIAS/Questions/src/Collector.php
index 8208cdb88258..39165d20e65d 100644
--- a/components/ILIAS/Questions/src/Collector.php
+++ b/components/ILIAS/Questions/src/Collector.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions;
 
-use ILIAS\Questions\Question\Persistence\Repository;
+use ILIAS\Questions\Persistence\Repository;
 use ILIAS\Questions\Question\Question;
 
 class Collector
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Column.php b/components/ILIAS/Questions/src/Persistence/Column.php
similarity index 65%
rename from components/ILIAS/Questions/src/Question/Persistence/Column.php
rename to components/ILIAS/Questions/src/Persistence/Column.php
index f25e35cbe660..63a1aa110f31 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Column.php
+++ b/components/ILIAS/Questions/src/Persistence/Column.php
@@ -18,13 +18,13 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class Column
 {
     public function __construct(
         private readonly Table $table,
-        private readonly string $column
+        private readonly string $identifier
     ) {
     }
 
@@ -33,8 +33,18 @@ public function getTableName(): string
         return $this->table->getName();
     }
 
+    public function getColumnAlias(): string
+    {
+        return "{$this->table->getName()}_{$this->identifier}";
+    }
+
     public function getColumnString(): string
     {
-        return "{$this->table->getName()}.{$this->column}";
+        return "{$this->table->getName()}.{$this->identifier}";
+    }
+
+    public function getAliasedColumnString(): string
+    {
+        return "{$this->table->getName()}.{$this->identifier} {$this->getColumnAlias()}";
     }
 }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/CoreTables.php b/components/ILIAS/Questions/src/Persistence/CoreTables.php
similarity index 80%
rename from components/ILIAS/Questions/src/Question/Persistence/CoreTables.php
rename to components/ILIAS/Questions/src/Persistence/CoreTables.php
index a8778109cc7a..e1940c63ade2 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/CoreTables.php
+++ b/components/ILIAS/Questions/src/Persistence/CoreTables.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 enum CoreTables: string
 {
@@ -35,11 +35,12 @@ enum CoreTables: string
         'created'
     ];
 
-    private const string ANSWER_FORM_TABLE_ID_COLUMN = 'id';
+    public const string ANSWER_FORM_TABLE_ID_COLUMN = 'id';
     private const string ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN = 'question_id';
     private const array ANSWER_FORM_TABLE_COLUMNS = [
-        'id AS answer_form_id',
+        'id',
         'type',
+        'question_id',
         'available_points',
         'image_size',
         'shuffle_answer_options',
@@ -58,12 +59,21 @@ public function getTable(): Table
         return new Table($this);
     }
 
-    public function getColumnsForSelect(): array
-    {
-        return match($this) {
+    public function getColumns(
+        array $columns_to_skip = []
+    ): array {
+        $table = $this->getTable();
+        $column_identifiers = match($this) {
             self::Questions => self::QUESTION_TABLE_COLUMNS,
             self::AnswerForms => self::ANSWER_FORM_TABLE_COLUMNS
         };
+        return array_map(
+            fn(string $v): Column => new Column($table, $v),
+            array_filter(
+                $column_identifiers,
+                fn(string $v) => !in_array($v, $columns_to_skip)
+            )
+        );
     }
 
     public function getIdColumn(): Column
diff --git a/components/ILIAS/Questions/src/Persistence/Delete.php b/components/ILIAS/Questions/src/Persistence/Delete.php
new file mode 100644
index 000000000000..be8173df325e
--- /dev/null
+++ b/components/ILIAS/Questions/src/Persistence/Delete.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ * ******************************************************************* */
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Persistence;
+
+class Delete
+{
+    /**
+     * @param array<\ILIAS\Questions\Persistence\Where> $where
+     */
+    public function __construct(
+        private readonly Table $table,
+        private readonly array $where
+    ) {
+    }
+
+    public function toManipulateString(\ilDBInterface $db): string
+    {
+        return "DELETE FROM {$this->table->getName()}" . PHP_EOL
+            . $this->buildWhereString($db);
+    }
+
+    private function buildWhereString(\ilDBInterface $db): string
+    {
+        $values = [];
+
+        return sprintf(
+            array_reduce(
+                $this->where,
+                function (?string $c, Where $v) use ($db, &$values): string {
+                    $values[] = $v->getRight()->getQuotedValue($db);
+
+                    if ($c === null) {
+                        return "WHERE {$v->toSql()}" . PHP_EOL;
+                    }
+
+                    return "{$c}{$v->getLogicalOperator()} {$v->toSql()}" . PHP_EOL;
+                }
+            ),
+            $values
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Insert.php b/components/ILIAS/Questions/src/Persistence/Insert.php
similarity index 59%
rename from components/ILIAS/Questions/src/Question/Persistence/Insert.php
rename to components/ILIAS/Questions/src/Persistence/Insert.php
index 1d60dfddad15..f97738497f5a 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Insert.php
+++ b/components/ILIAS/Questions/src/Persistence/Insert.php
@@ -15,62 +15,64 @@
  * https://github.com/ILIAS-eLearning
  *
  * ******************************************************************* */
+
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class Insert
 {
-    private array $values_to_insert = [];
+    protected array $value_sets = [];
 
     /**
-     * @param array<\ILIAS\Questions\Question\Persistence\Column> $columns
+     * @param array<\ILIAS\Questions\Persistence\Column> $columns
+     * @param array<\ILIAS\Questions\Persistence\Value> $values
      */
     public function __construct(
-        private readonly Table $table,
-        private readonly array $columns
+        protected readonly array $columns,
+        protected readonly array $values
     ) {
+        if ($columns === [] || count($columns) !== count($values)) {
+            throw new \InvalidArgumentException(
+                "There MUST be at least one Column and the same amount of Values as there are Columns."
+            );
+        }
+
+        $table_name = $columns[0]->getTableName();
         foreach ($columns as $column) {
-            if ($column->getTableName() !== $this->table->getName()) {
+            if ($column->getTableName() !== $table_name) {
                 throw new \InvalidArgumentException(
-                    "You can only add Columns of the table {$this->table->getName()} to this Insert."
+                    "All Columns MUST belong to the same Table."
                 );
             }
         }
-    }
 
-    public function getTableName(): string
-    {
-        return $this->table->getName();
+        $this->value_sets[] = $values;
     }
 
     /**
-     *
-     * @param array<\ILIAS\Questions\Question\Persistence\Value> $values
-     * @return self
+     * @param array<\ILIAS\Questions\Persistence\Value> $values
      */
-    public function withAdditionalDataSet(
+    public function withAdditionalValues(
         array $values
-    ): self {
-        if (count($this->columns) !== count($values)) {
+    ): void {
+        if (count($values) !== count($this->columns)) {
             throw new \InvalidArgumentException(
                 "There MUST be the same amount of Values as there are Columns."
             );
         }
 
-        $clone = clone $this;
-        $clone->values_to_insert[] = $values;
-        return $clone;
+        $this->value_sets[] = $values;
     }
 
     public function toManipulateString(\ilDBInterface $db): string
     {
-        return "INSERT INTO {$this->table->getName()} "
+        return "INSERT INTO {$this->columns[0]->getTableName()}" . PHP_EOL
             . $this->buildColumnsString() . PHP_EOL
             . $this->buildValuesString($db);
     }
 
-    private function buildColumnsString(): string
+    protected function buildColumnsString(): string
     {
         return '('
             . implode(
@@ -82,10 +84,10 @@ private function buildColumnsString(): string
             ) . ')';
     }
 
-    private function buildValuesString(\ilDBInterface $db): string
+    protected function buildValuesString(\ilDBInterface $db): string
     {
         $return = [];
-        foreach ($this->values_to_insert as $values) {
+        foreach ($this->values as $values) {
             $return[] = '(' . implode(
                 ', ',
                 array_map(
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Join.php b/components/ILIAS/Questions/src/Persistence/Join.php
similarity index 96%
rename from components/ILIAS/Questions/src/Question/Persistence/Join.php
rename to components/ILIAS/Questions/src/Persistence/Join.php
index 993fd58124f9..a107fd063115 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Join.php
+++ b/components/ILIAS/Questions/src/Persistence/Join.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class Join
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/JoinType.php b/components/ILIAS/Questions/src/Persistence/JoinType.php
similarity index 92%
rename from components/ILIAS/Questions/src/Question/Persistence/JoinType.php
rename to components/ILIAS/Questions/src/Persistence/JoinType.php
index 4e071ddfe573..e020447a0056 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/JoinType.php
+++ b/components/ILIAS/Questions/src/Persistence/JoinType.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 enum JoinType: string
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Junctor.php b/components/ILIAS/Questions/src/Persistence/Junctor.php
similarity index 93%
rename from components/ILIAS/Questions/src/Question/Persistence/Junctor.php
rename to components/ILIAS/Questions/src/Persistence/Junctor.php
index 1d7ab4e22f01..6158e1229bce 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Junctor.php
+++ b/components/ILIAS/Questions/src/Persistence/Junctor.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 enum Junctor: string
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Manipulate.php b/components/ILIAS/Questions/src/Persistence/Manipulate.php
similarity index 58%
rename from components/ILIAS/Questions/src/Question/Persistence/Manipulate.php
rename to components/ILIAS/Questions/src/Persistence/Manipulate.php
index 861cf97cc7a7..81a69762d5d4 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Manipulate.php
+++ b/components/ILIAS/Questions/src/Persistence/Manipulate.php
@@ -18,19 +18,48 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
+
+use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\AnswerForm\Persistence;
 
 class Manipulate
 {
     private array $statements;
 
     public function __construct(
-        private readonly \ilDBInterface $db
+        private readonly \ilDBInterface $db,
+        private readonly AnswerFormFactory $answer_form_factory,
+        private readonly ManipulationType $type
     ) {
     }
 
+    public function getManipulationType(): ManipulationType
+    {
+        return $this->type;
+    }
+
+    public function getPersistenceForDefinitionClass(
+        string $definition_class
+    ): Persistence {
+        return $this->answer_form_factory
+            ->getDefinitionForClass($definition_class)
+            ->getPersistence();
+    }
+
+    public function getTableNameBuilder(
+        string $definition_class
+    ): TableNameBuilder {
+        return new TableNameBuilder(
+            $this->answer_form_factory
+                ->getDefinitionForClass($definition_class)
+                ->getPersistence()
+                ->getPublicNameSpace()
+        );
+    }
+
     public function withAdditionalStatement(
-        Insert|Update $statement
+        Insert|Update|Replace|Delete $statement
     ): self {
         $clone = clone $this;
         $clone->statements[] = $statement;
diff --git a/components/ILIAS/Questions/src/Persistence/ManipulationType.php b/components/ILIAS/Questions/src/Persistence/ManipulationType.php
new file mode 100644
index 000000000000..b52c8c6b6f33
--- /dev/null
+++ b/components/ILIAS/Questions/src/Persistence/ManipulationType.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Persistence;
+
+enum ManipulationType
+{
+    case Create;
+    case Update;
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Operator.php b/components/ILIAS/Questions/src/Persistence/Operator.php
similarity index 96%
rename from components/ILIAS/Questions/src/Question/Persistence/Operator.php
rename to components/ILIAS/Questions/src/Persistence/Operator.php
index 41c577f25b13..8f8a6a418ce9 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Operator.php
+++ b/components/ILIAS/Questions/src/Persistence/Operator.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 enum Operator: string
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Order.php b/components/ILIAS/Questions/src/Persistence/Order.php
similarity index 94%
rename from components/ILIAS/Questions/src/Question/Persistence/Order.php
rename to components/ILIAS/Questions/src/Persistence/Order.php
index 97e974e809fd..f805003533ed 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Order.php
+++ b/components/ILIAS/Questions/src/Persistence/Order.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class Order
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/OrderDirection.php b/components/ILIAS/Questions/src/Persistence/OrderDirection.php
similarity index 92%
rename from components/ILIAS/Questions/src/Question/Persistence/OrderDirection.php
rename to components/ILIAS/Questions/src/Persistence/OrderDirection.php
index 079dd1279555..072b3a6acd97 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/OrderDirection.php
+++ b/components/ILIAS/Questions/src/Persistence/OrderDirection.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 enum OrderDirection: string
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Query.php b/components/ILIAS/Questions/src/Persistence/Query.php
similarity index 68%
rename from components/ILIAS/Questions/src/Question/Persistence/Query.php
rename to components/ILIAS/Questions/src/Persistence/Query.php
index d8baf6a558cf..08542db0ad21 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Query.php
+++ b/components/ILIAS/Questions/src/Persistence/Query.php
@@ -18,7 +18,9 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
+
+use ILIAS\Refinery\Transformation;
 
 class Query
 {
@@ -31,6 +33,8 @@ class Query
     private array $binding_types = [];
     private array $binding_values = [];
 
+    private ?array $current_record = null;
+
     public function __construct(
         private readonly \ilDBInterface $db
     ) {
@@ -40,13 +44,11 @@ public function __construct(
         $questions_id_column = $questions_table_definition->getIdColumn();
 
         $this->select[] = new Select(
-            $questions_table_definition->getTable(),
-            $questions_table_definition->getColumnsForSelect()
+            $questions_table_definition->getColumns()
         );
 
         $this->select[] = new Select(
-            $answer_form_table_definition->getTable(),
-            $answer_form_table_definition->getColumnsForSelect()
+            $answer_form_table_definition->getColumns()
         );
 
         $this->joins[] = new Join(
@@ -99,7 +101,42 @@ public function withLimit(int $limit): self
         return $clone;
     }
 
-    public function toSql(): \ilDBStatement
+    public function loadNextRecord(): \Generator
+    {
+        $alias = CoreTables::Questions->getIdColumn()->getColumnAlias();
+
+        $result = $this->toSql();
+
+        $this->current_record = [$this->db->fetchAssoc($result)];
+        if ($this->current_record[0] === null) {
+            return null;
+        }
+
+        while (($db_record = $this->db->fetchAssoc($result)) !== null) {
+            if ($db_record[$alias] === $this->current_record[0][$alias]) {
+                $this->current_record[] = $db_record;
+                continue;
+            }
+            yield $this;
+            $this->current_record = [$db_record];
+        }
+        yield $this;
+    }
+
+    public function retrieveCurrentRecord(
+        Table $table,
+        Transformation $transformation
+    ): mixed {
+        $table_name = $table->getName();
+        $filtered_record = [];
+        foreach ($this->current_record as $data_set) {
+            $filtered_record[] = $this->filterDataSetByTable($table_name, $data_set);
+        }
+
+        return $transformation->transform($filtered_record);
+    }
+
+    private function toSql(): \ilDBStatement
     {
         return $this->db->queryF(
             'SELECT ' . implode(
@@ -150,4 +187,20 @@ private function addValueToBinding(Value $value): void
             $this->binding_values[] = $v;
         }
     }
+
+    public function filterDataSetByTable(
+        string $table_name,
+        array $data_set
+    ): array {
+        return array_reduce(
+            array_keys($data_set),
+            function (array $c, string $v) use ($table_name, $data_set): array {
+                if (str_starts_with($v, $table_name)) {
+                    $c[mb_substr($v, mb_strlen($table_name) + 1)] = $data_set[$v];
+                }
+                return $c;
+            },
+            []
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/Persistence/Replace.php b/components/ILIAS/Questions/src/Persistence/Replace.php
new file mode 100644
index 000000000000..3554ea426818
--- /dev/null
+++ b/components/ILIAS/Questions/src/Persistence/Replace.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ * ******************************************************************* */
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Persistence;
+
+class Replace extends Insert
+{
+    public function toManipulateString(
+        \ilDBInterface $db
+    ): string {
+        return "REPLACE INTO {$this->columns[0]->getTableName()}" . PHP_EOL
+            . $this->buildColumnsString() . PHP_EOL
+            . $this->buildValuesString($db);
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
similarity index 60%
rename from components/ILIAS/Questions/src/Question/Persistence/Repository.php
rename to components/ILIAS/Questions/src/Persistence/Repository.php
index cfa7ee494150..0635886122f4 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -18,19 +18,22 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
-use ILIAS\Questions\AnswerForm\Definition;
+use ILIAS\Questions\AnswerForm\Definition as AnswerFormDefinition;
+use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
+use ILIAS\Refinery\Factory as Refinery;
 
 class Repository
 {
     public function __construct(
         private readonly \ilDBInterface $db,
+        private readonly Refinery $refinery,
         private readonly UuidFactory $uuid_factory,
         private readonly AnswerFormFactory $answer_form_factory
     ) {
@@ -96,61 +99,104 @@ public function getForQuestionIds(array $question_ids): \Generator
      */
     private function getForBaseQuery(Query $query): \Generator
     {
-        $result = array_reduce(
+        $query_with_answer_forms = array_reduce(
             $this->answer_form_factory->getAvailableDefinitions(),
-            fn(Query $c, Definition $v) => $v->getPersistence()->completeQuery(
+            fn(Query $c, AnswerFormDefinition $v) => $v->getPersistence()->completeQuery(
                 new TableNameBuilder($v->getPersistence()->getPublicNameSpace()),
                 $c,
                 CoreTables::Questions->getIdColumn()
             ),
             $query
-        )->toSql();
+        );
 
-        $question_records = [$this->db->fetchObject($result)];
-        if ($question_records[0] === null) {
-            return null;
-        }
-        while (($db_record = $this->db->fetchObject($result)) !== null) {
-            if ($db_record->id === $question_records[0]->id) {
-                $question_records[] = $db_record;
-                continue;
-            }
-            yield $this->buildQuestionFromDBRecords($question_records);
-            $question_records = [$db_record];
+        foreach ($query_with_answer_forms->loadNextRecord() as $query_with_record) {
+            yield $this->retrieveQuestionFromQuery(
+                $query_with_record,
+                $this->retrieveAnswerFormsFromQuery($query_with_record)
+            );
         }
-        yield $this->buildQuestionFromDBRecords($question_records);
     }
 
-    private function buildQuestionFromDBRecords(array $db_record): QuestionImplementation
-    {
-        $basic_properties = $db_record[0];
-        return new QuestionImplementation(
-            $this->uuid_factory->fromString($basic_properties->id),
-            $basic_properties->page_id,
-            $basic_properties->title,
-            $basic_properties->author,
-            Lifecycle::from($basic_properties->lifecycle),
-            $basic_properties->remarks,
-            $basic_properties->original_id === null
-                ? null
-                : $this->uuid_factory->fromString($basic_properties->original_id),
-            new \DateTimeImmutable('@' . $basic_properties->last_update, new \DateTimeZone('UTC')),
-            new \DateTimeImmutable('@' . $basic_properties->created, new \DateTimeZone('UTC'))
+    public function create(
+        array $storable
+    ): void {
+        $this->store(
+            $storable,
+            new Manipulate(
+                $this->db,
+                $this->answer_form_factory,
+                ManipulationType::Create
+            )
+        );
+    }
+
+    public function update(
+        array $storable
+    ): void {
+        $this->store(
+            $storable,
+            new Manipulate(
+                $this->db,
+                $this->answer_form_factory,
+                ManipulationType::Update
+            )
+        );
+    }
+
+    private function retrieveQuestionFromQuery(
+        Query $query,
+        array $answer_forms
+    ): QuestionImplementation {
+        return $query->retrieveCurrentRecord(
+            CoreTables::Questions->getTable(),
+            $this->refinery->custom()->transformation(
+                fn(array $vs): QuestionImplementation => new QuestionImplementation(
+                    $this->uuid_factory->fromString($vs[0]['id']),
+                    $vs[0]['page_id'],
+                    $vs[0]['title'],
+                    $vs[0]['author'],
+                    Lifecycle::from($vs[0]['lifecycle']),
+                    $vs[0]['remarks'],
+                    $vs[0]['original_id'] === null
+                        ? null
+                        : $this->uuid_factory->fromString($vs[0]['original_id']),
+                    new \DateTimeImmutable('@' . $vs[0]['last_update'], new \DateTimeZone('UTC')),
+                    new \DateTimeImmutable('@' . $vs[0]['created'], new \DateTimeZone('UTC')),
+                    $answer_forms
+                )
+            )
+        );
+    }
+
+    private function retrieveAnswerFormsFromQuery(
+        Query $query
+    ): array {
+        return $query->retrieveCurrentRecord(
+            CoreTables::AnswerForms->getTable(),
+            $this->refinery->custom()->transformation(
+                function (array $vs): array {
+                    if (count($vs) === 1 && $vs[0]['type'] === null) {
+                        return [];
+                    }
+                    $vs;
+                }
+            )
         );
     }
 
     /**
      *
-     * @param array<\ILIAS\Questions\Question\Persistence\Storable> $storable
+     * @param array<\ILIAS\Questions\Persistence\Storable> $storable
      * @return array<ILIAS\Data\UUID\Uuid>
      */
-    public function store(
-        array $storable
+    private function store(
+        array $storable,
+        Manipulate $manipulate
     ): void {
         array_reduce(
             $storable,
             fn(Manipulate $c, Storable $v): Manipulate => $v->toStorage($c),
-            new Manipulate($this->db)
+            $manipulate
         )->run();
     }
 
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Select.php b/components/ILIAS/Questions/src/Persistence/Select.php
similarity index 81%
rename from components/ILIAS/Questions/src/Question/Persistence/Select.php
rename to components/ILIAS/Questions/src/Persistence/Select.php
index 5e39990d2380..ef4c4ad50258 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Select.php
+++ b/components/ILIAS/Questions/src/Persistence/Select.php
@@ -18,12 +18,14 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
+/**
+ * @param array<\ILIAS\Questions\Persistence\Column> $columns
+ */
 class Select
 {
     public function __construct(
-        private readonly Table $table,
         private readonly array $columns
     ) {
     }
@@ -31,7 +33,7 @@ public function __construct(
     public function toColumnsArray(): array
     {
         return array_map(
-            fn(string $v): string => "{$this->table->getName()}.{$v}",
+            fn(Column $v): string => $v->getAliasedColumnString(),
             $this->columns
         );
     }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Storable.php b/components/ILIAS/Questions/src/Persistence/Storable.php
similarity index 93%
rename from components/ILIAS/Questions/src/Question/Persistence/Storable.php
rename to components/ILIAS/Questions/src/Persistence/Storable.php
index 6f29a0ea7b8b..f467271b3fff 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Storable.php
+++ b/components/ILIAS/Questions/src/Persistence/Storable.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 interface Storable
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Table.php b/components/ILIAS/Questions/src/Persistence/Table.php
similarity index 95%
rename from components/ILIAS/Questions/src/Question/Persistence/Table.php
rename to components/ILIAS/Questions/src/Persistence/Table.php
index facf9b3640de..c9ff6f5cba6e 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Table.php
+++ b/components/ILIAS/Questions/src/Persistence/Table.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class Table
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php b/components/ILIAS/Questions/src/Persistence/TableNameBuilder.php
similarity index 97%
rename from components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php
rename to components/ILIAS/Questions/src/Persistence/TableNameBuilder.php
index f686cf99346d..7d007559198f 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/TableNameBuilder.php
+++ b/components/ILIAS/Questions/src/Persistence/TableNameBuilder.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class TableNameBuilder
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php b/components/ILIAS/Questions/src/Persistence/TableNameSpace.php
similarity index 96%
rename from components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php
rename to components/ILIAS/Questions/src/Persistence/TableNameSpace.php
index fc7c0051d485..2c8d735bfd20 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/TableNameSpace.php
+++ b/components/ILIAS/Questions/src/Persistence/TableNameSpace.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class TableNameSpace
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/TableNameSpaceCore.php b/components/ILIAS/Questions/src/Persistence/TableNameSpaceCore.php
similarity index 94%
rename from components/ILIAS/Questions/src/Question/Persistence/TableNameSpaceCore.php
rename to components/ILIAS/Questions/src/Persistence/TableNameSpaceCore.php
index 7d207a4b297b..9c8b747841e5 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/TableNameSpaceCore.php
+++ b/components/ILIAS/Questions/src/Persistence/TableNameSpaceCore.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class TableNameSpaceCore extends TableNameSpace
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/TableTypes.php b/components/ILIAS/Questions/src/Persistence/TableTypes.php
similarity index 95%
rename from components/ILIAS/Questions/src/Question/Persistence/TableTypes.php
rename to components/ILIAS/Questions/src/Persistence/TableTypes.php
index 4ab28142e239..06116bfe7059 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/TableTypes.php
+++ b/components/ILIAS/Questions/src/Persistence/TableTypes.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 enum TableTypes
 {
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Update.php b/components/ILIAS/Questions/src/Persistence/Update.php
similarity index 76%
rename from components/ILIAS/Questions/src/Question/Persistence/Update.php
rename to components/ILIAS/Questions/src/Persistence/Update.php
index 087b30d746e2..df4e1bd22cdf 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Update.php
+++ b/components/ILIAS/Questions/src/Persistence/Update.php
@@ -18,39 +18,39 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class Update
 {
+    /**
+     * @param array<\ILIAS\Questions\Persistence\Column> $columns
+     * @param array<\ILIAS\Questions\Persistence\Value> $values
+     * @param array<\ILIAS\Questions\Persistence\Where> $where
+     */
     public function __construct(
-        private readonly Table $table,
         private readonly array $columns,
         private readonly array $values,
         private readonly array $where
     ) {
+        if ($columns === [] || count($columns) !== count($values)) {
+            throw new \InvalidArgumentException(
+                "There MUST be at least one Column and the same amount of Values as there are Columns."
+            );
+        }
+
+        $table_name = $columns[0]->getTableName();
         foreach ($columns as $column) {
-            if ($column->getTableName() !== $this->table->getName()) {
+            if ($column->getTableName() !== $table_name) {
                 throw new \InvalidArgumentException(
-                    "You can only add Columns of the table {$this->table->getName()} to this Insert."
+                    "All Columns MUST belong to the same Table."
                 );
             }
         }
-
-        if (count(columns) !== count($values)) {
-            throw new \InvalidArgumentException(
-                "There MUST be the same amount of Values as there are Columns."
-            );
-        }
-    }
-
-    public function getTableName(): string
-    {
-        return $this->table->getName();
     }
 
     public function toManipulateString(\ilDBInterface $db): string
     {
-        return "UPDATE {$this->table->getName()}" . PHP_EOL
+        return "UPDATE {$this->columns[0]->getTableName()}" . PHP_EOL
             . $this->buildSetterString($db) . PHP_EOL
             . $this->buildWhereString($db);
     }
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Value.php b/components/ILIAS/Questions/src/Persistence/Value.php
similarity index 92%
rename from components/ILIAS/Questions/src/Question/Persistence/Value.php
rename to components/ILIAS/Questions/src/Persistence/Value.php
index c459a68367f9..d811116e169c 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Value.php
+++ b/components/ILIAS/Questions/src/Persistence/Value.php
@@ -18,13 +18,13 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class Value
 {
     public function __construct(
         private readonly string $type,
-        private readonly string|int|array $value
+        private readonly null|string|int|array $value
     ) {
     }
 
diff --git a/components/ILIAS/Questions/src/Question/Persistence/Where.php b/components/ILIAS/Questions/src/Persistence/Where.php
similarity index 96%
rename from components/ILIAS/Questions/src/Question/Persistence/Where.php
rename to components/ILIAS/Questions/src/Persistence/Where.php
index d14febb99cf1..179345f5e6cc 100644
--- a/components/ILIAS/Questions/src/Question/Persistence/Where.php
+++ b/components/ILIAS/Questions/src/Persistence/Where.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Persistence;
+namespace ILIAS\Questions\Persistence;
 
 class Where
 {
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php
index ac538405df51..4d45ddd4c373 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php
@@ -128,7 +128,7 @@ public function withQuestionIdParameter(Uuid $question_id): self
         return $clone;
     }
 
-    public function withAnswerFormTypeHashParameter(string $type_hash): URLBuilder
+    public function withAnswerFormTypeHashParameter(string $type_hash): self
     {
         $clone = clone $this;
         $clone->url_builder = $this->url_builder
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/QuestionsTable.php
index b099f2a16737..7be8ac24903a 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/QuestionsTable.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Definitions/QuestionsTable.php
@@ -23,7 +23,7 @@
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
-use ILIAS\Questions\Question\Persistence\Repository;
+use ILIAS\Questions\Persistence\Repository;
 use ILIAS\Data\Range;
 use ILIAS\Data\Order;
 use ILIAS\UI\Component\Table;
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index c6437358efbb..3a5db44f1f78 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -29,7 +29,7 @@
 use ILIAS\Questions\AnswerForm\Definition;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
-use ILIAS\Questions\Question\Persistence\Repository;
+use ILIAS\Questions\Persistence\Repository;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\URI;
@@ -143,15 +143,19 @@ public function createAnswerForm(
         if ($answer_form_type_class_hash !== '') {
             return $this->forwardCreateAnswerFormCmd(
                 $environment->withAnswerFormTypeHashParameter($answer_form_type_class_hash),
+                $question,
                 $content_object,
                 $this->answer_form_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
-                $this->answer_form_factory->getDefaultTypeGenericProperties($question->getId())
+                $this->answer_form_factory->getDefaultTypeGenericProperties(
+                    $question->getId()
+                )
             );
         }
 
         return match($environment->getAction()) {
             self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
                 $environment,
+                $question,
                 $content_object,
                 $this->answer_form_factory->getDefaultTypeGenericProperties($question->getId())
             ),
@@ -162,14 +166,14 @@ public function createAnswerForm(
     public function editAnswerForm(
         URI $base_uri,
         QuestionImplementation $question,
-        \ilPCAnswerForm $content_obj
+        \ilPCAnswerForm $content_object
     ): EditForm|EditOverview {
         $environment = $this->buildEnvironment($base_uri)
             ->withActionParameter(self::CMD_EDIT_ANSWER_FORM)
             ->withQuestionIdParameter($question->getId());
 
         return match($environment->getAction()) {
-            self::CMD_EDIT_ANSWER_FORM => $this->processCreateAnswerForm($url_builder),
+            self::CMD_EDIT_ANSWER_FORM => $this->processCreateAnswerForm($environment->getUrlBuilder()),
             default => $this->forwardEditAnswerFormCmd($environment)
         };
     }
@@ -195,7 +199,7 @@ private function createQuestion(
             return $create;
         }
 
-        $this->questions_repository->store($create);
+        $this->questions_repository->create([$create]);
         return $this->buildEditStartView(
             $environment
                 ->withDefaultStep()
@@ -231,7 +235,7 @@ private function editQuestion(
             return $edit;
         }
 
-        $this->questions_repository->store($edit);
+        $this->questions_repository->update([$edit]);
         return $this->buildEditStartView(
             $environment->withQuestionIdParameter($question_id),
             $edit
@@ -265,6 +269,7 @@ private function showTable(
 
     private function processCreateAnswerForm(
         EnvironmentImplementation $environment,
+        QuestionImplementation $question,
         \ilPCAnswerForm $content_obj,
         TypeGenericProperties $generic_answer_form_properties
     ): EditForm {
@@ -274,9 +279,10 @@ private function processCreateAnswerForm(
         return $data === null
             ? $form
             : $this->forwardCreateAnswerFormCmd(
-                $environment->withAnswerFormTypeHashParameterParameter(
+                $environment->withAnswerFormTypeHashParameter(
                     $this->answer_form_factory->getHashedClass($data::class)
                 ),
+                $question,
                 $content_obj,
                 $data,
                 $generic_answer_form_properties
@@ -285,6 +291,7 @@ private function processCreateAnswerForm(
 
     private function forwardCreateAnswerFormCmd(
         EnvironmentImplementation $environment,
+        QuestionImplementation $question,
         \ilPCAnswerForm $content_obj,
         Definition $type,
         TypeGenericProperties $type_generic_properties,
@@ -299,9 +306,9 @@ private function forwardCreateAnswerFormCmd(
             return $create;
         }
 
-        $this->questions_repository->store($create);
-        $content_obj->create($create->getAnswerFormId());
-        $content_obj->getPage()->update();
+        $this->questions_repository->create(
+            [$question->withAnswerForm($create)]
+        );
 
         $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
     }
@@ -385,7 +392,7 @@ private function buildCreateAnswerForm(
         EnvironmentImplementation $environemt
     ): EditForm {
         $if = $this->ui_factory->input();
-        return $this->edit_form_factory->getEditForm(
+        return $environemt->getDefinitionsFactory()->getEditForm(
             $environemt->getUrlBuilder(),
             $if->field()->section(
                 [
diff --git a/components/ILIAS/Questions/src/Question/Question.php b/components/ILIAS/Questions/src/Question/Question.php
index c5e8a96776bd..9720bf85f82b 100644
--- a/components/ILIAS/Questions/src/Question/Question.php
+++ b/components/ILIAS/Questions/src/Question/Question.php
@@ -20,7 +20,10 @@
 
 namespace ILIAS\Questions\Question;
 
-interface Question extends Persistence\Storable
+use ILIAS\Questions\Question\Views\Participant;
+use ILIAS\Questions\Persistence\Storable;
+
+interface Question extends Storable
 {
-    public function getParticipantView(): Views\Participant;
+    public function getParticipantView(): Participant;
 }
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index 0beba1272155..18c4ad2dca0c 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -21,7 +21,13 @@
 namespace ILIAS\Questions\Question;
 
 use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
-use ILIAS\Questions\Question\Persistence\Manipulate;
+use ILIAS\Questions\Persistence\CoreTables;
+use ILIAS\Questions\Persistence\Insert;
+use ILIAS\Questions\Persistence\Update;
+use ILIAS\Questions\Persistence\Manipulate;
+use ILIAS\Questions\Persistence\ManipulationType;
+use ILIAS\Questions\Persistence\Value;
+use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Data\Factory as DataFactory;
@@ -41,7 +47,7 @@ class QuestionImplementation implements Question
     public array $updated_answer_forms = [];
 
     /**
-     * @param array{string, \ILIAS\Questions\AnswerForm\Form} $answer_forms
+     * @param array{string, \ILIAS\Questions\AnswerForm\Properties} $answer_forms
      */
     public function __construct(
         private readonly Uuid $id,
@@ -166,7 +172,7 @@ public function withAnswerForm(AnswerFormProperties $answer_form): self
     {
         $clone = clone $this;
         $clone->answer_forms[$answer_form->getAnswerFormId()->toString()] = $answer_form;
-        $clone->updated_answer_forms[] = $answer_form->getAnswerFormId();
+        $clone->updated_answer_forms[] = $answer_form;
         return $clone;
     }
 
@@ -234,17 +240,106 @@ public function toTableRow(
     public function toStorage(
         Manipulate $manipulate
     ): Manipulate {
-        return [
-            'id' => [\ilDBConstants::T_TEXT, $this->id->toString()],
-            'page_id' => [\ilDBConstants::T_INTEGER, $this->page_id],
-            'title' => [\ilDBConstants::T_TEXT, $this->title],
-            'author' => [\ilDBConstants::T_TEXT, $this->author],
-            'lifecycle' => [\ilDBConstants::T_TEXT, $this->lifecycle->value],
-            'remarks' => [\ilDBConstants::T_TEXT, $this->remarks],
-            'original_id' => [\ilDBConstants::T_TEXT, $this->original_id?->toString()],
-            'last_update' => [\ilDBConstants::T_INTEGER, time()],
-            'created' => [\ilDBConstants::T_INTEGER, $this->created?->getTimestamp() ?? time()]
-        ];
+        return $manipulate->getManipulationType() === ManipulationType::Create
+            ? $this->addInsertStatementsToManipulation($manipulate)
+            : $this->addUpdateStatementsToManipulation($manipulate);
     }
 
+    private function addInsertStatementsToManipulation(
+        Manipulate $manipulate
+    ): Manipulate {
+        if ($this->created === null) {
+            $manipulate = $manipulate->withAdditionalStatement(
+                $this->buildInsertQuestionStatement()
+            );
+        }
+
+        if ($this->updated_answer_forms !== []) {
+            return $this->addAnswerFormStatementsToManipulate(
+                $manipulate,
+                $this->updated_answer_forms
+            );
+        }
+
+        if ($this->answer_forms !== []) {
+            return $this->addAnswerFormStatementsToManipulate(
+                $manipulate,
+                $this->answer_forms
+            );
+        }
+
+        return $manipulate;
+    }
+
+    private function addUpdateStatementsToManipulation(
+        Manipulate $manipulate
+    ): Manipulate {
+        if ($this->self_updated) {
+            $manipulate = $manipulate->withAdditionalStatement(
+                $this->buildUpdateQuestionStatement()
+            );
+        }
+
+        return $this->addAnswerFormStatementsToManipulate(
+            $manipulate,
+            $this->updated_answer_forms
+        );
+    }
+
+    private function buildInsertQuestionStatement(): Insert
+    {
+        return new Insert(
+            CoreTables::Questions->getColumns(),
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->id->toString()),
+                new Value(\ilDBConstants::T_INTEGER, $this->page_id),
+                new Value(\ilDBConstants::T_TEXT, $this->title),
+                new Value(\ilDBConstants::T_TEXT, $this->author),
+                new Value(\ilDBConstants::T_TEXT, $this->lifecycle->value),
+                new Value(\ilDBConstants::T_TEXT, $this->remarks),
+                new Value(\ilDBConstants::T_TEXT, $this->original_id?->toString()),
+                new Value(\ilDBConstants::T_INTEGER, time()),
+                new Value(\ilDBConstants::T_INTEGER, time())
+            ]
+        );
+    }
+
+    private function addAnswerFormStatementsToManipulate(
+        Manipulate $manipulate,
+        array $answer_forms
+    ): Manipulate {
+        return array_reduce(
+            $answer_forms,
+            fn(Manipulate $c, AnswerFormProperties $v): Manipulate => $v->toStorage(
+                $v->getTypeGenericProperties()->toStorage($c)
+            ),
+            $manipulate
+        );
+    }
+
+    private function buildUpdateQuestionStatement(): Update
+    {
+        $questions_table_definition = CoreTables::Questions;
+        return new Update(
+            $questions_table_definition->getColumns([
+                CoreTables::ANSWER_FORM_TABLE_ID_COLUMN,
+                'page_id',
+                'created'
+            ]),
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->title),
+                new Value(\ilDBConstants::T_TEXT, $this->author),
+                new Value(\ilDBConstants::T_TEXT, $this->lifecycle->value),
+                new Value(\ilDBConstants::T_TEXT, $this->remarks),
+                new Value(\ilDBConstants::T_TEXT, $this->original_id?->toString()),
+                new Value(\ilDBConstants::T_INTEGER, time())
+            ],
+            [
+                new Where(
+                    $questions_table_definition->getIdColumn(),
+                    new Value(\ilDBConstants::T_TEXT, $this->id->toString())
+                )
+            ]
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index 98632822c5a3..fc7667749e75 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -21,16 +21,13 @@
 namespace ILIAS\Questions\Question\Views;
 
 use ILIAS\Questions\Presentation\Layout\Definitions\EditForm;
-use ILIAS\Questions\Presentation\Layout\Definitions\Factory as DefinitionsFactory;
-use ILIAS\Questions\Presentation\Layout\Definitions\Environment;
+use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Question\Question;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\URLBuilder;
-use ILIAS\UI\URLBuilderToken;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\Refinery\Factory as Refinery;
@@ -55,7 +52,7 @@ public function __construct(
     }
 
     public function create(
-        Environment $environment
+        EnvironmentImplementation $environment
     ): EditForm|Question {
         return match ($environment->getStep()) {
             self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm($environment),
@@ -64,7 +61,7 @@ public function create(
     }
 
     public function edit(
-        Environment $environment
+        EnvironmentImplementation $environment
     ): EditForm|Question {
         return match ($environment->getStep()) {
             self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm($environment),
@@ -75,7 +72,7 @@ public function edit(
     }
 
     private function buildBasicPropertiesForm(
-        Environment $environment
+        EnvironmentImplementation $environment
     ): EditForm {
         return $environment->getDefinitionsFactory()->getEditForm(
             $environment->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION),
@@ -85,7 +82,7 @@ private function buildBasicPropertiesForm(
     }
 
     private function processBasicPropertiesForm(
-        Environment $environment
+        EnvironmentImplementation $environment
     ): EditForm|Question {
         $form = $this->buildBasicPropertiesForm(
             $environment
@@ -149,8 +146,10 @@ function (array $vs): QuestionImplementation {
         );
     }
 
-    private function buildPreviewPanel(): StandardPanel
-    {
+    private function buildPreviewPanel(
+        EnvironmentImplementation $environment
+    ): StandardPanel {
+        $environment->setParametersForQuestionCmds();
         return $this->ui_factory->panel()->standard(
             $this->lng->txt('preview'),
             $this->ui_factory->legacy()->content($this->question->getTitle())
diff --git a/components/ILIAS/Questions/src/Setup/Agent.php b/components/ILIAS/Questions/src/Setup/Agent.php
index e8e6b59f4224..82af39742651 100644
--- a/components/ILIAS/Questions/src/Setup/Agent.php
+++ b/components/ILIAS/Questions/src/Setup/Agent.php
@@ -20,8 +20,8 @@
 
 namespace ILIAS\Questions\Setup;
 
-use ILIAS\Questions\Question\Persistence\TableNameBuilder;
-use ILIAS\Questions\Question\Persistence\TableNameSpaceCore;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableNameSpaceCore;
 use ILIAS\Setup\Agent\NullAgent;
 use ILIAS\Setup\Objective;
 use ILIAS\Setup\ObjectiveCollection;
diff --git a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
index b49a7a69e37b..f41dc833c0d8 100644
--- a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
@@ -20,8 +20,8 @@
 
 namespace ILIAS\Questions\Setup;
 
-use ILIAS\Questions\Question\Persistence\TableNameBuilder;
-use ILIAS\Questions\Question\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableTypes;
 
 class ClozeQuestionTables implements \ilDatabaseUpdateSteps
 {

From 288622aeecb9fbe057edbb39c2fadf03bd3a7133 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 5 Jan 2026 08:23:28 +0100
Subject: [PATCH 092/141] Questions: Implementing Persistence

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       |   6 +-
 .../PageEditor/class.ilPCAnswerForm.php       |  28 +-
 .../Questions/src/AnswerForm/Definition.php   |   5 +-
 .../Questions/src/AnswerForm/Factory.php      |  15 +
 .../Questions/src/AnswerForm/Persistence.php  |   6 +-
 .../src/AnswerForm/TypeGenericProperties.php  |  23 +-
 .../src/AnswerFormTypes/Cloze/Definition.php  |   9 +-
 .../src/AnswerFormTypes/Cloze/Persistence.php |  81 ++--
 .../Cloze/Properties/AnswerForm/Factory.php   |  28 +-
 .../Gaps/AnswerOptions/AnswerOption.php       |   5 +-
 .../Gaps/AnswerOptions/AnswerOptions.php      |   6 +-
 .../Properties/Gaps/AnswerOptions/Factory.php |  45 ++-
 .../Gaps/AnswerOptions/Properties.php         | 371 ------------------
 .../Cloze/Properties/Gaps/Factory.php         |  46 ++-
 .../Cloze/Properties/Gaps/Gap.php             |   7 +-
 .../Cloze/Properties/Gaps/Gaps.php            |   6 +-
 .../Cloze/Properties/Gaps/LongMenu.php        |   6 +-
 .../Cloze/Properties/Gaps/Numeric.php         |   6 +-
 .../Cloze/Properties/Gaps/Select.php          |   4 +-
 .../Cloze/Properties/Gaps/Text.php            |   4 +-
 .../Cloze/Properties/Gaps/Type.php            |   2 +-
 .../Questions/src/Persistence/Insert.php      |  21 +-
 .../Questions/src/Persistence/Manipulate.php  |   6 +-
 .../ILIAS/Questions/src/Persistence/Query.php |  31 +-
 .../Questions/src/Persistence/Repository.php  |  42 +-
 .../Questions/src/Persistence/Storable.php    |   1 +
 .../ILIAS/Questions/src/Persistence/Value.php |   2 +-
 .../Questions/src/Presentation/Views/Edit.php |   5 +-
 .../ILIAS/Questions/src/Question/Question.php |   2 +-
 .../src/Question/QuestionImplementation.php   | 100 ++++-
 30 files changed, 434 insertions(+), 485 deletions(-)
 delete mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Properties.php

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index ea0c19fc09a1..4058c8d8616f 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -92,15 +92,15 @@ protected static function buildDIC(ILIASContainer $DIC): self
                 (new \ilMustacheFactory())->getBasicEngine(),
                 $c[DataFactory::class]->text()
             );
-        $dic[Cloze\Properties\Gaps\Properties\Factory::class] = static fn($c): Cloze\Properties\Gaps\Properties\Factory
-            => new Cloze\Properties\Gaps\Properties\Factory(
+        $dic[Cloze\Properties\Gaps\AnswerOptions\Factory::class] = static fn($c): Cloze\Properties\Gaps\AnswerOptions\Factory
+            => new Cloze\Properties\Gaps\AnswerOptions\Factory(
                 $c[UuidFactory::class],
                 $DIC['refinery']
             );
         $dic[Cloze\Properties\Gaps\Factory::class] = static fn($c): Cloze\Properties\Gaps\Factory
             => new Cloze\Properties\Gaps\Factory(
                 $c[UuidFactory::class],
-                $c[Cloze\Properties\Gaps\Properties\Factory::class],
+                $c[Cloze\Properties\Gaps\AnswerOptions\Factory::class],
                 [
                     new Cloze\Properties\Gaps\Text(
                         $DIC['refinery'],
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
index ae04f8a19f66..b5be94a4d7f7 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
@@ -23,8 +23,8 @@
 class ilPCAnswerForm extends ilPageContent
 {
     private const string ANSWER_FORM_ELEMENT_TAG = 'AnswerForm';
-    private const string ANSWER_FORM_ID_ATTRIBUT = 'Uuid';
-    private const string ANSWER_FORM_PLACEHOLDER = '\[\[\[ANSWER_FORM_(.*)\]\]\]';
+    private const string ANSWER_FORM_ID_ATTRIBUTE = 'Uuid';
+    private const string ANSWER_FORM_PLACEHOLDER = '\[\[\[ANSWER_FORM_([0-9a-f\-]+)\]\]\]';
 
     public function init(): void
     {
@@ -73,10 +73,32 @@ public function create(
             $this->hier_id,
             '',
             self::ANSWER_FORM_ELEMENT_TAG,
-            [self::ANSWER_FORM_ID_ATTRIBUT => $answer_form_id->toString()]
+            [self::ANSWER_FORM_ID_ATTRIBUTE => $answer_form_id->toString()]
         );
     }
 
+    public static function afterPageUpdate(
+        ilPageObject $page,
+        DOMDocument $domdoc,
+        string $xml,
+        bool $creation
+    ): void {
+        if ($page::class !== QstsQuestionPage::class) {
+            return;
+        }
+
+        global $DIC;
+        $dom_util = $DIC->copage()->internal()->domain()->domUtil();
+
+        /** @var \ILIAS\Questions\Question\QuestionImplementation $question */
+        $question = $page->getQuestion();
+
+        $answer_forms = [];
+        foreach ($dom_util->path($domdoc, '//AnswerForm') as $node) {
+            $answer_forms[] = $node->getAttribute(self::ANSWER_FORM_ID_ATTRIBUTE);
+        }
+    }
+
     public static function handleCopiedContent(
         DOMDocument $a_domdoc,
         bool $a_self_ass = true,
diff --git a/components/ILIAS/Questions/src/AnswerForm/Definition.php b/components/ILIAS/Questions/src/AnswerForm/Definition.php
index 2c44dd759687..e623a00b8b98 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Definition.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Definition.php
@@ -23,6 +23,9 @@
 use ILIAS\Questions\AnswerForm\Capabilities\Capability;
 use ILIAS\Questions\AnswerForm\Views\Edit;
 use ILIAS\Questions\AnswerForm\Views\Participant;
+use ILIAS\Questions\AnswerForm\Persistence;
+use ILIAS\Questions\Persistence\Query;
+use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Language\Language;
 
 interface Definition
@@ -30,7 +33,7 @@ interface Definition
     public function getLabel(Language $lng): string;
     public function buildProperties(
         TypeGenericProperties $type_generic_properties,
-        array $type_specific_data
+        ?Query $query
     ): Properties;
     public function getPersistence(): Persistence;
     public function hasCapability(string $capability_class_name): bool;
diff --git a/components/ILIAS/Questions/src/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerForm/Factory.php
index db5e18c1e3fa..83bfa1b2ed1f 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Factory.php
@@ -103,4 +103,19 @@ public function getDefaultTypeGenericProperties(
             $question_id
         );
     }
+
+    public function buildTypeGenericPropertiesFromDatabase(
+        array $db_values
+    ): TypeGenericProperties {
+        return new TypeGenericProperties(
+            $this->uuid_factory->fromString($db_values['id']),
+            $this->uuid_factory->fromString($db_values['question_id']),
+            $db_values['type'],
+            $db_values['available_points'],
+            $db_values['image_size'],
+            $db_values['shuffle_answer_options'] === 1,
+            $db_values['additional_text'],
+            $db_values['additional_text_legacy']
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Persistence.php b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
index f81f70a0cad9..958aeeaa860b 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
@@ -40,8 +40,12 @@ public function getIdColumn(
         TableTypes $table_type,
         ?string $table_identifier = null
     ): Column;
-    public function completeQuery(
+    public function getForeignKeyColumn(
         TableNameBuilder $table_name_builder,
+        TableTypes $table_type,
+        ?string $table_identifier = null
+    ): Column;
+    public function completeQuery(
         Query $query,
         Column $base_table_id_column,
     ): Query;
diff --git a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
index fe66ab6934bc..da716c041d08 100644
--- a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
@@ -21,6 +21,7 @@
 namespace ILIAS\Questions\AnswerForm;
 
 use ILIAS\Questions\Persistence\CoreTables;
+use ILIAS\Questions\Persistence\Delete;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\Manipulate;
 use ILIAS\Questions\Persistence\ManipulationType;
@@ -79,8 +80,9 @@ public function getAdditionalTextLegacy(): string
         return $this->additional_text_legacy;
     }
 
-    public function toStorage(Manipulate $manipulate): Manipulate
-    {
+    public function toStorage(
+        Manipulate $manipulate
+    ): Manipulate {
         if ($this->definition_class === null) {
             throw new \UnexpectedValueException(
                 'You cannot save a Answer Form without a Type!'
@@ -93,6 +95,23 @@ public function toStorage(Manipulate $manipulate): Manipulate
         );
     }
 
+    public function toDelete(
+        Manipulate $manipulate
+    ): Manipulate {
+        $answer_form_table_definition = CoreTables::AnswerForms;
+        return $manipulate->withAdditionalStatement(
+            new Delete(
+                $answer_form_table_definition->getTable(),
+                [
+                    new Where(
+                        $answer_form_table_definition->getIdColumn(),
+                        $this->answer_form_id->toString()
+                    )
+                ]
+            )
+        );
+    }
+
     private function buildInsertStatement(): Insert
     {
         return new Insert(
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
index e6a9655e911b..8242d8f66026 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
@@ -22,11 +22,13 @@
 
 use ILIAS\Questions\AnswerForm\Definition as DefinitionInterface;
 use ILIAS\Questions\AnswerForm\Capabilities\Capability;
+use ILIAS\Questions\AnswerForm\Persistence;
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Edit;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Participant;
+use ILIAS\Questions\Persistence\Query;
 use ILIAS\Language\Language;
 
 class Definition implements DefinitionInterface
@@ -50,9 +52,12 @@ public function getLabel(Language $lng): string
 
     public function buildProperties(
         TypeGenericProperties $type_generic_data,
-        array $type_specific_data
+        ?Query $query
     ): Properties {
-        return $this->properties_factory->fromData($type_generic_data, $type_specific_data);
+        return $this->properties_factory->fromData(
+            $type_generic_data,
+            $query
+        );
     }
 
     public function getPersistence(): Persistence
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
index 5b12a3cd294c..256706b6a3b7 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
@@ -116,7 +116,7 @@ public function getIdColumn(
         return match($table_type) {
             TableTypes::TypeSpecificAnswerForms => new Column(
                 $table_type->getTable($table_name_builder),
-                self::ANSWER_FORM_TABLE_ID_COLUMN
+                self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
             ),
             default => new Column(
                 $table_type->getTable($table_name_builder, $table_identifier),
@@ -125,24 +125,48 @@ public function getIdColumn(
         };
     }
 
-    public function completeQuery(
+    public function getForeignKeyColumn(
         TableNameBuilder $table_name_builder,
+        TableTypes $table_type,
+        ?string $table_identifier = null
+    ): Column {
+        return match($table_type) {
+            TableTypes::TypeSpecificAnswerForms => new Column(
+                $table_type->getTable($table_name_builder),
+                self::ANSWER_FORM_TABLE_ID_COLUMN
+            ),
+            TableTypes::AnswerInputs => new Column(
+                $table_type->getTable($table_name_builder),
+                self::ANSWER_INPUTS_TABLE_FOREIGN_KEY_COLUMN
+            ),
+            TableTypes::AnswerOptions => new Column(
+                $table_type->getTable($table_name_builder),
+                self::ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN
+            ),
+            TableTypes::Additional => new Column(
+                $table_type->getTable($table_name_builder, $table_identifier),
+                self::COMBINATIONS_TABLE_FOREIGN_KEY_COLUMN
+            )
+        };
+    }
+
+    public function completeQuery(
         Query $query,
-        Column $base_table_id_column
+        Column $answer_form_id_column
     ): Query {
+        $table_name_builder = $query->getTableNameBuilder(Definition::class);
+
         $answer_form_specific_table_definition = TableTypes::TypeSpecificAnswerForms;
         $answer_input_table_definition = TableTypes::AnswerInputs;
-        $answer_input_table = $answer_input_table_definition
-            ->getTable($table_name_builder);
         $answer_options_table_definition = TableTypes::AnswerOptions;
         $combinations_table_definition = TableTypes::Additional;
 
         return $query->withAdditionalJoin(
             new Join(
-                $base_table_id_column,
-                new Column(
-                    $answer_form_specific_table_definition->getTable($table_name_builder),
-                    self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
+                $answer_form_id_column,
+                $this->getForeignKeyColumn(
+                    $table_name_builder,
+                    $answer_form_specific_table_definition
                 ),
                 JoinType::Left
             )
@@ -152,26 +176,29 @@ public function completeQuery(
             )
         )->withAdditionalJoin(
             new Join(
-                $base_table_id_column,
-                new Column(
-                    $answer_input_table,
-                    self::ANSWER_INPUTS_TABLE_FOREIGN_KEY_COLUMN
+                $answer_form_id_column,
+                $this->getForeignKeyColumn(
+                    $table_name_builder,
+                    $answer_input_table_definition
                 ),
                 JoinType::Left
             )
         )->withAdditionalSelect(
             new Select(
-                $this->getColumns($table_name_builder, $answer_input_table_definition)
+                $this->getColumns(
+                    $table_name_builder,
+                    $answer_input_table_definition
+                )
             )
         )->withAdditionalJoin(
             new Join(
-                new Column(
-                    $answer_input_table,
-                    self::ID_COLUMN
+                $this->getIdColumn(
+                    $table_name_builder,
+                    $answer_input_table_definition
                 ),
-                new Column(
-                    $answer_options_table_definition->getTable($table_name_builder),
-                    self::ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN
+                $this->getForeignKeyColumn(
+                    $table_name_builder,
+                    $answer_options_table_definition
                 ),
                 JoinType::Left
             )
@@ -179,18 +206,16 @@ public function completeQuery(
             new Select(
                 $this->getColumns(
                     $table_name_builder,
-                    $answer_input_table_definition
+                    $answer_options_table_definition
                 )
             )
         )->withAdditionalJoin(
             new Join(
-                $base_table_id_column,
-                new Column(
-                    $combinations_table_definition->getTable(
-                        $table_name_builder,
-                        self::COMBINATIONS_TABLE_IDENTIFIER
-                    ),
-                    self::COMBINATIONS_TABLE_FOREIGN_KEY_COLUMN
+                $answer_form_id_column,
+                $this->getForeignKeyColumn(
+                    $table_name_builder,
+                    $combinations_table_definition,
+                    self::COMBINATIONS_TABLE_IDENTIFIER
                 ),
                 JoinType::Left
             )
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
index 58bc67d186d4..1e0904d5872a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
@@ -21,10 +21,13 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm;
 
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
+use ILIAS\Questions\Persistence\Query;
+use ILIAS\Questions\Persistence\TableTypes;
 
 class Factory
 {
@@ -36,9 +39,9 @@ public function __construct(
 
     public function fromData(
         TypeGenericProperties $type_generic_properties,
-        array $type_specific_data
+        ?Query $query
     ): Properties {
-        if ($type_specific_data === []) {
+        if ($query === null) {
             return new Properties(
                 $type_generic_properties->getAnswerFormId(),
                 $type_generic_properties->getQuestionId(),
@@ -50,6 +53,21 @@ public function fromData(
             );
         }
 
+        [
+            'scoring_identical_responses' => $scoring_identical_responses,
+            'combinations_activated' => $combinations_activated
+        ] = $query->retrieveCurrentRecord(
+            TableTypes::TypeSpecificAnswerForms->getTable(
+                $query->getTableNameBuilder(Definition::class)
+            ),
+            $query->getRefinery()->custom()->transformation(
+                fn(array $vs): array => [
+                    'scoring_identical_responses' => ScoringIdentical::tryFrom($vs[0]['scoring_identical_responses']),
+                    'combinations_activated' => $vs[0]['combinations_activated'] === 1
+                ]
+            )
+        );
+
         return new Properties(
             $type_generic_properties->getAnswerFormId(),
             $type_generic_properties->getQuestionId(),
@@ -57,9 +75,9 @@ public function fromData(
                 $type_generic_properties->getAdditionalText()
             ),
             $type_generic_properties->getAdditionalTextLegacy(),
-            $type_specific_data['gaps'],
-            $type_specific_data['identical_scoring'],
-            $type_specific_data['combinations_enabled']
+            $this->gaps_factory->fromDatabase($query),
+            $scoring_identical_responses,
+            $combinations_activated
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
index ab041de5359c..0c8d1132bf44 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
@@ -18,11 +18,12 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions;
 
 use ILIAS\Questions\Persistence\Replace;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Data\UUID\Uuid;
 
@@ -160,7 +161,7 @@ private function buildValuesForGapReplace(): array
             new Value(\ilDBConstants::T_TEXT, $this->answer_input_id->toString()),
             new Value(\ilDBConstants::T_INTEGER, $this->position),
             new Value(\ilDBConstants::T_TEXT, $this->text_value),
-            new Value(\ilDBConstants::T_FLOAT, $this->points),
+            new Value(\ilDBConstants::T_FLOAT, $this->available_points),
             new Value(\ilDBConstants::T_FLOAT, $this->lower_limit),
             new Value(\ilDBConstants::T_FLOAT, $this->upper_limit)
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
index ab521230ad03..4c90762f832a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions;
 
 use ILIAS\Questions\Persistence\Replace;
 use ILIAS\Questions\Persistence\TableNameBuilder;
@@ -204,8 +204,8 @@ public function buildReplace(
     ): Replace {
         return array_reduce(
             $this->answer_options,
-            fn(AnswerOption $v): Replace => $v->buildReplace(
-                $replace,
+            fn(?Replace $c, AnswerOption $v): Replace => $v->buildReplace(
+                $c,
                 $persistence,
                 $table_name_builder
             ),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
index 469e504ea011..9d31efe2526f 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
@@ -18,8 +18,11 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions;
 
+use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
+use ILIAS\Questions\Persistence\Query;
+use ILIAS\Questions\Persistence\TableTypes;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Refinery\Factory as Refinery;
@@ -72,9 +75,45 @@ public function buildAnswerOption(
     }
 
     public function fromDatabase(
-        array $data
-    ): Gaps {
+        Query $query
+    ): array {
+        return $query->retrieveCurrentRecord(
+            TableTypes::AnswerOptions->getTable($query->getTableNameBuilder(Definition::class)),
+            $query->getRefinery()->custom()->transformation(
+                function (array $vs): array {
+                    $previous_answer_input_id = null;
+                    $return_array = [];
+                    $answer_options = [];
+                    foreach ($vs as $v) {
+                        if ($previous_answer_input_id !== null
+                            && $v['answer_input_id'] !== $previous_answer_input_id) {
+                            $return_array[$previous_answer_input_id] = new AnswerOptions(
+                                $this,
+                                $answer_options
+                            );
+                            $answer_options = [];
+                        }
+                        $previous_answer_input_id = $v['answer_input_id'];
+                        $answer_options[] = new AnswerOption(
+                            $this->uuid_factory->fromString($v['id']),
+                            $this->uuid_factory->fromString($v['answer_input_id']),
+                            $v['position'],
+                            $v['text_value'],
+                            $v['lower_limit'],
+                            $v['upper_limit'],
+                            $v['points']
+                        );
+                    }
 
+                    $return_array[$v['answer_input_id']] = new AnswerOptions(
+                        $this,
+                        $answer_options
+                    );
+
+                    return $return_array;
+                }
+            )
+        );
     }
 
     private function convertToFloatOrNull(?string $value): ?float
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Properties.php
deleted file mode 100644
index a2bcda506eb9..000000000000
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Properties.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties;
-
-use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Type;
-use ILIAS\Questions\Persistence\Replace;
-use ILIAS\Questions\Persistence\TableNameBuilder;
-use ILIAS\Questions\Persistence\TableTypes;
-use ILIAS\Questions\Persistence\Value;
-use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
-use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
-use ILIAS\Data\UUID\Uuid;
-use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\Refinery\Transformation;
-use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
-use ILIAS\UI\Implementation\Component\Input\Field\Group;
-
-class Properties
-{
-    private const string FORM_KEY_TYPE = 'type';
-    private const string FORM_KEY_MAX_CHARS = 'max_chars';
-    private const string FORM_KEY_STEP_SIZE = 'step_size';
-    private const string FORM_KEY_TEXT_MATCHING_METHOD = 'matching_method';
-    private const string FORM_KEY_MIN_AUTOCOMPLETE = 'min_autocomplete';
-    private const string FORM_KEY_SHUFFLE_ANSWER_OPTIONS = 'shuffle';
-    private const string FORM_KEY_ANSWER_OPTIONS = 'answer_options';
-
-    /**
-     * @param array<ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties    \AnswerOption> $answer_options
-     */
-    public function __construct(
-        private readonly Uuid $answer_input_id,
-        private readonly Uuid $answer_form_id,
-        private int $position,
-        private AnswerOptions $answer_options,
-        private ?Type $type = null,
-        private ?int $max_chars = null,
-        private ?float $step_size = null,
-        private ?TextMatchingOptions $text_matching_method = null,
-        private ?int $min_autocomplete = null,
-        private ?bool $shuffle_answer_options = null
-    ) {
-    }
-
-    public function getAnswerInputId(): Uuid
-    {
-        return $this->answer_input_id;
-    }
-
-    public function getPosition(): int
-    {
-        return $this->position;
-    }
-
-    public function withPosition(
-        int $position
-    ): self {
-        $clone = clone $this;
-        $clone->position = $position;
-        return $clone;
-    }
-
-    public function getType(): ?Type
-    {
-        return $this->type;
-    }
-
-    public function withType(
-        Type $type
-    ): self {
-        $clone = clone $this;
-        $clone->type = $type;
-        return $clone;
-    }
-
-    public function getMaxChars(): ?int
-    {
-        return $this->max_chars;
-    }
-
-    public function withMaxChars(
-        ?int $max_chars
-    ): self {
-        $clone = clone $this;
-        $clone->max_chars = $max_chars;
-        return $clone;
-    }
-
-    public function getStepSize(): ?float
-    {
-        return $this->step_size;
-    }
-
-    public function withStepSize(
-        float $step_size
-    ): self {
-        $clone = clone $this;
-        $clone->step_size = $step_size;
-        return $clone;
-    }
-
-    public function getTextMatchingMethod(): ?TextMatchingOptions
-    {
-        return $this->text_matching_method;
-    }
-
-    public function withTextMatchingMethod(
-        TextMatchingOptions $matching_method
-    ): self {
-        $clone = clone $this;
-        $clone->text_matching_method = $matching_method;
-        return $clone;
-    }
-
-    public function getMinAutocomplete(): ?int
-    {
-        return $this->min_autocomplete;
-    }
-
-    public function withMinAutocomplete(
-        int $min_autocomplete
-    ): self {
-        $clone = clone $this;
-        $clone->min_autocomplete = $min_autocomplete;
-        return $clone;
-    }
-
-    public function getShuffleAnswerOptions(): ?bool
-    {
-        return $this->shuffle_answer_options;
-    }
-
-    public function withShuffleAnswerOptions(
-        bool $shuffle_answer_options
-    ): self {
-        $clone = clone $this;
-        $clone->shuffle_answer_options = $shuffle_answer_options;
-        return $clone;
-    }
-
-    public function getAnswerOptions(): AnswerOptions
-    {
-        return $this->answer_options;
-    }
-
-    public function withAnswerOptions(
-        AnswerOptions $answer_options
-    ): self {
-        $clone = clone $this;
-        $clone->answer_options = $answer_options;
-        return $clone;
-    }
-
-    public function getCarryInputs(
-        FieldFactory $ff
-    ): Group {
-        $inputs = [];
-        if ($this->type !== null) {
-            $inputs[self::FORM_KEY_TYPE] = $ff->hidden()->withValue($this->type?->getIdentifier() ?? '')
-                ->withDedicatedName(self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId());
-        }
-
-        if ($this->max_chars !== null) {
-            $inputs[self::FORM_KEY_MAX_CHARS] = $ff->hidden()->withValue($this->getMaxChars())
-                ->withDedicatedName(self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId());
-        }
-
-        if ($this->step_size !== null) {
-            $inputs[self::FORM_KEY_STEP_SIZE] = $ff->hidden()->withValue($this->getStepSize())
-                ->withDedicatedName(self::FORM_KEY_STEP_SIZE . $this->getShortenedAnswerInputId());
-        }
-
-        if ($this->text_matching_method !== null) {
-            $inputs[self::FORM_KEY_TEXT_MATCHING_METHOD] = $ff->hidden()->withValue($this->getTextMatchingMethod()->value)
-                ->withDedicatedName(self::FORM_KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId());
-        }
-
-        if ($this->min_autocomplete !== null) {
-            $inputs[self::FORM_KEY_MIN_AUTOCOMPLETE] = $ff->hidden()->withValue($this->getMinAutocomplete())
-                ->withDedicatedName(self::FORM_KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId());
-        }
-
-        if ($this->shuffle_answer_options !== null) {
-            $inputs[self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->getShuffleAnswerOptions() ? '1' : '0')
-                ->withDedicatedName(self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId());
-        }
-
-        $inputs[self::FORM_KEY_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->answer_options->buildHiddenInputValue())
-            ->withDedicatedName(self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId());
-
-        return $ff->group($inputs);
-    }
-
-    public function getFromCarryTransformation(
-        Refinery $refinery,
-        array $available_gap_types
-    ): Transformation {
-        return $refinery->custom()->transformation(
-            function (CarryWrapper $v) use ($refinery, $available_gap_types): self {
-                $clone = clone $this;
-                $this->type = $this->retrieveTypeFromCarry($refinery, $v, $available_gap_types);
-                $clone->max_chars = $this->retrieveMaxCharsFromCarry($refinery, $v);
-                $clone->step_size = $this->retrieveStepSizeFromCarry($refinery, $v);
-                $clone->text_matching_method = $this->retrieveTextMatchingMethodFromCarry($refinery, $v);
-                $clone->min_autocomplete = $this->retrieveMinAutocompleteFromCarry($refinery, $v);
-                $clone->shuffle_answer_options = $this->retrieveShuffleAnswerOptionsFromCarry($refinery, $v);
-                $clone->answer_options = $this->retrieveAnswerOptionsFromCarry($refinery, $v);
-                return $clone;
-            }
-        );
-    }
-
-    public function buildReplace(
-        ?Replace $replace,
-        Persistence $persistence,
-        TableNameBuilder $table_name_builder
-    ): Replace {
-        if ($this->type === null) {
-            throw new \UnexpectedValueException(
-                'Gap Properties without Type cannot be stored.'
-            );
-        }
-
-        $table_definition = TableTypes::AnswerInputs;
-
-        if ($replace === null) {
-            return new Replace(
-                $persistence->getColumns($table_name_builder, $table_definition),
-                $this->buildValuesForGapReplace()
-            );
-        }
-
-        return $replace->withAdditionalValues(
-            $this->buildValuesForGapReplace()
-        );
-    }
-
-    private function buildValuesForGapReplace(): array
-    {
-        return [
-            new Value(\ilDBConstants::T_TEXT, $this->answer_input_id->toString()),
-            new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
-            new Value(\ilDBConstants::T_INTEGER, $this->position),
-            new Value(\ilDBConstants::T_TEXT, $this->type->getIdentifier()),
-            new Value(\ilDBConstants::T_INTEGER, $this->max_chars),
-            new Value(\ilDBConstants::T_FLOAT, $this->step_size),
-            new Value(\ilDBConstants::T_INTEGER, $this->text_matching_method->value),
-            new Value(\ilDBConstants::T_INTEGER, $this->min_autocomplete),
-            new Value(\ilDBConstants::T_INTEGER, $this->shuffle_answer_options ? 1 : 0)
-
-        ];
-    }
-
-    private function retrieveTypeFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry,
-        array $available_gap_types
-    ): ?Type {
-        return $carry->retrieve(
-            self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId(),
-            $refinery->custom()->transformation(
-                fn(?string $v): ?Type => $available_gap_types[$v] ?? $this->getType()
-            )
-        );
-    }
-
-    private function retrieveMaxCharsFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): ?int {
-        return $carry->retrieve(
-            self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId(),
-            $refinery->byTrying([
-                $refinery->kindlyTo()->int(),
-                $refinery->always($this->getMaxChars())
-            ])
-        );
-    }
-
-    private function retrieveStepSizeFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): ?float {
-        return $carry->retrieve(
-            self::FORM_KEY_STEP_SIZE . $this->getShortenedAnswerInputId(),
-            $refinery->byTrying([
-                $refinery->kindlyTo()->float(),
-                $refinery->always($this->getStepSize())
-            ])
-        );
-    }
-
-    private function retrieveTextMatchingMethodFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): ?TextMatchingOptions {
-        return $carry->retrieve(
-            self::FORM_KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId(),
-            $refinery->custom()->transformation(
-                fn(?string $v): ?TextMatchingOptions => $v !== null
-                    ? TextMatchingOptions::tryFrom($v)
-                    : $this->getTextMatchingMethod()
-            )
-        );
-    }
-
-    private function retrieveMinAutocompleteFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): ?int {
-        return $carry->retrieve(
-            self::FORM_KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId(),
-            $refinery->byTrying([
-                $refinery->kindlyTo()->int(),
-                $refinery->always($this->getMinAutocomplete())
-            ])
-        );
-    }
-
-    private function retrieveShuffleAnswerOptionsFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): ?bool {
-        return $carry->retrieve(
-            self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
-            $refinery->byTrying([
-                $refinery->kindlyTo()->bool(),
-                $refinery->always($this->getShuffleAnswerOptions())
-            ])
-        );
-    }
-
-    private function retrieveAnswerOptionsFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): AnswerOptions {
-        return $carry->retrieve(
-            self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
-            $refinery->custom()->transformation(
-                fn(?string $v): AnswerOptions => $this->answer_options->withValuesFromHiddenInputValue(
-                    $this->answer_input_id,
-                    $v
-                )
-            )
-        );
-    }
-
-    private function getShortenedAnswerInputId(): string
-    {
-        return mb_substr($this->answer_input_id->toString(), 0, 4);
-    }
-}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index 0d311e76ba9c..8a416f060ec9 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -20,7 +20,11 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Factory as PropertiesFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\Factory as AnswerOptionsFactory;
+use ILIAS\Questions\Persistence\Query;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
 use ILIAS\Language\Language;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Data\UUID\Factory as UuidFactory;
@@ -31,7 +35,7 @@ class Factory
 
     public function __construct(
         private readonly UuidFactory $uuid_factory,
-        private readonly PropertiesFactory $data_factory,
+        private readonly AnswerOptionsFactory $answer_options_factory,
         array $available_gap_types
     ) {
         foreach ($available_gap_types as $type) {
@@ -66,7 +70,7 @@ public function getNewGap(
             $answer_input_id,
             $answer_form_id,
             $position,
-            $this->data_factory->getDefaultAnswerOptions()
+            $this->answer_options_factory->getDefaultAnswerOptions()
         );
     }
 
@@ -87,8 +91,42 @@ public function getGapTypeByIdentifier(string $identifier): Type
     }
 
     public function fromDatabase(
-        array $data
+        Query $query
     ): Gaps {
+        $answer_options = $this->answer_options_factory->fromDatabase($query);
 
+        return $query->retrieveCurrentRecord(
+            TableTypes::AnswerInputs->getTable($query->getTableNameBuilder(Definition::class)),
+            $query->getRefinery()->custom()->transformation(
+                function (array $vs) use ($answer_options): Gaps {
+                    $previous_answer_input_id = null;
+                    $gaps = [];
+                    foreach ($vs as $v) {
+                        if ($previous_answer_input_id === $v['id']) {
+                            continue;
+                        }
+                        $previous_answer_input_id = $v['id'];
+                        $gaps[] = new Gap(
+                            $this->uuid_factory->fromString($v['id']),
+                            $this->uuid_factory->fromString($v['answer_form_id']),
+                            $v['position'],
+                            $answer_options[$v['id']],
+                            $this->getGapTypeByIdentifier($v['gap_type']),
+                            $v['max_chars'],
+                            $v['step_size'],
+                            $v['text_matching_method'] === null
+                                ? null
+                                : TextMatchingOptions::tryFrom($v['text_matching_method']),
+                            $v['min_autocomplete'],
+                            $v['shuffle_answer_options'] === 1
+                        );
+                    }
+                    return new Gaps(
+                        $this,
+                        $gaps
+                    );
+                }
+            )
+        );
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index f7cb6a4765f1..c65b249a8298 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -21,7 +21,8 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
 use ILIAS\Questions\AnswerForm\Persistence;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
+use ILIAS\Questions\Persistence\Replace;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
 use ILIAS\Questions\Persistence\Value;
@@ -48,7 +49,7 @@ class Gap
     private const string FORM_KEY_ANSWER_OPTIONS = 'answer_options';
 
     /**
-     * @param array<ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption> $answer_options
+     * @param array<ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption> $answer_options
      */
     public function __construct(
         private readonly Uuid $answer_input_id,
@@ -333,7 +334,7 @@ private function buildValuesForGapReplace(): array
             new Value(\ilDBConstants::T_TEXT, $this->type->getIdentifier()),
             new Value(\ilDBConstants::T_INTEGER, $this->max_chars),
             new Value(\ilDBConstants::T_FLOAT, $this->step_size),
-            new Value(\ilDBConstants::T_INTEGER, $this->text_matching_method->value),
+            new Value(\ilDBConstants::T_INTEGER, $this->text_matching_method?->value),
             new Value(\ilDBConstants::T_INTEGER, $this->min_autocomplete),
             new Value(\ilDBConstants::T_INTEGER, $this->shuffle_answer_options ? 1 : 0)
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index f081d31ebe3b..0df4837ec8bc 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -291,13 +291,13 @@ public function toStorage(
             'answer_options' => $replace_for_answer_options
         ] = array_reduce(
             $this->gaps,
-            fn(array $c, Gap $v): Manipulate => [
-                $v->getProperties()->buildReplace(
+            fn(array $c, Gap $v): array => [
+                'gaps' => $v->buildReplace(
                     $c['gaps'],
                     $persistence,
                     $table_name_builder
                 ),
-                $v->getProperties()->getAnswerOptions()->buildReplace(
+                'answer_options' => $v->getAnswerOptions()->buildReplace(
                     $c['answer_options'],
                     $persistence,
                     $table_name_builder
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
index c5fbc340964a..1e5bb45de089 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
@@ -20,9 +20,9 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\Properties;
 use ILIAS\FileUpload\MimeType;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
index 477a62f3b5e1..df1cd1bc5dfa 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
@@ -20,9 +20,9 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\Properties;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\Properties;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
index afdc9f537534..e2ccaf3a51da 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
@@ -20,8 +20,8 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
index 927c8001642e..ab2a08cd3c86 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
@@ -20,8 +20,8 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
 use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
index 447cad7f557b..e0c04bf318e8 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Properties\AnswerOptions;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
 use ILIAS\Refinery\Transformation;
diff --git a/components/ILIAS/Questions/src/Persistence/Insert.php b/components/ILIAS/Questions/src/Persistence/Insert.php
index f97738497f5a..41a9ec9182b8 100644
--- a/components/ILIAS/Questions/src/Persistence/Insert.php
+++ b/components/ILIAS/Questions/src/Persistence/Insert.php
@@ -30,7 +30,7 @@ class Insert
      */
     public function __construct(
         protected readonly array $columns,
-        protected readonly array $values
+        array $values
     ) {
         if ($columns === [] || count($columns) !== count($values)) {
             throw new \InvalidArgumentException(
@@ -55,18 +55,27 @@ public function __construct(
      */
     public function withAdditionalValues(
         array $values
-    ): void {
+    ): self {
         if (count($values) !== count($this->columns)) {
             throw new \InvalidArgumentException(
                 "There MUST be the same amount of Values as there are Columns."
             );
         }
 
-        $this->value_sets[] = $values;
+        $clone = clone $this;
+        $clone->value_sets[] = $values;
+        return $clone;
     }
 
-    public function toManipulateString(\ilDBInterface $db): string
-    {
+    public function lockTable(
+        \ilAtomQuery $atom_query
+    ): void {
+        $atom_query->addTableLock($this->columns[0]->getTableName());
+    }
+
+    public function toManipulateString(
+        \ilDBInterface $db
+    ): string {
         return "INSERT INTO {$this->columns[0]->getTableName()}" . PHP_EOL
             . $this->buildColumnsString() . PHP_EOL
             . $this->buildValuesString($db);
@@ -87,7 +96,7 @@ protected function buildColumnsString(): string
     protected function buildValuesString(\ilDBInterface $db): string
     {
         $return = [];
-        foreach ($this->values as $values) {
+        foreach ($this->value_sets as $values) {
             $return[] = '(' . implode(
                 ', ',
                 array_map(
diff --git a/components/ILIAS/Questions/src/Persistence/Manipulate.php b/components/ILIAS/Questions/src/Persistence/Manipulate.php
index 81a69762d5d4..74cefe53b0b6 100644
--- a/components/ILIAS/Questions/src/Persistence/Manipulate.php
+++ b/components/ILIAS/Questions/src/Persistence/Manipulate.php
@@ -72,13 +72,13 @@ public function run(): void
 
         $manipulates = [];
         foreach ($this->statements as $statement) {
-            $atom_query->addTableLock($statement->getTableName());
+            $statement->lockTable($atom_query);
             $manipulates[] = $statement->toManipulateString($this->db);
         }
         $atom_query->addQueryCallable(
-            function () use ($manipulates): void {
+            function (\ilDBInterface $db) use ($manipulates): void {
                 foreach ($manipulates as $manipulate) {
-                    $this->db->manipulate($manipulate);
+                    $db->manipulate($manipulate);
                 }
             }
         );
diff --git a/components/ILIAS/Questions/src/Persistence/Query.php b/components/ILIAS/Questions/src/Persistence/Query.php
index 08542db0ad21..0dcda7f2a046 100644
--- a/components/ILIAS/Questions/src/Persistence/Query.php
+++ b/components/ILIAS/Questions/src/Persistence/Query.php
@@ -20,6 +20,9 @@
 
 namespace ILIAS\Questions\Persistence;
 
+use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\AnswerForm\Persistence;
+use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
 
 class Query
@@ -36,7 +39,9 @@ class Query
     private ?array $current_record = null;
 
     public function __construct(
-        private readonly \ilDBInterface $db
+        private readonly \ilDBInterface $db,
+        private readonly AnswerFormFactory $answer_form_factory,
+        private readonly Refinery $refinery
     ) {
 
         $questions_table_definition = CoreTables::Questions;
@@ -66,6 +71,30 @@ public function __construct(
         );
     }
 
+    public function getPersistenceForDefinitionClass(
+        string $definition_class
+    ): Persistence {
+        return $this->answer_form_factory
+            ->getDefinitionForClass($definition_class)
+            ->getPersistence();
+    }
+
+    public function getTableNameBuilder(
+        string $definition_class
+    ): TableNameBuilder {
+        return new TableNameBuilder(
+            $this->answer_form_factory
+                ->getDefinitionForClass($definition_class)
+                ->getPersistence()
+                ->getPublicNameSpace()
+        );
+    }
+
+    public function getRefinery(): Refinery
+    {
+        return $this->refinery;
+    }
+
     public function withAdditionalSelect(Select $select): self
     {
         $clone = clone $this;
diff --git a/components/ILIAS/Questions/src/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
index 0635886122f4..262d8a99d595 100644
--- a/components/ILIAS/Questions/src/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -51,13 +51,23 @@ public function getNew(): QuestionImplementation
      */
     public function getAllQuestions(): \Generator
     {
-        yield from $this->getForBaseQuery(new Query($this->db));
+        yield from $this->getForBaseQuery(
+            new Query(
+                $this->db,
+                $this->answer_form_factory,
+                $this->refinery
+            )
+        );
     }
 
     public function getForQuestionId(Uuid $question_id): ?QuestionImplementation
     {
         return $this->getForBaseQuery(
-            (new Query($this->db))->withAdditionalWhere(
+            (new Query(
+                $this->db,
+                $this->answer_form_factory,
+                $this->refinery
+            ))->withAdditionalWhere(
                 new Where(
                     CoreTables::Questions->getIdColumn(),
                     new Value(
@@ -78,7 +88,11 @@ public function getForQuestionId(Uuid $question_id): ?QuestionImplementation
     public function getForQuestionIds(array $question_ids): \Generator
     {
         yield from $this->getForBaseQuery(
-            (new Query($this->db))->withAdditionalWhere(
+            (new Query(
+                $this->db,
+                $this->answer_form_factory,
+                $this->refinery
+            ))->withAdditionalWhere(
                 new Where(
                     CoreTables::Questions->getIdColumn(),
                     new Value(
@@ -102,9 +116,8 @@ private function getForBaseQuery(Query $query): \Generator
         $query_with_answer_forms = array_reduce(
             $this->answer_form_factory->getAvailableDefinitions(),
             fn(Query $c, AnswerFormDefinition $v) => $v->getPersistence()->completeQuery(
-                new TableNameBuilder($v->getPersistence()->getPublicNameSpace()),
                 $c,
-                CoreTables::Questions->getIdColumn()
+                CoreTables::AnswerForms->getIdColumn()
             ),
             $query
         );
@@ -174,11 +187,26 @@ private function retrieveAnswerFormsFromQuery(
         return $query->retrieveCurrentRecord(
             CoreTables::AnswerForms->getTable(),
             $this->refinery->custom()->transformation(
-                function (array $vs): array {
+                function (array $vs) use ($query): array {
                     if (count($vs) === 1 && $vs[0]['type'] === null) {
                         return [];
                     }
-                    $vs;
+
+                    $answer_forms = [];
+                    $previous_answer_form_id = null;
+                    foreach ($vs as $data_set) {
+                        if ($data_set['id'] === $previous_answer_form_id) {
+                            continue;
+                        }
+                        $previous_answer_form_id = $data_set['id'];
+                        $definition = $this->answer_form_factory
+                            ->getDefinitionForClass($data_set['type']);
+                        $answer_forms[] = $definition->buildProperties(
+                            $this->answer_form_factory->buildTypeGenericPropertiesFromDatabase($data_set),
+                            $query
+                        );
+                    }
+                    return $answer_forms;
                 }
             )
         );
diff --git a/components/ILIAS/Questions/src/Persistence/Storable.php b/components/ILIAS/Questions/src/Persistence/Storable.php
index f467271b3fff..429e65f8ef30 100644
--- a/components/ILIAS/Questions/src/Persistence/Storable.php
+++ b/components/ILIAS/Questions/src/Persistence/Storable.php
@@ -23,4 +23,5 @@
 interface Storable
 {
     public function toStorage(Manipulate $manipulate): Manipulate;
+    public function toDelete(Manipulate $manipulate): Manipulate;
 }
diff --git a/components/ILIAS/Questions/src/Persistence/Value.php b/components/ILIAS/Questions/src/Persistence/Value.php
index d811116e169c..9d7e48fa54fc 100644
--- a/components/ILIAS/Questions/src/Persistence/Value.php
+++ b/components/ILIAS/Questions/src/Persistence/Value.php
@@ -24,7 +24,7 @@ class Value
 {
     public function __construct(
         private readonly string $type,
-        private readonly null|string|int|array $value
+        private readonly null|string|int|float|array $value
     ) {
     }
 
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 3a5db44f1f78..e92128dad7c5 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -298,7 +298,7 @@ private function forwardCreateAnswerFormCmd(
     ): ?EditForm {
         $create = $type->getEditView()->create(
             $environment->withProperties(
-                $type->buildProperties($type_generic_properties, [])
+                $type->buildProperties($type_generic_properties, null)
             )
         );
 
@@ -310,6 +310,9 @@ private function forwardCreateAnswerFormCmd(
             [$question->withAnswerForm($create)]
         );
 
+        $content_obj->create($create->getAnswerFormId());
+        $content_obj->getPage()->update();
+
         $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
     }
 
diff --git a/components/ILIAS/Questions/src/Question/Question.php b/components/ILIAS/Questions/src/Question/Question.php
index 9720bf85f82b..3172fdf85186 100644
--- a/components/ILIAS/Questions/src/Question/Question.php
+++ b/components/ILIAS/Questions/src/Question/Question.php
@@ -23,7 +23,7 @@
 use ILIAS\Questions\Question\Views\Participant;
 use ILIAS\Questions\Persistence\Storable;
 
-interface Question extends Storable
+interface Question
 {
     public function getParticipantView(): Participant;
 }
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index 18c4ad2dca0c..3620aea14457 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -26,6 +26,7 @@
 use ILIAS\Questions\Persistence\Update;
 use ILIAS\Questions\Persistence\Manipulate;
 use ILIAS\Questions\Persistence\ManipulationType;
+use ILIAS\Questions\Persistence\Storable;
 use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
@@ -41,10 +42,13 @@
 use ILIAS\Refinery\Factory as Refinery;
 use Psr\Http\Message\RequestInterface;
 
-class QuestionImplementation implements Question
+class QuestionImplementation implements Question, Storable
 {
-    public bool $self_updated = false;
-    public array $updated_answer_forms = [];
+    private bool $self_updated = false;
+    private array $updated_answer_forms = [];
+    private array $deleted_answer_forms = [];
+
+    private array $answer_forms;
 
     /**
      * @param array{string, \ILIAS\Questions\AnswerForm\Properties} $answer_forms
@@ -59,10 +63,18 @@ public function __construct(
         private ?Uuid $original_id = null,
         private ?\DateTimeImmutable $last_update = null,
         private readonly ?\DateTimeImmutable $created = null,
-        private array $answer_forms = [],
+        array $answer_forms = [],
         private ?Taxonomies $taxonomies = null,
         private ?ContentForRecapitulation $content_for_recapitulation = null
     ) {
+        $this->answer_forms = array_reduce(
+            $answer_forms,
+            function (array $c, AnswerFormProperties $v): array {
+                $c[$v->getAnswerFormId()->toString()] = $v;
+                return $c;
+            },
+            []
+        );
     }
 
     public function getId(): ?Uuid
@@ -75,8 +87,9 @@ public function getPageId(): ?int
         return $this->page_id;
     }
 
-    public function withPageId(int $page_id): self
-    {
+    public function withPageId(
+        int $page_id
+    ): self {
         $clone = clone $this;
         $clone->page_id = $page_id;
         $clone->self_updated = true;
@@ -88,8 +101,9 @@ public function getTitle(): string
         return $this->title;
     }
 
-    public function withTitle(string $title): self
-    {
+    public function withTitle(
+        string $title
+    ): self {
         $clone = clone $this;
         $clone->title = $title;
         $clone->self_updated = true;
@@ -101,8 +115,9 @@ public function getAuthor(): string
         return $this->author;
     }
 
-    public function withAuthor(string $author): self
-    {
+    public function withAuthor(
+        string $author
+    ): self {
         $clone = clone $this;
         $clone->author = $author;
         $clone->self_updated = true;
@@ -114,8 +129,9 @@ public function getLifecycle(): Lifecycle
         return $this->lifecycle;
     }
 
-    public function withLifecycle(Lifecycle $lifecycle): self
-    {
+    public function withLifecycle(
+        Lifecycle $lifecycle
+    ): self {
         $clone = clone $this;
         $clone->lifecycle = $lifecycle;
         $clone->self_updated = true;
@@ -127,8 +143,9 @@ public function getRemarks(): string
         return $this->remarks;
     }
 
-    public function withRemarks(string $remarks): self
-    {
+    public function withRemarks(
+        string $remarks
+    ): self {
         $clone = clone $this;
         $clone->remarks = $remarks;
         $clone->self_updated = true;
@@ -140,8 +157,9 @@ public function getOriginalId(): ?Uuid
         return $this->original_id;
     }
 
-    public function withOriginalId(Uuid $original_id): self
-    {
+    public function withOriginalId(
+        Uuid $original_id
+    ): self {
         $clone = clone $this;
         $clone->original_id = $original_id;
         $clone->self_updated = true;
@@ -163,19 +181,35 @@ public function getAnswerForms(): array
         return $this->answer_forms;
     }
 
-    public function getAnswerFormByIdString(string $form_id): ?AnswerFormProperties
-    {
+    public function getAnswerFormByIdString(
+        string $form_id
+    ): ?AnswerFormProperties {
         return $this->answer_forms[$form_id] ?? null;
     }
 
-    public function withAnswerForm(AnswerFormProperties $answer_form): self
-    {
+    public function withAnswerForm(
+        AnswerFormProperties $answer_form
+    ): self {
         $clone = clone $this;
         $clone->answer_forms[$answer_form->getAnswerFormId()->toString()] = $answer_form;
         $clone->updated_answer_forms[] = $answer_form;
         return $clone;
     }
 
+    public function withoutDeletedAnswerForms(
+        array $found_answer_form_ids
+    ): self {
+        $clone = clone $this;
+        foreach (array_keys($this->answer_forms) as $answer_form_id) {
+            if (!in_array($answer_form_id, $found_answer_form_ids)) {
+                $this->deleted_answer_forms = $clone->answer_forms[$answer_form_id];
+                unset($clone->answer_forms[$answer_form_id]);
+            }
+        }
+
+        return $clone;
+    }
+
     /**
      * Checks whether the question is a clone of another question or not
      */
@@ -245,6 +279,12 @@ public function toStorage(
             : $this->addUpdateStatementsToManipulation($manipulate);
     }
 
+    public function toDelete(
+        Manipulate $manipulate
+    ): Manipulate {
+        ;
+    }
+
     private function addInsertStatementsToManipulation(
         Manipulate $manipulate
     ): Manipulate {
@@ -280,6 +320,13 @@ private function addUpdateStatementsToManipulation(
             );
         }
 
+        if ($this->deleted_answer_forms !== []) {
+            $manipulate = $this->addDeleteAnswerFormStatementsToManipulate(
+                $manipulate,
+                $this->deleted_answer_forms
+            );
+        }
+
         return $this->addAnswerFormStatementsToManipulate(
             $manipulate,
             $this->updated_answer_forms
@@ -317,6 +364,19 @@ private function addAnswerFormStatementsToManipulate(
         );
     }
 
+    private function addDeleteAnswerFormStatementsToManipulate(
+        Manipulate $manipulate,
+        array $answer_forms_to_delete
+    ): Manipulate {
+        return array_reduce(
+            $answer_forms_to_delete,
+            fn(Manipulate $c, AnswerFormProperties $v): Manipulate => $v->toDelete(
+                $v->getTypeGenericProperties()->toDelete($c)
+            ),
+            $manipulate
+        );
+    }
+
     private function buildUpdateQuestionStatement(): Update
     {
         $questions_table_definition = CoreTables::Questions;

From b60a1c7e613d8f6c68326491f13c22dd6889f50b Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Tue, 6 Jan 2026 16:39:36 +0100
Subject: [PATCH 093/141] Questions: Some More Clean-Up in Units

---
 .../class.ilObjQuestionsGUI.php               |  28 +-
 .../ILIAS/Questions/Legacy/LocalDIC.php       |   6 +
 .../ILIAS/Questions/src/Units/Category.php    |  31 +-
 .../Questions/src/Units/ConfigurationGUI.php  | 199 +++--
 .../ILIAS/Questions/src/Units/Repository.php  | 842 ++++++++++--------
 components/ILIAS/Questions/src/Units/Unit.php |  24 +-
 .../Units/class.GlobalConfigurationGUI.php    |   6 +-
 .../src/Units/class.LocalConfigurationGUI.php |  56 +-
 .../classes/class.assFormulaQuestionGUI.php   |   7 +-
 .../class.ilLocalUnitConfigurationGUI.php     |   2 +-
 .../classes/class.ilUnitConfigurationGUI.php  |  49 +-
 .../tables/class.ilUnitCategoryTableGUI.php   |  92 +-
 .../classes/tables/class.ilUnitTableGUI.php   |  17 +-
 13 files changed, 820 insertions(+), 539 deletions(-)

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
index 4bfaecc6d77d..ea58fd093f70 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -22,6 +22,7 @@
 use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Units\GlobalConfigurationGUI;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\UploadAnswerOptionsGUI;
+use ILIAS\Questions\Units\Repository as UnitsRepository;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\URI;
 
@@ -33,6 +34,7 @@
 class ilObjQuestionsGUI extends ilObjectGUI
 {
     private Edit $edit_view;
+    private UnitsRepository $units_repository;
 
     private DataFactory $data_factory;
 
@@ -46,7 +48,9 @@ public function __construct(
         $rbacsystem = $DIC['rbacsystem'];
         $this->data_factory = new DataFactory();
 
-        $this->edit_view = LocalDIC::dic()[Edit::class];
+        $local_dic = LocalDIC::dic();
+        $this->units_repository = $local_dic[UnitsRepository::class];
+        $this->edit_view = $local_dic[Edit::class];
 
         $this->type = 'qsts';
 
@@ -83,6 +87,18 @@ public function executeCommand(): void
                 );
                 break;
 
+            case strtolower(GlobalConfigurationGUI::class):
+                $this->tabs_gui->activateTab('units');
+                $this->ctrl->forwardCommand(
+                    new GlobalConfigurationGUI(
+                        $this->units_repository,
+                        $this->lng,
+                        $this->ctrl,
+                        $this->tpl
+                    )
+                );
+                break;
+
             default:
                 if ($cmd === null || $cmd === '' || $cmd === 'view') {
                     $cmd = 'viewQuestions';
@@ -119,20 +135,18 @@ protected function getTabs(): void
                 $this->ctrl->getLinkTargetByClass(self::class, 'viewQuestions')
             );
 
-            $this->tabs_gui->addTarget(
+            $this->tabs_gui->addTab(
                 'units',
+                $this->lng->txt('units'),
                 $this->ctrl->getLinkTargetByClass(GlobalConfigurationGUI::class, ''),
-                '',
-                'globalconfigurationgui'
             );
         }
 
         if ($this->rbac_system->checkAccess('edit_permission', $this->object->getRefId())) {
-            $this->tabs_gui->addTarget(
+            $this->tabs_gui->addTab(
                 'perm_settings',
+                $this->lng->txt('perm_settings'),
                 $this->ctrl->getLinkTargetByClass([self::class, ilPermissionGUI::class], 'perm'),
-                ['perm', 'info', 'owner'],
-                'ilpermissiongui'
             );
         }
     }
diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 4058c8d8616f..ab24b197fa43 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -26,6 +26,7 @@
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Presentation\Layout\Definitions\Factory as DefinitionsFactory;
+use ILIAS\Questions\Units\Repository as UnitsRepository;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\DI\Container as ILIASContainer;
@@ -50,6 +51,11 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic[DataFactory::class] = static fn($c): DataFactory => new DataFactory();
         $dic[UuidFactory::class] = static fn($c): UuidFactory => new UuidFactory();
 
+        $dic[UnitsRepository::class] = static fn($c): UnitsRepository => new UnitsRepository(
+            $DIC['lng'],
+            $DIC['ilDB']
+        );
+
         $dic[AnswerFormFactory::class] = static fn($c): AnswerFormFactory
             => new AnswerFormFactory(
                 $c[UuidFactory::class],
diff --git a/components/ILIAS/Questions/src/Units/Category.php b/components/ILIAS/Questions/src/Units/Category.php
index 64f98755ac7c..30c808f621df 100755
--- a/components/ILIAS/Questions/src/Units/Category.php
+++ b/components/ILIAS/Questions/src/Units/Category.php
@@ -20,21 +20,25 @@
 
 namespace ILIAS\Questions\Units;
 
+use ILIAS\Language\Language;
+
 class Category
 {
     private int $id = 0;
     private string $category = '';
     private int $question_fi = 0;
 
-    public function initFormArray(array $data): void
-    {
+    public function initFormArray(
+        array $data
+    ): void {
         $this->id = (int) $data['category_id'];
         $this->category = $data['category'];
         $this->question_fi = (int) $data['question_fi'];
     }
 
-    public function setId(int $id): void
-    {
+    public function setId(
+        int $id
+    ): void {
         $this->id = $id;
     }
 
@@ -43,8 +47,9 @@ public function getId(): int
         return $this->id;
     }
 
-    public function setCategory(string $category): void
-    {
+    public function setCategory(
+        string $category
+    ): void {
         $this->category = $category;
     }
 
@@ -53,8 +58,9 @@ public function getCategory(): string
         return $this->category;
     }
 
-    public function setQuestionFi(int $question_fi): void
-    {
+    public function setQuestionFi(
+        int $question_fi
+    ): void {
         $this->question_fi = $question_fi;
     }
 
@@ -63,12 +69,9 @@ public function getQuestionFi(): int
         return $this->question_fi;
     }
 
-    public function getDisplayString(): string
-    {
-        global $DIC;
-
-        $lng = $DIC->language();
-
+    public function getDisplayString(
+        Language $lng
+    ): string {
         $category = $this->getCategory();
         if (strcmp('-qpl_qst_formulaquestion_' . $category . '-', $lng->txt('qpl_qst_formulaquestion_' . $category)) !== 0) {
             $category = $lng->txt('qpl_qst_formulaquestion_' . $category);
diff --git a/components/ILIAS/Questions/src/Units/ConfigurationGUI.php b/components/ILIAS/Questions/src/Units/ConfigurationGUI.php
index dab88a5933cd..ddd83bce2b5a 100755
--- a/components/ILIAS/Questions/src/Units/ConfigurationGUI.php
+++ b/components/ILIAS/Questions/src/Units/ConfigurationGUI.php
@@ -22,24 +22,20 @@
 
 use ILIAS\TestQuestionPool\QuestionPoolDIC;
 use ILIAS\TestQuestionPool\RequestDataCollector;
+use ILIAS\Language\Language;
 
 abstract class ConfigurationGUI
 {
     protected RequestDataCollector $request;
     protected ?\ilPropertyFormGUI $unit_cat_form = null;
     protected ?\ilPropertyFormGUI $unit_form = null;
-    protected \ilGlobalTemplateInterface $tpl;
-    protected \ilLanguage $lng;
-    protected \ilCtrlInterface $ctrl;
 
     public function __construct(
-        protected Repository $repository
+        protected readonly Repository $repository,
+        protected readonly Language $lng,
+        protected readonly \ilCtrl $ctrl,
+        protected readonly \ilGlobalTemplateInterface $tpl
     ) {
-        global $DIC;
-        $this->lng = $DIC->language();
-        $this->ctrl = $DIC->ctrl();
-        $this->tpl = $DIC->ui()->mainTemplate();
-
         $local_dic = QuestionPoolDIC::dic();
         $this->request = $local_dic['request_data_collector'];
 
@@ -54,12 +50,16 @@ abstract public function isCRUDContext(): bool;
 
     abstract public function getUniqueId(): string;
 
-    abstract protected function showUnitCategories(array $categories): void;
+    abstract protected function showUnitCategories(
+        array $categories
+    ): void;
 
-    protected function getCategoryById(int $id, bool $for_CRUD = true): Category
-    {
+    protected function getCategoryById(
+        int $id,
+        bool $for_CRUD = true
+    ): Category {
         $category = $this->repository->getUnitCategoryById($id);
-        if ($for_CRUD && $category->getQuestionFi() !== $this->repository->getConsumerId()) {
+        if ($for_CRUD && $category->getQuestionFi() !== $this->request->getQuestionId()) {
             $this->tpl->setOnScreenMessage('failure', $this->lng->txt('change_adm_categories_not_allowed'), true);
             $this->ctrl->redirect($this, $this->getDefaultCommand());
         }
@@ -71,8 +71,9 @@ protected function handleSubtabs(): void
     {
     }
 
-    protected function checkPermissions(string $cmd): void
-    {
+    protected function checkPermissions(
+        string $cmd
+    ): void {
     }
 
     public function executeCommand(): void
@@ -102,8 +103,9 @@ protected function confirmDeleteUnit(): void
         $this->confirmDeleteUnits([$this->request->int('unit_id')]);
     }
 
-    protected function confirmDeleteUnits(?array $unit_ids = null): void
-    {
+    protected function confirmDeleteUnits(
+        ?array $unit_ids = null
+    ): void {
         if (!$this->isCRUDContext()) {
             $this->showUnitsOfCategory();
             return;
@@ -116,7 +118,7 @@ protected function confirmDeleteUnits(?array $unit_ids = null): void
         }
 
         $this->ctrl->setParameter($this, 'category_id', $this->request->int('category_id'));
-        $confirmation = new ilConfirmationGUI();
+        $confirmation = new \ilConfirmationGUI();
         $confirmation->setFormAction($this->ctrl->getFormAction($this, 'deleteUnits'));
         $confirmation->setConfirm($this->lng->txt('confirm'), 'deleteUnits');
         $confirmation->setCancel($this->lng->txt('cancel'), 'showUnitsOfCategory');
@@ -130,14 +132,18 @@ protected function confirmDeleteUnits(?array $unit_ids = null): void
                     continue;
                 }
 
-                if ($check_result = $this->repository->checkDeleteUnit($unit->getId())) {
-                    $errors[] = $unit->getDisplayString() . ' - ' . $check_result;
+                if (($check_result = $this->repository->checkDeleteUnit($unit->getId()))) {
+                    $errors[] = $unit->getDisplayString($this->lng) . ' - ' . $check_result;
                     continue;
                 }
 
-                $confirmation->addItem('unit_ids[]', (string) $unit->getId(), $unit->getDisplayString());
+                $confirmation->addItem(
+                    'unit_ids[]',
+                    (string) $unit->getId(),
+                    $unit->getDisplayString($this->lng)
+                );
                 ++$num_to_confirm;
-            } catch (ilException $e) {
+            } catch (\ilException $e) {
                 continue;
             }
         }
@@ -198,12 +204,12 @@ public function deleteUnits(): void
 
                 $check_result = $this->repository->deleteUnit($unit->getId());
                 if (!is_null($check_result)) {
-                    $errors[] = $unit->getDisplayString() . ' - ' . $check_result;
+                    $errors[] = $unit->getDisplayString($this->lng) . ' - ' . $check_result;
                     continue;
                 }
 
                 ++$num_deleted;
-            } catch (ilException $e) {
+            } catch (\ilException $e) {
                 continue;
             }
         }
@@ -253,8 +259,11 @@ protected function saveOrder(): void
         $sequences = $this->request->raw('sequence');
         foreach ($sequences as $id => $sequence) {
             $sorting_value = str_replace(',', '.', $sequence);
-            $sorting_value = (int) $sorting_value * 100;
-            $this->repository->saveUnitOrder((int) $id, $sorting_value);
+            $this->repository->saveUnitOrder(
+                $this->request->getQuestionId(),
+                (int) $id,
+                (int) $sorting_value * 100
+            );
         }
 
         $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
@@ -282,7 +291,10 @@ protected function saveUnit(): void
             $unit->setFactor((float) $this->unit_form->getInput('factor'));
             $unit->setBaseUnit((int) $this->unit_form->getInput('base_unit') !== $unit->getId() ? (int) $this->unit_form->getInput('base_unit') : 0);
             $unit->setCategory($category->getId());
-            $this->repository->saveUnit($unit);
+            $this->repository->saveUnit(
+                $this->request->getQuestionId(),
+                $unit
+            );
 
             $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
             $this->showUnitsOfCategory();
@@ -324,17 +336,24 @@ protected function addUnit(): void
         $category = $this->getCategoryById($this->request->int('category_id'));
 
         $this->initUnitForm($category);
+        $question_id = $this->request->getQuestionId();
         if ($this->unit_form->checkInput()) {
-            $unit = new assFormulaQuestionUnit();
+            $unit = new Unit();
             $unit->setUnit($this->unit_form->getInput('unit_title'));
             $unit->setCategory($category->getId());
 
-            $this->repository->createNewUnit($unit);
+            $this->repository->createNewUnit(
+                $question_id,
+                $unit
+            );
 
             $unit->setBaseUnit((int) $this->unit_form->getInput('base_unit'));
             $unit->setFactor((float) $this->unit_form->getInput('factor'));
 
-            $this->repository->saveUnit($unit);
+            $this->repository->saveUnit(
+                $question_id,
+                $unit
+            );
 
             $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
             $this->showUnitsOfCategory();
@@ -365,54 +384,57 @@ protected function showUnitCreationForm(): void
     }
 
     protected function initUnitForm(
-        ?assFormulaQuestionUnitCategory $category = null,
-        ?assFormulaQuestionUnit $unit = null
-    ): ilPropertyFormGUI {
-        if ($this->unit_form instanceof ilPropertyFormGUI) {
+        ?Category $category = null,
+        ?Unit $unit = null
+    ): \ilPropertyFormGUI {
+        if ($this->unit_form instanceof \ilPropertyFormGUI) {
             return $this->unit_form;
         }
 
         $unit_in_use = false;
-        if ($unit instanceof assFormulaQuestionUnit && $this->repository->isUnitInUse($unit->getId())) {
+        if ($unit instanceof Unit && $this->repository->isUnitInUse($unit->getId())) {
             $unit_in_use = true;
         }
 
-        $this->unit_form = new ilPropertyFormGUI();
+        $this->unit_form = new \ilPropertyFormGUI();
 
-        $title = new ilTextInputGUI($this->lng->txt('unit'), 'unit_title');
+        $title = new \ilTextInputGUI($this->lng->txt('unit'), 'unit_title');
         $title->setDisabled($unit_in_use);
         $title->setRequired(true);
         $this->unit_form->addItem($title);
 
-        $baseunit = new ilSelectInputGUI($this->lng->txt('baseunit'), 'base_unit');
-        $items = $this->repository->getCategorizedUnits();
+        $baseunit = new \ilSelectInputGUI($this->lng->txt('baseunit'), 'base_unit');
+        $items = $this->repository->getCategorizedUnits(
+            $this->request->getQuestionId()
+        );
         $options = [];
         $category_name = '';
         $new_category = false;
         foreach ($items as $item) {
             if (
-                $unit instanceof assFormulaQuestionUnit &&
+                $unit instanceof Unit &&
                 $unit->getId() === $item->getId()
             ) {
                 continue;
             }
 
-            if ($item instanceof assFormulaQuestionUnitCategory) {
-                if ($category_name !== $item->getDisplayString()) {
+            if ($item instanceof Category) {
+                if ($category_name !== $item->getDisplayString($this->lng)) {
                     $new_category = true;
-                    $category_name = $item->getDisplayString();
+                    $category_name = $item->getDisplayString($this->lng);
                 }
                 continue;
             }
 
-            $options[$item->getId()] = $item->getDisplayString() . ($new_category ? ' (' . $category_name . ')' : '');
+            $options[$item->getId()] = $item->getDisplayString($this->lng)
+                . ($new_category ? ' (' . $category_name . ')' : '');
             $new_category = false;
         }
         $baseunit->setDisabled($unit_in_use);
         $baseunit->setOptions([0 => $this->lng->txt('no_selection')] + $options);
         $this->unit_form->addItem($baseunit);
 
-        $factor = new ilNumberInputGUI($this->lng->txt('factor'), 'factor');
+        $factor = new \ilNumberInputGUI($this->lng->txt('factor'), 'factor');
         $factor->setRequired(true);
         $factor->setSize(3);
         $factor->setMinValue(0);
@@ -435,8 +457,8 @@ protected function initUnitForm(
             }
             $this->unit_form->setTitle(sprintf(
                 $this->lng->txt('un_sel_cat_sel_unit'),
-                $category->getDisplayString(),
-                $unit->getDisplayString()
+                $category->getDisplayString($this->lng),
+                $unit->getDisplayString($this->lng)
             ));
         }
         $this->ctrl->clearParameterByClass(get_class($this), 'category_id');
@@ -469,11 +491,10 @@ protected function showUnitsOfCategory(): void
             );
             $this->ctrl->clearParameterByClass(get_class($this), 'category_id');
         }
-        $table = new ilUnitTableGUI($this, 'showUnitsOfCategory', $category);
+        $table = new \ilUnitTableGUI($this, 'showUnitsOfCategory', $category);
         $units = $this->repository->loadUnitsForCategory($category->getId());
         $data = [];
         foreach ($units as $unit) {
-            /** @var assFormulaQuestionUnit $unit */
             $data[] = [
                 'unit_id' => $unit->getId(),
                 'unit' => $unit->getUnit(),
@@ -491,17 +512,18 @@ protected function showUnitsOfCategory(): void
     protected function showGlobalUnitCategories(): void
     {
         $categories = array_filter(
-            $this->repository->getAllUnitCategories(),
-            static function (assFormulaQuestionUnitCategory $category): bool {
+            $this->repository->getAllUnitCategories(
+                $this->request->getQuestionId()
+            ),
+            static function (Category $category): bool {
                 return !$category->getQuestionFi() ? true : false;
             }
         );
         $data = [];
         foreach ($categories as $category) {
-            /** @var assFormulaQuestionUnitCategory $category */
             $data[] = [
                 'category_id' => $category->getId(),
-                'category' => $category->getDisplayString()
+                'category' => $category->getDisplayString($this->lng)
             ];
         }
 
@@ -521,10 +543,11 @@ protected function confirmDeleteCategory(): void
     /**
      * @param int[]|null $category_ids
      * @return void
-     * @throws ilCtrlException
+     * @throws \ilCtrlException
      */
-    protected function confirmDeleteCategories(?array $category_ids = null): void
-    {
+    protected function confirmDeleteCategories(
+        ?array $category_ids = null
+    ): void {
         if (!$this->isCRUDContext()) {
             $this->{$this->getDefaultCommand()}();
             return;
@@ -536,7 +559,7 @@ protected function confirmDeleteCategories(?array $category_ids = null): void
             return;
         }
 
-        $confirmation = new ilConfirmationGUI();
+        $confirmation = new \ilConfirmationGUI();
         $confirmation->setFormAction($this->ctrl->getFormAction($this, 'deleteCategories'));
         $confirmation->setConfirm($this->lng->txt('confirm'), 'deleteCategories');
         $confirmation->setCancel($this->lng->txt('cancel'), $this->getUnitCategoryOverviewCommand());
@@ -546,22 +569,31 @@ protected function confirmDeleteCategories(?array $category_ids = null): void
         foreach ($category_ids as $category_id) {
             try {
                 $category = $this->repository->getUnitCategoryById($category_id);
-            } catch (ilException $e) {
+            } catch (\ilException $e) {
                 continue;
             }
 
-            if (!$this->repository->isCRUDAllowed($category_id)) {
-                $errors[] = $category->getDisplayString() . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
+            if (!$this->repository->isCRUDAllowed(
+                $this->request->getQuestionId(),
+                $category_id
+            )) {
+                $errors[] = $category->getDisplayString($this->lng)
+                    . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
                 continue;
             }
 
             $possible_error = $this->repository->checkDeleteCategory($category_id);
             if (is_string($possible_error) && $possible_error !== '') {
-                $errors[] = $category->getDisplayString() . ' - ' . $possible_error;
+                $errors[] = $category->getDisplayString($this->lng)
+                    . ' - ' . $possible_error;
                 continue;
             }
 
-            $confirmation->addItem('category_ids[]', (string) $category->getId(), $category->getDisplayString());
+            $confirmation->addItem(
+                'category_ids[]',
+                (string) $category->getId(),
+                $category->getDisplayString($this->lng)
+            );
             ++$num_to_confirm;
         }
 
@@ -615,18 +647,23 @@ protected function deleteCategories(): void
         foreach ($category_ids as $category_id) {
             try {
                 $category = $this->repository->getUnitCategoryById($category_id);
-            } catch (ilException $e) {
+            } catch (\ilException $e) {
                 continue;
             }
 
-            if (!$this->repository->isCRUDAllowed($category_id)) {
-                $errors[] = $category->getDisplayString() . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
+            if (!$this->repository->isCRUDAllowed(
+                $this->request->getQuestionId(),
+                $category_id
+            )) {
+                $errors[] = $category->getDisplayString($this->lng)
+                    . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
                 continue;
             }
 
             $possible_error = $this->repository->deleteCategory($category_id);
             if (is_string($possible_error) && $possible_error !== '') {
-                $errors[] = $category->getDisplayString() . ' - ' . $possible_error;
+                $errors[] = $category->getDisplayString($this->lng)
+                    . ' - ' . $possible_error;
                 continue;
             }
 
@@ -663,15 +700,16 @@ protected function deleteCategories(): void
         $this->{$this->getUnitCategoryOverviewCommand()}();
     }
 
-    protected function initUnitCategoryForm(?assFormulaQuestionUnitCategory $cat = null): ilPropertyFormGUI
-    {
-        if ($this->unit_cat_form instanceof ilPropertyFormGUI) {
+    protected function initUnitCategoryForm(
+        ?Category $cat = null
+    ): \ilPropertyFormGUI {
+        if ($this->unit_cat_form instanceof \ilPropertyFormGUI) {
             return $this->unit_cat_form;
         }
 
-        $this->unit_cat_form = new ilPropertyFormGUI();
+        $this->unit_cat_form = new \ilPropertyFormGUI();
 
-        $title = new ilTextInputGUI($this->lng->txt('title'), 'category_name');
+        $title = new \ilTextInputGUI($this->lng->txt('title'), 'category_name');
         $title->setRequired(true);
         $this->unit_cat_form->addItem($title);
 
@@ -683,10 +721,18 @@ protected function initUnitCategoryForm(?assFormulaQuestionUnitCategory $cat = n
             $this->ctrl->setParameter($this, 'category_id', $cat->getId());
             $this->unit_cat_form->addCommandButton('saveCategory', $this->lng->txt('save'));
             $this->unit_cat_form->setFormAction($this->ctrl->getFormAction($this, 'saveCategory'));
-            $this->unit_cat_form->setTitle(sprintf($this->lng->txt('selected_category'), $cat->getDisplayString()));
+            $this->unit_cat_form->setTitle(
+                sprintf(
+                    $this->lng->txt('selected_category'),
+                    $cat->getDisplayString($this->lng)
+                )
+            );
         }
 
-        $this->unit_cat_form->addCommandButton($this->getUnitCategoryOverviewCommand(), $this->lng->txt('cancel'));
+        $this->unit_cat_form->addCommandButton(
+            $this->getUnitCategoryOverviewCommand(),
+            $this->lng->txt('cancel')
+        );
         return $this->unit_cat_form;
     }
 
@@ -700,14 +746,15 @@ protected function addCategory(): void
         $this->initUnitCategoryForm();
         if ($this->unit_cat_form->checkInput()) {
             try {
-                $category = new assFormulaQuestionUnitCategory();
+                $category = new Category();
                 $category->setCategory($this->unit_cat_form->getInput('category_name'));
+                $category->setQuestionFi($this->request->getQuestionId());
                 $this->repository->saveNewUnitCategory($category);
                 $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
 
                 $this->{$this->getUnitCategoryOverviewCommand()}();
                 return;
-            } catch (ilException $e) {
+            } catch (\ilException $e) {
                 $this->unit_cat_form->getItemByPostVar('category_name')->setAlert($this->lng->txt($e->getMessage()));
                 $this->tpl->setOnScreenMessage('failure', $this->lng->txt('form_input_not_valid'));
             }
@@ -748,7 +795,7 @@ protected function saveCategory(): void
 
                 $this->{$this->getUnitCategoryOverviewCommand()}();
                 return;
-            } catch (ilException $e) {
+            } catch (\ilException $e) {
                 $this->unit_cat_form->getItemByPostVar('category_name')->setAlert($this->lng->txt($e->getMessage()));
                 $this->tpl->setOnScreenMessage('failure', $this->lng->txt('form_input_not_valid'));
             }
diff --git a/components/ILIAS/Questions/src/Units/Repository.php b/components/ILIAS/Questions/src/Units/Repository.php
index 20e9d391eb71..b24533463e32 100755
--- a/components/ILIAS/Questions/src/Units/Repository.php
+++ b/components/ILIAS/Questions/src/Units/Repository.php
@@ -20,53 +20,48 @@
 
 namespace ILIAS\Questions\Units;
 
+use ILIAS\Language\Language;
+
 class Repository
 {
-    protected int $consumer_id = 0;
-    protected \ilLanguage $lng;
-    protected \ilDBInterface $db;
-    /** @var assFormulaQuestionUnit[] */
-    private array $units = [];
-    /** @var assFormulaQuestionUnit[]|assFormulaQuestionUnitCategory[]  */
-    private array $categorizedUnits = [];
-
-    public function __construct(int $consumer_id)
-    {
-        global $DIC;
+    private const string UNIT_TABLE = 'il_qpl_qst_fq_unit';
+    private const string CATEGORY_TABLE = 'il_qpl_qst_fq_ucat';
+    private const string VARIABLES_TABLE = 'il_qpl_qst_fq_var';
+    private const string RESULTS_TABLE = 'il_qpl_qst_fq_res';
+    private const string RESULT_UNITS_TABLE = 'il_qpl_qst_fq_res_unit';
 
-        $lng = $DIC->language();
-
-        $this->db = $DIC->database();
-        $this->consumer_id = $consumer_id;
-        $this->lng = $lng;
-    }
-
-    public function setConsumerId(int $consumer_id): void
-    {
-        $this->consumer_id = $consumer_id;
-    }
+    /** @var list<\ILIAS\Questions\Units\Unit> $units */
+    private array $units = [];
+    /** @var list<\ILIAS\Questions\Units\Unit|\ILIAS\Questions\Units\Category> $categorized_units */
+    private array $categorized_units = [];
 
-    public function getConsumerId(): int
-    {
-        return $this->consumer_id;
+    public function __construct(
+        private readonly Language $lng,
+        private readonly \ilDBInterface $db
+    ) {
     }
 
-    public function isCRUDAllowed(int $category_id): bool
-    {
+    public function isCRUDAllowed(
+        int $question_id,
+        int $category_id
+    ): bool {
         $res = $this->db->queryF(
-            'SELECT * FROM il_qpl_qst_fq_ucat WHERE category_id = %s',
-            ['integer'],
+            'SELECT * FROM ' . self::CATEGORY_TABLE . ' WHERE category_id = %s',
+            [\ilDBConstants::T_INTEGER],
             [$category_id]
         );
         $row = $this->db->fetchAssoc($res);
-        return isset($row['question_fi']) && (int) $row['question_fi'] === $this->getConsumerId();
+        return isset($row['question_fi']) && (int) $row['question_fi'] === $question_id;
     }
 
-    public function copyCategory(int $category_id, int $question_fi, ?string $category_name = null): int
-    {
+    public function copyCategory(
+        int $question_fi,
+        int $category_id,
+        ?string $category_name = null
+    ): int {
         $res = $this->db->queryF(
-            'SELECT category FROM il_qpl_qst_fq_ucat WHERE category_id = %s',
-            ['integer'],
+            'SELECT category FROM ' . self::CATEGORY_TABLE . ' WHERE category_id = %s',
+            [\ilDBConstants::T_INTEGER],
             [$category_id]
         );
         $row = $this->db->fetchAssoc($res);
@@ -75,44 +70,47 @@ public function copyCategory(int $category_id, int $question_fi, ?string $catego
             $category_name = $row['category'];
         }
 
-        $next_id = $this->db->nextId('il_qpl_qst_fq_ucat');
+        $next_id = $this->db->nextId(self::CATEGORY_TABLE);
         $this->db->insert(
-            'il_qpl_qst_fq_ucat',
+            self::CATEGORY_TABLE,
             [
-                'category_id' => ['integer', $next_id],
-                'category' => ['text', $category_name],
-                'question_fi' => ['integer', (int) $question_fi]
+                'category_id' => [\ilDBConstants::T_INTEGER, $next_id],
+                'category' => [\ilDBConstants::T_TEXT, $category_name],
+                'question_fi' => [\ilDBConstants::T_INTEGER, (int) $question_fi]
             ]
         );
 
         return $next_id;
     }
 
-    public function copyUnitsByCategories(int $from_category_id, int $to_category_id, int $qustion_fi): void
-    {
+    public function copyUnitsByCategories(
+        int $question_id,
+        int $from_category_id,
+        int $to_category_id,
+    ): void {
         $res = $this->db->queryF(
-            'SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
-            ['integer'],
+            'SELECT * FROM ' . self::UNIT_TABLE . ' WHERE category_fi = %s',
+            [\ilDBConstants::T_INTEGER],
             [$from_category_id]
         );
         $i = 0;
         $units = [];
-        while ($row = $this->db->fetchAssoc($res)) {
-            $next_id = $this->db->nextId('il_qpl_qst_fq_unit');
+        while (($row = $this->db->fetchAssoc($res)) !== null) {
+            $next_id = $this->db->nextId(self::UNIT_TABLE);
 
             $units[$i]['old_unit_id'] = $row['unit_id'];
             $units[$i]['new_unit_id'] = $next_id;
 
             $this->db->insert(
-                'il_qpl_qst_fq_unit',
+                self::UNIT_TABLE,
                 [
-                    'unit_id' => ['integer', $next_id],
-                    'unit' => ['text', $row['unit']],
-                    'factor' => ['float', $row['factor']],
-                    'baseunit_fi' => ['integer', (int) $row['baseunit_fi']],
-                    'category_fi' => ['integer', (int) $to_category_id],
-                    'sequence' => ['integer', (int) $row['sequence']],
-                    'question_fi' => ['integer', (int) $qustion_fi]
+                    'unit_id' => [\ilDBConstants::T_INTEGER, $next_id],
+                    'unit' => [\ilDBConstants::T_TEXT, $row['unit']],
+                    'factor' => [\ilDBConstants::T_FLOAT, $row['factor']],
+                    'baseunit_fi' => [\ilDBConstants::T_INTEGER, (int) $row['baseunit_fi']],
+                    'category_fi' => [\ilDBConstants::T_INTEGER, (int) $to_category_id],
+                    'sequence' => [\ilDBConstants::T_INTEGER, (int) $row['sequence']],
+                    'question_fi' => [\ilDBConstants::T_INTEGER, (int) $question_id]
                 ]
             );
             $i++;
@@ -121,117 +119,142 @@ public function copyUnitsByCategories(int $from_category_id, int $to_category_id
         foreach ($units as $unit) {
             //update unit : baseunit_fi
             $this->db->update(
-                'il_qpl_qst_fq_unit',
-                ['baseunit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                self::UNIT_TABLE,
+                [
+                    'baseunit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['new_unit_id']]
+                ],
                 [
-                    'baseunit_fi' => ['integer', $unit['old_unit_id']],
-                    'category_fi' => ['integer', $to_category_id]
+                    'baseunit_fi' => [\ilDBConstants::T_INTEGER, $unit['old_unit_id']],
+                    'category_fi' => [\ilDBConstants::T_INTEGER, $to_category_id]
                 ]
             );
 
             //update var : unit_fi
             $this->db->update(
-                'il_qpl_qst_fq_var',
-                ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                self::VARIABLES_TABLE,
                 [
-                    'unit_fi' => ['integer', $unit['old_unit_id']],
-                    'question_fi' => ['integer', $qustion_fi]
+                    'unit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['new_unit_id']]
+                ],
+                [
+                    'unit_fi' => [\ilDBConstants::T_INTEGER, $unit['old_unit_id']],
+                    'question_fi' => [\ilDBConstants::T_INTEGER, $question_id]
                 ]
             );
 
             //update res : unit_fi
             $this->db->update(
-                'il_qpl_qst_fq_res',
-                ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                self::RESULTS_TABLE,
+                [
+                    'unit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['new_unit_id']]
+                ],
                 [
-                    'unit_fi' => ['integer', $unit['old_unit_id']],
-                    'question_fi' => ['integer', $qustion_fi]
+                    'unit_fi' => [\ilDBConstants::T_INTEGER, $unit['old_unit_id']],
+                    'question_fi' => [\ilDBConstants::T_INTEGER, $question_id]
                 ]
             );
 
             //update res_unit : unit_fi
             $this->db->update(
-                'il_qpl_qst_fq_res_unit',
-                ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                self::RESULT_UNITS_TABLE,
                 [
-                    'unit_fi' => ['integer', $unit['old_unit_id']],
-                    'question_fi' => ['integer', $qustion_fi]
+                    'unit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['new_unit_id']]
+                ],
+                [
+                    'unit_fi' => [\ilDBConstants::T_INTEGER, $unit['old_unit_id']],
+                    'question_fi' => [\ilDBConstants::T_INTEGER, $question_id]
                 ]
             );
         }
     }
 
-    public function getCategoryUnitCount(int $id): int
-    {
-        $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s",
-            ['integer'],
-            [$id]
+    public function getCategoryUnitCount(
+        int $id
+    ): int {
+        $row = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT COUNT(category_id) FROM ' . self::UNIT_TABLE . ' WHERE category_fi = %s',
+                [\ilDBConstants::T_INTEGER],
+                [$id]
+            )
         );
 
-        return $this->db->numRows($result);
+        return $row->cnt;
     }
 
-    public function isUnitInUse(int $id): bool
-    {
-        $result_1 = $this->db->queryF(
-            "SELECT unit_fi FROM il_qpl_qst_fq_res_unit WHERE unit_fi = %s",
-            ['integer'],
-            [$id]
+    public function isUnitInUse(
+        int $id
+    ): bool {
+        $use_in_result_units = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT COUNT(result_unit_id) cnt FROM ' . self::RESULT_UNITS_TABLE . ' WHERE unit_fi = %s',
+                [\ilDBConstants::T_INTEGER],
+                [$id]
+            )
         );
 
-        $result_2 = $this->db->queryF(
-            "SELECT unit_fi FROM il_qpl_qst_fq_var WHERE unit_fi = %s",
-            ['integer'],
-            [$id]
-        );
-        $result_3 = $this->db->queryF(
-            "SELECT unit_fi FROM il_qpl_qst_fq_res WHERE unit_fi = %s",
-            ['integer'],
-            [$id]
+        if ($use_in_result_units->cnt > 0) {
+            return true;
+        }
+
+        $use_in_vars = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT COUNT(variable_id) cnt FROM ' . self::VARIABLES_TABLE . ' WHERE unit_fi = %s',
+                [\ilDBConstants::T_INTEGER],
+                [$id]
+            )
         );
+        if ($use_in_vars->cnt > 0) {
+            return true;
+        }
 
-        $cnt_1 = $this->db->numRows($result_1);
-        $cnt_2 = $this->db->numRows($result_2);
-        $cnt_3 = $this->db->numRows($result_3);
+        $use_in_results = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT COUNT(result_id) cnt FROM ' . self::RESULTS_TABLE . ' WHERE unit_fi = %s',
+                [\ilDBConstants::T_INTEGER],
+                [$id]
+            )
+        );
+        if ($use_in_results->cnt > 0) {
+            return true;
+        }
 
-        return $cnt_1 > 0 || $cnt_2 > 0 || $cnt_3 > 0;
+        return false;
     }
 
-    public function checkDeleteCategory(int $id): ?string
-    {
+    public function checkDeleteCategory(
+        int $id
+    ): ?string {
         $res = $this->db->queryF(
-            'SELECT unit_id FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
-            ['integer'],
+            'SELECT unit_id FROM ' . self::UNIT_TABLE . ' WHERE category_fi = %s',
+            [\ilDBConstants::T_INTEGER],
             [$id]
         );
 
-        if ($this->db->numRows($res)) {
-            while ($row = $this->db->fetchAssoc($res)) {
-                $unit_res = $this->checkDeleteUnit((int) $row['unit_id'], $id);
-                if (!is_null($unit_res)) {
-                    return $unit_res;
-                }
+        while ($row = $this->db->fetchAssoc($res)) {
+            $unit_res = $this->checkDeleteUnit((int) $row['unit_id'], $id);
+            if ($unit_res !== null) {
+                return $unit_res;
             }
         }
 
         return null;
     }
 
-    public function deleteUnit(int $id): ?string
-    {
+    public function deleteUnit(
+        int $id
+    ): ?string {
         $res = $this->checkDeleteUnit($id);
-        if (!is_null($res)) {
+        if ($res !== null) {
             return $res;
         }
 
-        $affectedRows = $this->db->manipulateF(
-            "DELETE FROM il_qpl_qst_fq_unit WHERE unit_id = %s",
-            ['integer'],
+        $affected_rows = $this->db->manipulateF(
+            'DELETE FROM ' . self::UNIT_TABLE . ' WHERE unit_id = %s',
+            [\ilDBConstants::T_INTEGER],
             [$id]
         );
 
-        if ($affectedRows > 0) {
+        if ($affected_rows > 0) {
             $this->clearUnits();
         }
 
@@ -241,64 +264,59 @@ public function deleteUnit(int $id): ?string
     protected function loadUnits(): void
     {
         $result = $this->db->query(
-            "
-			SELECT units.*, il_qpl_qst_fq_ucat.category, baseunits.unit baseunit_title
-			FROM il_qpl_qst_fq_unit units
-			INNER JOIN il_qpl_qst_fq_ucat ON il_qpl_qst_fq_ucat.category_id = units.category_fi
-			LEFT JOIN il_qpl_qst_fq_unit baseunits ON baseunits.unit_id = units.baseunit_fi
-			ORDER BY il_qpl_qst_fq_ucat.category, units.sequence"
+            'SELECT units.*, ' . self::CATEGORY_TABLE . '.category, baseunits.unit baseunit_title' . PHP_EOL
+            . 'FROM ' . self::UNIT_TABLE . ' units' . PHP_EOL
+            . 'INNER JOIN ' . self::CATEGORY_TABLE . ' ON ' . self::CATEGORY_TABLE . '.category_id = units.category_fi' . PHP_EOL
+            . 'LEFT JOIN ' . self::UNIT_TABLE . ' baseunits ON baseunits.unit_id = units.baseunit_fi' . PHP_EOL
+            . 'ORDER BY ' . self::CATEGORY_TABLE . '.category, units.sequence'
         );
 
-        if ($this->db->numRows($result)) {
-            while ($row = $this->db->fetchAssoc($result)) {
-                $unit = new assFormulaQuestionUnit();
-                $unit->initFormArray($row);
-                $this->addUnit($unit);
-            }
+        while ($row = $this->db->fetchAssoc($result)) {
+            $unit = new Unit();
+            $unit->initFormArray($row);
+            $this->addUnit($unit);
         }
     }
 
     /**
-     * @return assFormulaQuestionUnit[]|assFormulaQuestionUnitCategory[]
+     * @return list<\ILIAS\Questions\Units\Unit|\ILIAS\Questions\Units\Category>
      */
-    public function getCategorizedUnits(): array
-    {
-        if (count($this->categorizedUnits) === 0) {
+    public function getCategorizedUnits(
+        int $question_id
+    ): array {
+        if (count($this->categorized_units) === 0) {
             $result = $this->db->queryF(
-                "
-				SELECT	units.*, il_qpl_qst_fq_ucat.category, il_qpl_qst_fq_ucat.question_fi, baseunits.unit baseunit_title
-				FROM	il_qpl_qst_fq_unit units
-				INNER JOIN il_qpl_qst_fq_ucat ON il_qpl_qst_fq_ucat.category_id = units.category_fi
-				LEFT JOIN il_qpl_qst_fq_unit baseunits ON baseunits.unit_id = units.baseunit_fi
-				WHERE	units.question_fi = %s
-				ORDER BY il_qpl_qst_fq_ucat.category, units.sequence",
-                ['integer'],
-                [$this->getConsumerId()]
+                'SELECT	units.*, ' . self::CATEGORY_TABLE . '.category, ' . self::CATEGORY_TABLE . '.question_fi, baseunits.unit baseunit_title' . PHP_EOL
+                . 'FROM	' . self::UNIT_TABLE . ' units' . PHP_EOL
+                . 'INNER JOIN ' . self::CATEGORY_TABLE . ' ON ' . self::CATEGORY_TABLE . '.category_id = units.category_fi' . PHP_EOL
+                . 'LEFT JOIN ' . self::UNIT_TABLE . ' baseunits ON baseunits.unit_id = units.baseunit_fi' . PHP_EOL
+                . 'WHERE	units.question_fi = %s' . PHP_EOL
+                . 'ORDER BY ' . self::CATEGORY_TABLE . '.category, units.sequence' . PHP_EOL,
+                [\ilDBConstants::T_INTEGER],
+                [$question_id]
             );
 
-            if ($this->db->numRows($result) > 0) {
-                $category = 0;
-                while ($row = $this->db->fetchAssoc($result)) {
-                    $unit = new assFormulaQuestionUnit();
-                    $unit->initFormArray($row);
-
-                    if ($category !== $unit->getCategory()) {
-                        $cat = new assFormulaQuestionUnitCategory();
-                        $cat->initFormArray([
-                            'category_id' => (int) $row['category_fi'],
-                            'category' => $row['category'],
-                            'question_fi' => (int) $row['question_fi'],
-                        ]);
-                        $this->categorizedUnits[] = $cat;
-                        $category = $unit->getCategory();
-                    }
-
-                    $this->categorizedUnits[] = $unit;
+            $category = 0;
+            while (($row = $this->db->fetchAssoc($result)) !== null) {
+                $unit = new Unit();
+                $unit->initFormArray($row);
+
+                if ($category !== $unit->getCategory()) {
+                    $cat = new Category();
+                    $cat->initFormArray([
+                        'category_id' => (int) $row['category_fi'],
+                        'category' => $row['category'],
+                        'question_fi' => (int) $row['question_fi'],
+                    ]);
+                    $this->categorized_units[] = $cat;
+                    $category = $unit->getCategory();
                 }
+
+                $this->categorized_units[] = $unit;
             }
         }
 
-        return $this->categorizedUnits;
+        return $this->categorized_units;
     }
 
     protected function clearUnits(): void
@@ -306,61 +324,54 @@ protected function clearUnits(): void
         $this->units = [];
     }
 
-    protected function addUnit(assFormulaQuestionUnit $unit): void
-    {
+    protected function addUnit(
+        Unit $unit
+    ): void {
         $this->units[$unit->getId()] = $unit;
     }
 
     /**
-     * @return assFormulaQuestionUnit[]
+     * @return list<\ILIAS\Questions\Units\Unit>
      */
     public function getUnits(): array
     {
-        if (count($this->units) === 0) {
+        if ($this->units === []) {
             $this->loadUnits();
         }
         return $this->units;
     }
 
     /**
-     * @param int $category
-     * @return assFormulaQuestionUnit[]
+     * @return list<\ILIAS\Questions\Units\Unit>
      */
-    public function loadUnitsForCategory(int $category): array
-    {
-        global $DIC;
-        $ilDB = $DIC['ilDB'];
-
+    public function loadUnitsForCategory(
+        int $category
+    ): array {
         $units = [];
-        $result = $ilDB->queryF(
-            "SELECT units.*, baseunits.unit baseunit_title, il_qpl_qst_fq_ucat.category
-			FROM il_qpl_qst_fq_unit units
-			INNER JOIN il_qpl_qst_fq_ucat ON il_qpl_qst_fq_ucat.category_id = units.category_fi
-			LEFT JOIN il_qpl_qst_fq_unit baseunits ON baseunits.unit_id = units.baseunit_fi
-			WHERE il_qpl_qst_fq_ucat.category_id = %s
-			ORDER BY units.sequence",
-            ['integer'],
+        $result = $this->db->queryF(
+            'SELECT units.*, baseunits.unit baseunit_title, ' . self::CATEGORY_TABLE . '.category' . PHP_EOL
+            . 'FROM ' . self::UNIT_TABLE . ' units' . PHP_EOL
+            . 'INNER JOIN ' . self::CATEGORY_TABLE . ' ON ' . self::CATEGORY_TABLE . '.category_id = units.category_fi' . PHP_EOL
+            . 'LEFT JOIN ' . self::UNIT_TABLE . ' baseunits ON baseunits.unit_id = units.baseunit_fi' . PHP_EOL
+            . 'WHERE ' . self::CATEGORY_TABLE . '.category_id = %s' . PHP_EOL
+            . 'ORDER BY units.sequence',
+            [\ilDBConstants::T_INTEGER],
             [$category]
         );
 
-        if ($result->numRows() > 0) {
-            while ($row = $ilDB->fetchAssoc($result)) {
-                $unit = new assFormulaQuestionUnit();
-                $unit->initFormArray($row);
-                $units[] = $unit;
-            }
+        while (($row = $this->db->fetchAssoc($result)) !== null) {
+            $unit = new Unit();
+            $unit->initFormArray($row);
+            $units[] = $unit;
         }
 
         return $units;
     }
 
-    /**
-     * @param int $id
-     * @return assFormulaQuestionUnit|null
-     */
-    public function getUnit(int $id): ?assFormulaQuestionUnit
-    {
-        if (count($this->units) === 0) {
+    public function getUnit(
+        int $id
+    ): ?Unit {
+        if ($this->units === []) {
             $this->loadUnits();
         }
 
@@ -369,7 +380,6 @@ public function getUnit(int $id): ?assFormulaQuestionUnit
         }
 
         // Maybe this is a new unit, reload $this->units
-
         $this->loadUnits();
 
         return $this->units[$id] ?? null;
@@ -382,25 +392,23 @@ public function getUnitCategories(): array
     {
         $categories = [];
         $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi > %s ORDER BY category",
-            ['integer'],
+            'SELECT * FROM ' . self::CATEGORY_TABLE . ' WHERE question_fi > %s ORDER BY category',
+            [\ilDBConstants::T_INTEGER],
             [0]
         );
 
-        if ($this->db->numRows($result)) {
-            while ($row = $this->db->fetchAssoc($result)) {
-                $value = strcmp('-qpl_qst_formulaquestion_' . $row['category'] . '-', $this->lng->txt($row['category'])) === 0
-                    ? $row['category']
-                    : $this->lng->txt($row['category']);
-
-                if (trim($row['category']) !== '') {
-                    $cat = [
-                        'value' => (int) $row['category_id'],
-                        'text' => $value,
-                        'qst_id' => (int) $row['question_fi']
-                    ];
-                    $categories[(int) $row['category_id']] = $cat;
-                }
+        while (($row = $this->db->fetchAssoc($result)) !== null) {
+            $value = $this->lng->txt($row['category']) === "-qpl_qst_formulaquestion_{$row['category']}-"
+                ? $row['category']
+                : $this->lng->txt($row['category']);
+
+            if (trim($row['category']) !== '') {
+                $cat = [
+                    'value' => (int) $row['category_id'],
+                    'text' => $value,
+                    'qst_id' => (int) $row['question_fi']
+                ];
+                $categories[(int) $row['category_id']] = $cat;
             }
         }
 
@@ -415,178 +423,237 @@ public function getAdminUnitCategories(): array
         $categories = [];
 
         $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi = %s  ORDER BY category",
-            ['integer'],
+            'SELECT * FROM ' . self::CATEGORY_TABLE . ' WHERE question_fi = %s  ORDER BY category',
+            [\ilDBConstants::T_INTEGER],
             [0]
         );
 
-        if ($result = $this->db->numRows($result)) {
-            while ($row = $this->db->fetchAssoc($result)) {
-                $value = strcmp('-qpl_qst_formulaquestion_' . $row['category'] . '-', $this->lng->txt($row['category'])) === 0
-                    ? $row['category']
-                    : $this->lng->txt($row['category']);
-
-                if (trim($row['category']) !== '') {
-                    $cat = [
-                        'value' => (int) $row['category_id'],
-                        'text' => $value,
-                        'qst_id' => (int) $row['question_fi']
-                    ];
-                    $categories[(int) $row['category_id']] = $cat;
-                }
+        while (($row = $this->db->fetchAssoc($result)) !== null) {
+            $value = $this->lng->txt($row['category']) === "-qpl_qst_formulaquestion_{$row['category']}-'"
+                ? $row['category']
+                : $this->lng->txt($row['category']);
+
+            if (trim($row['category']) !== '') {
+                $cat = [
+                    'value' => (int) $row['category_id'],
+                    'text' => $value,
+                    'qst_id' => (int) $row['question_fi']
+                ];
+                $categories[(int) $row['category_id']] = $cat;
             }
         }
 
         return $categories;
     }
 
-    public function saveUnitOrder(int $unit_id, int $sequence): void
-    {
+    public function saveUnitOrder(
+        int $question_id,
+        int $unit_id,
+        int $sequence
+    ): void {
         $this->db->manipulateF(
-            'UPDATE il_qpl_qst_fq_unit SET sequence = %s WHERE unit_id = %s AND question_fi = %s',
-            ['integer', 'integer', 'integer'],
-            [$sequence, $unit_id, $this->getConsumerId()]
+            'UPDATE ' . self::UNIT_TABLE . ' SET sequence = %s WHERE unit_id = %s AND question_fi = %s',
+            [
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER
+            ],
+            [
+                $sequence,
+                $unit_id,
+                $question_id
+            ]
         );
     }
 
-    public function checkDeleteUnit(int $id, ?int $category_id = null): ?string
-    {
-        $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_var WHERE unit_fi = %s",
-            ['integer'],
-            [$id]
+    public function checkDeleteUnit(
+        int $id,
+        ?int $category_id = null
+    ): ?string {
+        $use_in_vars = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT COUNT(variable_id) cnt FROM ' . self::VARIABLES_TABLE . ' WHERE unit_fi = %s',
+                [\ilDBConstants::T_INTEGER],
+                [$id]
+            )
         );
-        if ($this->db->numRows($result) > 0) {
-            return $this->lng->txt("err_unit_in_variables");
+        if ($use_in_vars->cnt > 0) {
+            return $this->lng->txt('err_unit_in_variables');
         }
 
-        $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_res WHERE unit_fi = %s",
-            ['integer'],
-            [$id]
+        $use_in_results = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT COUNT(result_id) cnt FROM ' . self::RESULTS_TABLE . ' WHERE unit_fi = %s',
+                [\ilDBConstants::T_INTEGER],
+                [$id]
+            )
         );
-        if ($this->db->numRows($result) > 0) {
-            return $this->lng->txt("err_unit_in_results");
+        if ($use_in_results->cnt > 0) {
+            return $this->lng->txt('err_unit_in_results');
         }
 
-        if (!is_null($category_id)) {
-            $result = $this->db->queryF(
-                "SELECT * FROM il_qpl_qst_fq_unit WHERE baseunit_fi = %s AND category_fi != %s",
-                ['integer', 'integer', 'integer'],
-                [$id, $id, $category_id]
-            );
-        } else {
-            $result = $this->db->queryF(
-                "SELECT * FROM il_qpl_qst_fq_unit WHERE baseunit_fi = %s AND unit_id != %s",
-                ['integer', 'integer'],
-                [$id, $id]
-            );
+        $additional_where = 'unit_id != %s';
+        $values_array = [$id, $id];
+        if ($category_id !== null) {
+            $additional_where = 'category_fi != %s';
+            $values_array = [$id, $category_id];
         }
 
-        if ($this->db->numRows($result) > 0) {
-            return $this->lng->txt("err_unit_is_baseunit");
+        $use_as_base_unit = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT COUNT(unit_id) cnt FROM ' . self::UNIT_TABLE . '' . PHP_EOL
+                    . "WHERE baseunit_fi = %s AND {$additional_where}",
+                [\ilDBConstants::T_INTEGER, \ilDBConstants::T_INTEGER],
+                $values_array
+            )
+        );
+
+        if ($use_as_base_unit->cnt > 0) {
+            return $this->lng->txt('err_unit_is_baseunit');
         }
 
         return null;
     }
 
-    public function getUnitCategoryById(int $id): assFormulaQuestionUnitCategory
-    {
-        $query = 'SELECT * FROM il_qpl_qst_fq_ucat WHERE category_id = ' . $this->db->quote($id, 'integer');
-        $res = $this->db->query($query);
-        if (!$this->db->numRows($res)) {
-            throw new ilException('un_category_not_exist');
+    public function getUnitCategoryById(
+        int $id
+    ): Category {
+        $res = $this->db->query(
+            'SELECT * FROM ' . self::CATEGORY_TABLE . ' WHERE category_id = '
+                . $this->db->quote($id, \ilDBConstants::T_INTEGER)
+        );
+
+        if ($this->db->numRows($res) === 0) {
+            throw new \ilException('un_category_not_exist');
         }
 
-        $row = $this->db->fetchAssoc($res);
-        $category = new assFormulaQuestionUnitCategory();
-        $category->initFormArray($row);
+        $category = new Category();
+        $category->initFormArray($this->db->fetchAssoc($res));
         return $category;
     }
 
-    public function saveCategory(assFormulaQuestionUnitCategory $category): void
-    {
-        $res = $this->db->queryF(
-            'SELECT * FROM il_qpl_qst_fq_ucat WHERE category = %s AND question_fi = %s AND category_id != %s',
-            ['text', 'integer', 'integer'],
-            [$category->getCategory(), $this->getConsumerId(), $category->getId()]
+    public function saveCategory(
+        Category $category
+    ): void {
+        $row = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT COUNT(category_id) cnt FROM ' . self::CATEGORY_TABLE . '' . PHP_EOL
+                . 'WHERE category = %s AND question_fi = %s AND category_id != %s',
+                [
+                    \ilDBConstants::T_TEXT,
+                    \ilDBConstants::T_INTEGER,
+                    \ilDBConstants::T_INTEGER
+                ],
+                [
+                    $category->getCategory(),
+                    $category->getQuestionFi(),
+                    $category->getId()
+                ]
+            )
         );
-        if ($this->db->numRows($res)) {
-            throw new ilException('err_wrong_categoryname');
+        if ($row->cnt > 0) {
+            throw new \ilException('err_wrong_categoryname');
         }
 
         $this->db->manipulateF(
-            'UPDATE il_qpl_qst_fq_ucat SET category = %s WHERE question_fi = %s AND category_id = %s',
-            ['text', 'integer', 'integer'],
-            [$category->getCategory(), $this->getConsumerId(), $category->getId()]
+            'UPDATE ' . self::CATEGORY_TABLE . ' SET category = %s WHERE question_fi = %s AND category_id = %s',
+            [
+                \ilDBConstants::T_TEXT,
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER
+            ],
+            [
+                $category->getCategory(),
+                $category->getQuestionFi(),
+                $category->getId()
+            ]
         );
     }
 
-    public function saveNewUnitCategory(assFormulaQuestionUnitCategory $category): void
-    {
-        $res = $this->db->queryF(
-            'SELECT category FROM il_qpl_qst_fq_ucat WHERE category = %s AND question_fi = %s',
-            ['text', 'integer'],
-            [$category->getCategory(), $this->getConsumerId()]
+    public function saveNewUnitCategory(
+        Category $category
+    ): void {
+        $row = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT COUNT(category_id) cnt FROM ' . self::CATEGORY_TABLE . ' WHERE category = %s AND question_fi = %s',
+                [
+                    \ilDBConstants::T_TEXT,
+                    \ilDBConstants::T_INTEGER
+                ],
+                [
+                    $category->getCategory(),
+                    $category->getQuestionFi()
+                ]
+            )
         );
-        if ($this->db->numRows($res)) {
-            throw new ilException('err_wrong_categoryname');
+        if ($row->cnt > 0) {
+            throw new \ilException('err_wrong_categoryname');
         }
 
-        $next_id = $this->db->nextId('il_qpl_qst_fq_ucat');
+        $next_id = $this->db->nextId(self::CATEGORY_TABLE);
         $this->db->manipulateF(
-            "INSERT INTO il_qpl_qst_fq_ucat (category_id, category, question_fi) VALUES (%s, %s, %s)",
-            ['integer', 'text', 'integer'],
+            'INSERT INTO ' . self::CATEGORY_TABLE . ' (category_id, category, question_fi) VALUES (%s, %s, %s)',
+            [
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_TEXT,
+                \ilDBConstants::T_INTEGER
+            ],
             [
                 $next_id,
                 $category->getCategory(),
-                $this->getConsumerId()
+                $category->getQuestionFi()
             ]
         );
         $category->setId($next_id);
     }
 
     /**
-     * @return assFormulaQuestionUnitCategory[]
+     * @return list<\ILIAS\Questions\Units\Category>
      */
-    public function getAllUnitCategories(): array
-    {
+    public function getAllUnitCategories(
+        int $question_id
+    ): array {
         $categories = [];
         $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi = %s OR question_fi = %s ORDER BY category",
-            ['integer', 'integer'],
-            [$this->getConsumerId(), 0]
+            'SELECT * FROM ' . self::CATEGORY_TABLE . ' WHERE question_fi = %s OR question_fi = %s ORDER BY category',
+            [
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER
+            ],
+            [
+                $question_id,
+                0
+            ]
         );
 
-        if ($result->numRows() > 0) {
-            while ($row = $this->db->fetchAssoc($result)) {
-                $category = new assFormulaQuestionUnitCategory();
-                $category->initFormArray($row);
-                $categories[] = $category;
-            }
+        while ($row = $this->db->fetchAssoc($result)) {
+            $category = new Category();
+            $category->initFormArray($row);
+            $categories[] = $category;
         }
+
         return $categories;
     }
 
-    public function deleteCategory(int $id): ?string
-    {
-        $res = $this->checkDeleteCategory($id);
-        if (!is_null($res)) {
+    public function deleteCategory(
+        int $id
+    ): ?string {
+        if ($this->checkDeleteCategory($id) !== null) {
             return $this->lng->txt('err_category_in_use');
         }
 
         $res = $this->db->queryF(
-            'SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
-            ['integer'],
+            'SELECT * FROM ' . self::UNIT_TABLE . ' WHERE category_fi = %s',
+            [\ilDBConstants::T_INTEGER],
             [$id]
         );
-        while ($row = $this->db->fetchAssoc($res)) {
+        while (($row = $this->db->fetchAssoc($res)) !== null) {
             $this->deleteUnit((int) $row['unit_id']);
         }
 
         $ar = $this->db->manipulateF(
-            'DELETE FROM il_qpl_qst_fq_ucat WHERE category_id = %s',
-            ['integer'],
+            'DELETE FROM ' . self::CATEGORY_TABLE . ' WHERE category_id = %s',
+            [\ilDBConstants::T_INTEGER],
             [$id]
         );
 
@@ -597,12 +664,23 @@ public function deleteCategory(int $id): ?string
         return null;
     }
 
-    public function createNewUnit(assFormulaQuestionUnit $unit): void
-    {
-        $next_id = $this->db->nextId('il_qpl_qst_fq_unit');
+    public function createNewUnit(
+        int $question_id,
+        Unit $unit
+    ): void {
+        $next_id = $this->db->nextId(self::UNIT_TABLE);
         $this->db->manipulateF(
-            'INSERT INTO il_qpl_qst_fq_unit (unit_id, unit, factor, baseunit_fi, category_fi, sequence, question_fi) VALUES (%s, %s, %s, %s, %s, %s, %s)',
-            ['integer', 'text', 'float', 'integer', 'integer', 'integer', 'integer'],
+            'INSERT INTO ' . self::UNIT_TABLE . ' (unit_id, unit, factor, baseunit_fi, category_fi, sequence, question_fi)' . PHP_EOL
+            . 'VALUES (%s, %s, %s, %s, %s, %s, %s)',
+            [
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_TEXT,
+                \ilDBConstants::T_FLOAT,
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER
+            ],
             [
                 $next_id,
                 $unit->getUnit(),
@@ -610,7 +688,7 @@ public function createNewUnit(assFormulaQuestionUnit $unit): void
                 0,
                 $unit->getCategory(),
                 0,
-                $this->getConsumerId()
+                $question_id
             ]
         );
         $unit->setId($next_id);
@@ -621,42 +699,62 @@ public function createNewUnit(assFormulaQuestionUnit $unit): void
         $this->clearUnits();
     }
 
-    public function saveUnit(assFormulaQuestionUnit $unit): void
-    {
-        $res = $this->db->queryF(
-            'SELECT unit_id FROM il_qpl_qst_fq_unit WHERE unit_id = %s',
-            ['integer'],
-            [$unit->getId()]
+    public function saveUnit(
+        int $question_id,
+        Unit $unit
+    ): void {
+        $row = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT COUNT(unit_id) cnt FROM ' . self::UNIT_TABLE . ' WHERE unit_id = %s',
+                [\ilDBConstants::T_INTEGER],
+                [$unit->getId()]
+            )
         );
-        if ($this->db->numRows($res)) {
-            $row = $this->db->fetchAssoc($res);
+        if ($row->cnt === 0) {
+            return;
+        }
 
-            if ($unit->getBaseUnit() === 0 || $unit->getBaseUnit() === $unit->getId()) {
-                $unit->setFactor(1);
-            }
+        if ($unit->getBaseUnit() === 0 || $unit->getBaseUnit() === $unit->getId()) {
+            $unit->setFactor(1);
+        }
 
-            $ar = $this->db->manipulateF(
-                'UPDATE il_qpl_qst_fq_unit SET unit = %s, factor = %s, baseunit_fi = %s, category_fi = %s, sequence = %s WHERE unit_id = %s AND question_fi = %s',
-                ['text', 'float', 'integer', 'integer', 'integer', 'integer', 'integer'],
-                [
-                    $unit->getUnit(), $unit->getFactor(), (int) $unit->getBaseUnit(),
-                    $unit->getCategory(),
-                    $unit->getSequence(),
-                    $unit->getId(),
-                    $this->getConsumerId()
-                ]
-            );
-            if ($ar > 0) {
-                $this->clearUnits();
-            }
+        $ar = $this->db->manipulateF(
+            'UPDATE ' . self::UNIT_TABLE . '' . PHP_EOL
+            . 'SET unit = %s, factor = %s, baseunit_fi = %s, category_fi = %s, sequence = %s' . PHP_EOL
+            . 'WHERE unit_id = %s AND question_fi = %s',
+            [
+                \ilDBConstants::T_TEXT,
+                \ilDBConstants::T_FLOAT,
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER,
+                \ilDBConstants::T_INTEGER
+            ],
+            [
+                $unit->getUnit(), $unit->getFactor(), (int) $unit->getBaseUnit(),
+                $unit->getCategory(),
+                $unit->getSequence(),
+                $unit->getId(),
+                $question_id
+            ]
+        );
+        if ($ar > 0) {
+            $this->clearUnits();
         }
     }
 
-    public function cloneUnits(int $from_consumer_id, int $to_consumer_id): void
-    {
+    public function cloneUnits(
+        int $from_consumer_id,
+        int $to_consumer_id
+    ): void {
         $category_mapping = [];
 
-        $res = $this->db->queryF("SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi = %s", ['integer'], [$from_consumer_id]);
+        $res = $this->db->queryF(
+            'SELECT * FROM ' . self::CATEGORY_TABLE . ' WHERE question_fi = %s',
+            [\ilDBConstants::T_INTEGER],
+            [$from_consumer_id]
+        );
         while ($row = $this->db->fetchAssoc($res)) {
             $new_category_id = $this->copyCategory((int) $row['category_id'], $to_consumer_id);
             $category_mapping[$row['category_id']] = $new_category_id;
@@ -664,29 +762,29 @@ public function cloneUnits(int $from_consumer_id, int $to_consumer_id): void
 
         foreach ($category_mapping as $old_category_id => $new_category_id) {
             $res = $this->db->queryF(
-                'SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
-                ['integer'],
+                'SELECT * FROM ' . self::UNIT_TABLE . ' WHERE category_fi = %s',
+                [\ilDBConstants::T_INTEGER],
                 [$old_category_id]
             );
 
             $i = 0;
             $units = [];
             while ($row = $this->db->fetchAssoc($res)) {
-                $next_id = $this->db->nextId('il_qpl_qst_fq_unit');
+                $next_id = $this->db->nextId(self::UNIT_TABLE);
 
                 $units[$i]['old_unit_id'] = $row['unit_id'];
                 $units[$i]['new_unit_id'] = $next_id;
 
                 $this->db->insert(
-                    'il_qpl_qst_fq_unit',
+                    self::UNIT_TABLE,
                     [
-                        'unit_id' => ['integer', $next_id],
-                        'unit' => ['text', $row['unit']],
-                        'factor' => ['float', $row['factor']],
-                        'baseunit_fi' => ['integer', (int) $row['baseunit_fi']],
-                        'category_fi' => ['integer', (int) $new_category_id],
-                        'sequence' => ['integer', (int) $row['sequence']],
-                        'question_fi' => ['integer', $to_consumer_id]
+                        'unit_id' => [\ilDBConstants::T_INTEGER, $next_id],
+                        'unit' => [\ilDBConstants::T_TEXT, $row['unit']],
+                        'factor' => [\ilDBConstants::T_FLOAT, $row['factor']],
+                        'baseunit_fi' => [\ilDBConstants::T_INTEGER, (int) $row['baseunit_fi']],
+                        'category_fi' => [\ilDBConstants::T_INTEGER, (int) $new_category_id],
+                        'sequence' => [\ilDBConstants::T_INTEGER, (int) $row['sequence']],
+                        'question_fi' => [\ilDBConstants::T_INTEGER, $to_consumer_id]
                     ]
                 );
                 $i++;
@@ -695,41 +793,49 @@ public function cloneUnits(int $from_consumer_id, int $to_consumer_id): void
             foreach ($units as $unit) {
                 //update unit : baseunit_fi
                 $this->db->update(
-                    'il_qpl_qst_fq_unit',
-                    ['baseunit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                    self::UNIT_TABLE,
+                    [
+                        'baseunit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['new_unit_id']]
+                    ],
                     [
-                        'baseunit_fi' => ['integer', (int) $unit['old_unit_id']],
-                        'question_fi' => ['integer', $to_consumer_id]
+                        'baseunit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['old_unit_id']],
+                        'question_fi' => [\ilDBConstants::T_INTEGER, $to_consumer_id]
                     ]
                 );
 
                 //update var : unit_fi
                 $this->db->update(
-                    'il_qpl_qst_fq_var',
-                    ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                    self::VARIABLES_TABLE,
                     [
-                        'unit_fi' => ['integer', (int) $unit['old_unit_id']],
-                        'question_fi' => ['integer', $to_consumer_id]
+                        'unit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['new_unit_id']]
+                    ],
+                    [
+                        'unit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['old_unit_id']],
+                        'question_fi' => [\ilDBConstants::T_INTEGER, $to_consumer_id]
                     ]
                 );
 
                 //update res : unit_fi
                 $this->db->update(
-                    'il_qpl_qst_fq_res',
-                    ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                    self::RESULTS_TABLE,
+                    [
+                        'unit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['new_unit_id']]
+                    ],
                     [
-                        'unit_fi' => ['integer', (int) $unit['old_unit_id']],
-                        'question_fi' => ['integer', $to_consumer_id]
+                        'unit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['old_unit_id']],
+                        'question_fi' => [\ilDBConstants::T_INTEGER, $to_consumer_id]
                     ]
                 );
 
                 //update res_unit : unit_fi
                 $this->db->update(
-                    'il_qpl_qst_fq_res_unit',
-                    ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
+                    self::RESULT_UNITS_TABLE,
+                    [
+                        'unit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['new_unit_id']]
+                    ],
                     [
-                        'unit_fi' => ['integer', (int) $unit['old_unit_id']],
-                        'question_fi' => ['integer', $to_consumer_id]
+                        'unit_fi' => [\ilDBConstants::T_INTEGER, (int) $unit['old_unit_id']],
+                        'question_fi' => [\ilDBConstants::T_INTEGER, $to_consumer_id]
                     ]
                 );
             }
diff --git a/components/ILIAS/Questions/src/Units/Unit.php b/components/ILIAS/Questions/src/Units/Unit.php
index 9db6dc04a842..3d85e95f75cd 100755
--- a/components/ILIAS/Questions/src/Units/Unit.php
+++ b/components/ILIAS/Questions/src/Units/Unit.php
@@ -18,7 +18,9 @@
 
 declare(strict_types=1);
 
-use ILIAS\Questions\Units;
+namespace ILIAS\Questions\Units;
+
+use ILIAS\Language\Language;
 
 class Unit
 {
@@ -115,28 +117,26 @@ public function getCategory(): int
         return $this->category;
     }
 
-    public function getDisplayString(): string
-    {
-        global $DIC;
-
-        $lng = $DIC->language();
-
+    public function getDisplayString(
+        Language $lng
+    ): string {
         $unit = $this->getUnit();
-        if (strcmp('-qpl_qst_formulaquestion_' . $unit . '-', $lng->txt('qpl_qst_formulaquestion_' . $unit)) !== 0) {
-            $unit = $lng->txt('qpl_qst_formulaquestion_' . $unit);
+        if ($lng->txt("qpl_qst_formulaquestion_{$unit}") !== "-qpl_qst_formulaquestion_{$unit}-") {
+            return $lng->txt("qpl_qst_formulaquestion_{$unit}");
         }
 
         return $unit;
     }
 
-    public static function lookupUnitFactor(int $a_unit_id): float
-    {
+    public static function lookupUnitFactor(
+        int $a_unit_id
+    ): float {
         global $DIC;
         $ilDB = $DIC['ilDB'];
 
         $res = $ilDB->queryF(
             'SELECT factor FROM il_qpl_qst_fq_unit WHERE unit_id = %s',
-            ['integer'],
+            [\ilDBConstants::T_INTEGER],
             [$a_unit_id]
         );
 
diff --git a/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php b/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php
index c0eb01b8acf0..6af76ccbc69b 100755
--- a/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php
+++ b/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php
@@ -41,9 +41,10 @@ public function isCRUDContext(): bool
 
     public function getUniqueId(): string
     {
-        return $this->repository->getConsumerId() . '_global';
+        return $this->request->getQuestionId() . '_global';
     }
 
+    #[\Override]
     protected function showGlobalUnitCategories(): void
     {
         global $DIC;
@@ -58,9 +59,10 @@ protected function showGlobalUnitCategories(): void
         parent::showGlobalUnitCategories();
     }
 
+    #[\Override]
     protected function showUnitCategories(array $categories): void
     {
-        $table = new \ilGlobalUnitCategoryTableGUI(this, $this->getUnitCategoryOverviewCommand());
+        $table = new \ilGlobalUnitCategoryTableGUI($this, $this->getUnitCategoryOverviewCommand());
         $table->setData($categories);
 
         $this->tpl->setContent($table->getHTML());
diff --git a/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php b/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php
index 56f0182c1c13..1df80ead2bbe 100755
--- a/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php
+++ b/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php
@@ -24,11 +24,13 @@ class LocalConfigurationGUI extends ConfigurationGUI
 {
     private const REQUEST_PARAM_SUB_CONTEXT_ID = 'question_fi';
 
+    #[\Override]
     protected function getDefaultCommand(): string
     {
         return 'showLocalUnitCategories';
     }
 
+    #[\Override]
     public function getUnitCategoryOverviewCommand(): string
     {
         if ($this->isCRUDContext()) {
@@ -38,19 +40,21 @@ public function getUnitCategoryOverviewCommand(): string
         return 'showGlobalUnitCategories';
     }
 
+    #[\Override]
     public function isCRUDContext(): bool
     {
         if (!$this->request->isset(self::REQUEST_PARAM_SUB_CONTEXT_ID) ||
-            $this->request->raw(self::REQUEST_PARAM_SUB_CONTEXT_ID) == $this->repository->getConsumerId()) {
+            $this->request->raw(self::REQUEST_PARAM_SUB_CONTEXT_ID) === $this->request->getQuestionId()) {
             return true;
         }
 
         return false;
     }
 
+    #[\Override]
     public function getUniqueId(): string
     {
-        $id = $this->repository->getConsumerId();
+        $id = $this->request->getQuestionId();
         if ($this->isCRUDContext()) {
             $id .= '_local';
         } else {
@@ -60,6 +64,7 @@ public function getUniqueId(): string
         return $id;
     }
 
+    #[\Override]
     public function executeCommand(): void
     {
         global $DIC;
@@ -73,13 +78,14 @@ public function executeCommand(): void
         parent::executeCommand();
     }
 
+    #[\Override]
     protected function handleSubtabs(): void
     {
         global $DIC;
 
         $ilTabs = $DIC->tabs();
 
-        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, $this->repository->getConsumerId());
+        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, $this->request->getQuestionId());
         $ilTabs->addSubTab('view_unit_ctx_local', $this->lng->txt('un_local_units'), $this->ctrl->getLinkTarget($this, 'showLocalUnitCategories'));
         $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, 0);
         $ilTabs->addSubTab('view_unit_ctx_global', $this->lng->txt('un_global_units'), $this->ctrl->getLinkTarget($this, 'showGlobalUnitCategories'));
@@ -100,19 +106,18 @@ protected function showLocalUnitCategories(): void
 
         $ilToolbar->addButton($this->lng->txt('un_add_category'), $this->ctrl->getLinkTarget($this, 'showUnitCategoryCreationForm'));
 
-        $repo = $this->repository;
+        $question_id = $this->request->getQuestionId();
+
         $categories = array_filter(
-            $this->repository->getAllUnitCategories(),
-            static function (assFormulaQuestionUnitCategory $category) use ($repo): bool {
-                return $category->getQuestionFi() === $repo->getConsumerId();
-            }
+            $this->repository->getAllUnitCategories($question_id),
+            fn(Category $category): bool =>
+                $category->getQuestionFi() === $question_id
         );
         $data = [];
         foreach ($categories as $category) {
-            /** @var assFormulaQuestionUnitCategory $category */
             $data[] = [
                 'category_id' => $category->getId(),
-                'category' => $category->getDisplayString()
+                'category' => $category->getDisplayString($this->lng)
             ];
         }
 
@@ -122,9 +127,11 @@ static function (assFormulaQuestionUnitCategory $category) use ($repo): bool {
     /**
      * @param array $categories
      */
-    protected function showUnitCategories(array $categories): void
-    {
-        $table = new ilLocalUnitCategoryTableGUI($this, $this->getUnitCategoryOverviewCommand());
+    #[\Override]
+    protected function showUnitCategories(
+        array $categories
+    ): void {
+        $table = new \ilLocalUnitCategoryTableGUI($this, $this->getUnitCategoryOverviewCommand());
         $table->setData($categories);
 
         $this->tpl->setContent($table->getHTML());
@@ -139,14 +146,16 @@ protected function confirmImportGlobalCategory(): void
         $this->confirmImportGlobalCategories([$this->request->raw('category_id')]);
     }
 
-    protected function confirmImportGlobalCategories(array $category_ids): void
-    {
+    protected function confirmImportGlobalCategories(
+        array $category_ids
+    ): void {
         // @todo: Confirmation Currently not implemented, so forward to import
         $this->importGlobalCategories($category_ids);
     }
 
-    protected function importGlobalCategories(array $category_ids): void
-    {
+    protected function importGlobalCategories(
+        array $category_ids
+    ): void {
         if ($this->isCRUDContext()) {
             $this->{$this->getDefaultCommand()}();
             return;
@@ -156,15 +165,22 @@ protected function importGlobalCategories(array $category_ids): void
         foreach ($category_ids as $category_id) {
             try {
                 $category = $this->repository->getUnitCategoryById((int) $category_id);
-            } catch (ilException $e) {
+            } catch (\ilException $e) {
                 continue;
             }
 
             // Copy admin-category to custom-category (with question_fi)
-            $new_cat_id = $this->repository->copyCategory($category->getId(), $this->repository->getConsumerId());
+            $new_cat_id = $this->repository->copyCategory(
+                $this->request->getQuestionId(),
+                $category->getId()
+            );
 
             // Copy units to custom_category
-            $this->repository->copyUnitsByCategories($category->getId(), $new_cat_id, $this->repository->getConsumerId());
+            $this->repository->copyUnitsByCategories(
+                $this->request->getQuestionId(),
+                $category->getId(),
+                $new_cat_id
+            );
             ++$i;
         }
 
diff --git a/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionGUI.php b/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionGUI.php
index d56216e7f4ad..fb64672008eb 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionGUI.php
@@ -232,13 +232,14 @@ public function editQuestion(
              * @var $item assFormulaQuestionUnitCategory|assFormulaQuestionUnit
              */
             if ($item instanceof assFormulaQuestionUnitCategory) {
-                if ($category_name != $item->getDisplayString()) {
+                if ($category_name !== $item->getDisplayString($this->lng)) {
                     $new_category = true;
-                    $category_name = $item->getDisplayString();
+                    $category_name = $item->getDisplayString($this->lng);
                 }
                 continue;
             }
-            $unit_options[$item->getId()] = $item->getDisplayString() . ($new_category ? ' (' . $category_name . ')' : '');
+            $unit_options[$item->getId()] = $item->getDisplayString($this->lng)
+                . ($new_category ? ' (' . $category_name . ')' : '');
             $new_category = false;
         }
 
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilLocalUnitConfigurationGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilLocalUnitConfigurationGUI.php
index 5333b2657708..d9f9e2c43a6c 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilLocalUnitConfigurationGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilLocalUnitConfigurationGUI.php
@@ -113,7 +113,7 @@ static function (assFormulaQuestionUnitCategory $category) use ($repo): bool {
             /** @var assFormulaQuestionUnitCategory $category */
             $data[] = [
                 'category_id' => $category->getId(),
-                'category' => $category->getDisplayString()
+                'category' => $category->getDisplayString($this->lng)
             ];
         }
 
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php
index 2fdc9bc9fa5c..d66a01319e8d 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php
@@ -132,11 +132,15 @@ protected function confirmDeleteUnits(?array $unit_ids = null): void
                 }
 
                 if ($check_result = $this->repository->checkDeleteUnit($unit->getId())) {
-                    $errors[] = $unit->getDisplayString() . ' - ' . $check_result;
+                    $errors[] = $unit->getDisplayString($this->lng) . ' - ' . $check_result;
                     continue;
                 }
 
-                $confirmation->addItem('unit_ids[]', (string) $unit->getId(), $unit->getDisplayString());
+                $confirmation->addItem(
+                    'unit_ids[]',
+                    (string) $unit->getId(),
+                    $unit->getDisplayString($this->lng)
+                );
                 ++$num_to_confirm;
             } catch (ilException $e) {
                 continue;
@@ -199,7 +203,8 @@ public function deleteUnits(): void
 
                 $check_result = $this->repository->deleteUnit($unit->getId());
                 if (!is_null($check_result)) {
-                    $errors[] = $unit->getDisplayString() . ' - ' . $check_result;
+                    $errors[] = $unit->getDisplayString($this->lng)
+                        . ' - ' . $check_result;
                     continue;
                 }
 
@@ -399,14 +404,15 @@ protected function initUnitForm(
             }
 
             if ($item instanceof assFormulaQuestionUnitCategory) {
-                if ($category_name !== $item->getDisplayString()) {
+                if ($category_name !== $item->getDisplayString($this->lng)) {
                     $new_category = true;
-                    $category_name = $item->getDisplayString();
+                    $category_name = $item->getDisplayString($this->lng);
                 }
                 continue;
             }
 
-            $options[$item->getId()] = $item->getDisplayString() . ($new_category ? ' (' . $category_name . ')' : '');
+            $options[$item->getId()] = $item->getDisplayString($this->lng)
+                . ($new_category ? ' (' . $category_name . ')' : '');
             $new_category = false;
         }
         $baseunit->setDisabled($unit_in_use);
@@ -436,8 +442,8 @@ protected function initUnitForm(
             }
             $this->unit_form->setTitle(sprintf(
                 $this->lng->txt('un_sel_cat_sel_unit'),
-                $category->getDisplayString(),
-                $unit->getDisplayString()
+                $category->getDisplayString($this->lng),
+                $unit->getDisplayString($this->lng)
             ));
         }
         $this->ctrl->clearParameterByClass(get_class($this), 'category_id');
@@ -502,7 +508,7 @@ static function (assFormulaQuestionUnitCategory $category): bool {
             /** @var assFormulaQuestionUnitCategory $category */
             $data[] = [
                 'category_id' => $category->getId(),
-                'category' => $category->getDisplayString()
+                'category' => $category->getDisplayString($this->lng)
             ];
         }
 
@@ -552,17 +558,23 @@ protected function confirmDeleteCategories(?array $category_ids = null): void
             }
 
             if (!$this->repository->isCRUDAllowed($category_id)) {
-                $errors[] = $category->getDisplayString() . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
+                $errors[] = $category->getDisplayString($this->lng)
+                    . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
                 continue;
             }
 
             $possible_error = $this->repository->checkDeleteCategory($category_id);
             if (is_string($possible_error) && $possible_error !== '') {
-                $errors[] = $category->getDisplayString() . ' - ' . $possible_error;
+                $errors[] = $category->getDisplayString($this->lng)
+                    . ' - ' . $possible_error;
                 continue;
             }
 
-            $confirmation->addItem('category_ids[]', (string) $category->getId(), $category->getDisplayString());
+            $confirmation->addItem(
+                'category_ids[]',
+                (string) $category->getId(),
+                $category->getDisplayString()
+            );
             ++$num_to_confirm;
         }
 
@@ -621,13 +633,15 @@ protected function deleteCategories(): void
             }
 
             if (!$this->repository->isCRUDAllowed($category_id)) {
-                $errors[] = $category->getDisplayString() . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
+                $errors[] = $category->getDisplayString($this->lng)
+                    . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
                 continue;
             }
 
             $possible_error = $this->repository->deleteCategory($category_id);
             if (is_string($possible_error) && $possible_error !== '') {
-                $errors[] = $category->getDisplayString() . ' - ' . $possible_error;
+                $errors[] = $category->getDisplayString($this->lng)
+                    . ' - ' . $possible_error;
                 continue;
             }
 
@@ -684,7 +698,12 @@ protected function initUnitCategoryForm(?assFormulaQuestionUnitCategory $cat = n
             $this->ctrl->setParameter($this, 'category_id', $cat->getId());
             $this->unit_cat_form->addCommandButton('saveCategory', $this->lng->txt('save'));
             $this->unit_cat_form->setFormAction($this->ctrl->getFormAction($this, 'saveCategory'));
-            $this->unit_cat_form->setTitle(sprintf($this->lng->txt('selected_category'), $cat->getDisplayString()));
+            $this->unit_cat_form->setTitle(
+                sprintf(
+                    $this->lng->txt('selected_category'),
+                    $cat->getDisplayString($this->lng)
+                )
+            );
         }
 
         $this->unit_cat_form->addCommandButton($this->getUnitCategoryOverviewCommand(), $this->lng->txt('cancel'));
diff --git a/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitCategoryTableGUI.php b/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitCategoryTableGUI.php
index b2641a7afd20..6cd8241ff53a 100755
--- a/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitCategoryTableGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitCategoryTableGUI.php
@@ -14,10 +14,10 @@
  * https://www.ilias.de
  * https://github.com/ILIAS-eLearning
  *
- *********************************************************************/
-
+ * ******************************************************************* */
 declare(strict_types=1);
 
+use ILIAS\Questions\Units\ConfigurationGUI;
 use ILIAS\TestQuestionPool\QuestionPoolDIC;
 use ILIAS\TestQuestionPool\RequestDataCollector;
 
@@ -29,7 +29,6 @@ abstract class ilUnitCategoryTableGUI extends ilTable2GUI
 {
     private \ILIAS\UI\Factory $ui_factory;
     private \ILIAS\UI\Renderer $ui_renderer;
-
     private RequestDataCollector $request;
     private \ILIAS\Refinery\Factory $refinery;
 
@@ -37,8 +36,10 @@ abstract class ilUnitCategoryTableGUI extends ilTable2GUI
      * @param ilUnitConfigurationGUI $controller
      * @param string                 $cmd
      */
-    public function __construct(ilUnitConfigurationGUI $controller, $cmd)
-    {
+    public function __construct(
+        ConfigurationGUI|ilUnitConfigurationGUI $controller,
+        $cmd
+    ) {
         /**
          * @var $ilCtrl ilCtrl
          */
@@ -70,17 +71,29 @@ public function __construct(ilUnitConfigurationGUI $controller, $cmd)
         }
         if ($hasAccess) {
             if ($this->getParentObject()->isCRUDContext()) {
-                $this->addMultiCommand('confirmDeleteCategories', $this->lng->txt('delete'));
+                $this->addMultiCommand(
+                    'confirmDeleteCategories',
+                    $this->lng->txt('delete')
+                );
             } else {
-                $this->addMultiCommand('confirmImportGlobalCategories', $this->lng->txt('import'));
+                $this->addMultiCommand(
+                    'confirmImportGlobalCategories',
+                    $this->lng->txt('import')
+                );
             }
         }
 
         $this->populateTitle();
 
-        $this->setFormAction($ilCtrl->getFormAction($this->getParentObject(), $cmd));
+        $this->setFormAction($ilCtrl->getFormAction(
+            $this->getParentObject(),
+            $cmd
+        ));
         $this->setSelectAllCheckbox('category_ids[]');
-        $this->setRowTemplate('tpl.unit_category_row.html', 'components/ILIAS/TestQuestionPool');
+        $this->setRowTemplate(
+            'tpl.unit_category_row.html',
+            'components/ILIAS/TestQuestionPool'
+        );
     }
 
     abstract protected function populateTitle(): void;
@@ -92,29 +105,72 @@ public function fillRow(array $row): void
     {
         global $DIC;
 
-        $row['chb'] = ilLegacyFormElementsUtil::formCheckbox(false, 'category_ids[]', (string) $row['category_id']);
+        $row['chb'] = ilLegacyFormElementsUtil::formCheckbox(
+            false,
+            'category_ids[]',
+            (string) $row['category_id']
+        );
 
         $actions = [];
 
-        $this->ctrl->setParameter($this->getParentObject(), 'category_id', $row['category_id']);
-        $actions[] = $this->ui_factory->link()->standard($this->lng->txt('un_show_units'), $this->ctrl->getLinkTarget($this->getParentObject(), 'showUnitsOfCategory'));
+        $this->ctrl->setParameter(
+            $this->getParentObject(),
+            'category_id',
+            $row['category_id']
+        );
+        $actions[] = $this->ui_factory->link()->standard(
+            $this->lng->txt('un_show_units'),
+            $this->ctrl->getLinkTarget(
+                $this->getParentObject(),
+                'showUnitsOfCategory'
+            )
+        );
         $ref_id = $this->request->getRefId();
         $type = ilObject::_lookupType($ref_id, true);
         if ($type === 'assf') {
             $hasAccess = $DIC->rbac()->system()->checkAccess('edit', $ref_id);
         } else {
-            $hasAccess = $DIC->access()->checkAccess('edit', 'showUnitCategoryModificationForm', $ref_id) &&
-            $DIC->access()->checkAccess('edit', 'confirmDeleteCategory', $ref_id);
+            $hasAccess = $DIC->access()->checkAccess(
+                'edit',
+                'showUnitCategoryModificationForm',
+                $ref_id
+            ) &&
+                $DIC->access()->checkAccess(
+                    'edit',
+                    'confirmDeleteCategory',
+                    $ref_id
+                );
         }
         if ($this->getParentObject()->isCRUDContext()) {
             if ($hasAccess) {
-                $actions[] = $this->ui_factory->link()->standard($this->lng->txt('edit'), $this->ctrl->getLinkTarget($this->getParentObject(), 'showUnitCategoryModificationForm'));
-                $actions[] = $this->ui_factory->link()->standard($this->lng->txt('delete'), $this->ctrl->getLinkTarget($this->getParentObject(), 'confirmDeleteCategory'));
+                $actions[] = $this->ui_factory->link()->standard(
+                    $this->lng->txt('edit'),
+                    $this->ctrl->getLinkTarget(
+                        $this->getParentObject(),
+                        'showUnitCategoryModificationForm'
+                    )
+                );
+                $actions[] = $this->ui_factory->link()->standard(
+                    $this->lng->txt('delete'),
+                    $this->ctrl->getLinkTarget(
+                        $this->getParentObject(),
+                        'confirmDeleteCategory'
+                    )
+                );
             }
         } else {
-            $actions[] = $this->ui_factory->link()->standard($this->lng->txt('import'), $this->ctrl->getLinkTarget($this->getParentObject(), 'confirmImportGlobalCategory'));
+            $actions[] = $this->ui_factory->link()->standard(
+                $this->lng->txt('import'),
+                $this->ctrl->getLinkTarget(
+                    $this->getParentObject(),
+                    'confirmImportGlobalCategory'
+                )
+            );
         }
-        $row['title_href'] = $this->ctrl->getLinkTarget($this->getParentObject(), 'showUnitsOfCategory');
+        $row['title_href'] = $this->ctrl->getLinkTarget(
+            $this->getParentObject(),
+            'showUnitsOfCategory'
+        );
         $this->ctrl->setParameter($this->getParentObject(), 'category_id', '');
         $dropdown = $this->ui_factory->dropdown()->standard($actions)->withLabel($this->lng->txt('actions'));
         $row['actions'] = $this->ui_renderer->render($dropdown);
diff --git a/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitTableGUI.php b/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitTableGUI.php
index c394bce4bd4c..e5e75a078a82 100755
--- a/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitTableGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitTableGUI.php
@@ -16,6 +16,9 @@
  *
  *********************************************************************/
 
+use ILIAS\Questions\Units\Category;
+use ILIAS\Questions\Units\ConfigurationGUI;
+
 /**
  * Class ilUnitTableGUI
  */
@@ -33,8 +36,11 @@ class ilUnitTableGUI extends ilTable2GUI
      * @param string                         $default_cmd
      * @param assFormulaQuestionUnitCategory $category
      */
-    public function __construct(ilUnitConfigurationGUI $controller, $default_cmd, assFormulaQuestionUnitCategory $category)
-    {
+    public function __construct(
+        ConfigurationGUI|ilUnitConfigurationGUI $controller,
+        string $default_cmd,
+        Category|assFormulaQuestionUnitCategory $category
+    ) {
         /**
          * @var $ilCtrl ilCtrl
          * @var $lng    ilLanguage
@@ -58,7 +64,12 @@ public function __construct(ilUnitConfigurationGUI $controller, $default_cmd, as
             $this->addCommandButton('saveOrder', $this->lng->txt('un_save_order'));
         }
 
-        $this->setTitle(sprintf($this->lng->txt('un_units_of_category_x'), $category->getDisplayString()));
+        $this->setTitle(
+            sprintf(
+                $this->lng->txt('un_units_of_category_x'),
+                $category->getDisplayString($this->lng)
+            )
+        );
 
         $this->addColumn($this->lng->txt('un_sequence'), '');
         $this->addColumn($this->lng->txt('unit'), '');

From cdde33f4e257c6887da1d108a8b0738624795c41 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Tue, 6 Jan 2026 18:20:31 +0100
Subject: [PATCH 094/141] Questions: Some More Clean-Up in Units

---
 .../class.ilObjQuestionsGUI.php               |  18 +-
 .../Questions/src/Units/ConfigurationGUI.php  |  15 +-
 .../ILIAS/Questions/src/Units/Repository.php  |  15 +
 components/ILIAS/Questions/src/Units/Unit.php |  17 -
 .../Units/class.GlobalConfigurationGUI.php    |  15 +-
 .../src/Units/class.LocalConfigurationGUI.php |  90 +-
 .../ILIAS/Test/classes/class.ilObjTestGUI.php |  29 +-
 components/ILIAS/Test/src/TestDIC.php         |   8 +-
 .../classes/class.assFormulaQuestion.php      |  18 +-
 .../classes/class.assFormulaQuestionGUI.php   |  18 +-
 .../classes/class.assFormulaQuestionUnit.php  | 162 ----
 .../class.assFormulaQuestionUnitCategory.php  |  89 --
 .../class.ilGlobalUnitConfigurationGUI.php    |  69 --
 .../class.ilLocalUnitConfigurationGUI.php     | 181 ----
 .../classes/class.ilObjQuestionPoolGUI.php    |  19 +-
 .../classes/class.ilUnitConfigurationGUI.php  | 798 ------------------
 .../class.ilUnitConfigurationRepository.php   | 739 ----------------
 .../qti12/class.assFormulaQuestionImport.php  |   1 -
 .../tables/class.ilUnitCategoryTableGUI.php   |   6 +-
 .../classes/tables/class.ilUnitTableGUI.php   |   9 +-
 .../TestQuestionPool/src/QuestionPoolDIC.php  |  11 +-
 21 files changed, 175 insertions(+), 2152 deletions(-)
 delete mode 100755 components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionUnit.php
 delete mode 100755 components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionUnitCategory.php
 delete mode 100755 components/ILIAS/TestQuestionPool/classes/class.ilGlobalUnitConfigurationGUI.php
 delete mode 100755 components/ILIAS/TestQuestionPool/classes/class.ilLocalUnitConfigurationGUI.php
 delete mode 100755 components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php
 delete mode 100755 components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationRepository.php

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
index ea58fd093f70..cb52b7cba00b 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -33,10 +33,11 @@
  */
 class ilObjQuestionsGUI extends ilObjectGUI
 {
-    private Edit $edit_view;
-    private UnitsRepository $units_repository;
+    private readonly Edit $edit_view;
+    private readonly UnitsRepository $units_repository;
 
-    private DataFactory $data_factory;
+    private readonly ilHelpGUI $help;
+    private readonly DataFactory $data_factory;
 
     public function __construct(
         $a_data,
@@ -45,7 +46,8 @@ public function __construct(
         bool $a_prepare_output = true
     ) {
         global $DIC;
-        $rbacsystem = $DIC['rbacsystem'];
+        $this->help = $DIC['ilHelp'];
+
         $this->data_factory = new DataFactory();
 
         $local_dic = LocalDIC::dic();
@@ -59,7 +61,7 @@ public function __construct(
         $this->lng->loadLanguageModule('assessment');
         $this->lng->loadLanguageModule('qsts');
 
-        if (!$rbacsystem->checkAccess('read', $this->object->getRefId())) {
+        if (!$this->rbac_system->checkAccess('read', $this->object->getRefId())) {
             $this->ilias->raiseError($this->lng->txt("msg_no_perm_read_assf"), $this->ilias->error_obj->WARNING);
         }
     }
@@ -94,7 +96,11 @@ public function executeCommand(): void
                         $this->units_repository,
                         $this->lng,
                         $this->ctrl,
-                        $this->tpl
+                        $this->rbac_system,
+                        $this->tpl,
+                        $this->toolbar,
+                        $this->tabs_gui,
+                        $this->help
                     )
                 );
                 break;
diff --git a/components/ILIAS/Questions/src/Units/ConfigurationGUI.php b/components/ILIAS/Questions/src/Units/ConfigurationGUI.php
index ddd83bce2b5a..6e4694b0eabf 100755
--- a/components/ILIAS/Questions/src/Units/ConfigurationGUI.php
+++ b/components/ILIAS/Questions/src/Units/ConfigurationGUI.php
@@ -34,12 +34,17 @@ public function __construct(
         protected readonly Repository $repository,
         protected readonly Language $lng,
         protected readonly \ilCtrl $ctrl,
-        protected readonly \ilGlobalTemplateInterface $tpl
+        protected readonly \ilRbacSystem $rbac_system,
+        protected readonly \ilGlobalTemplateInterface $tpl,
+        protected readonly \ilToolbarGUI $toolbar,
+        protected readonly \ilTabsGUI $tabs,
+        protected readonly \ilHelpGUI $help
     ) {
         $local_dic = QuestionPoolDIC::dic();
         $this->request = $local_dic['request_data_collector'];
 
         $this->lng->loadLanguageModule('assessment');
+        $this->tabs->activateTab('units');
     }
 
     abstract protected function getDefaultCommand(): string;
@@ -469,23 +474,19 @@ protected function initUnitForm(
 
     protected function showUnitsOfCategory(): void
     {
-        global $DIC;
-
-        $ilToolbar = $DIC->toolbar();
-
         $category = $this->getCategoryById($this->request->int('category_id'), false);
 
         $this->tpl->addJavaScript("assets/js/Basic.js");
         $this->tpl->addJavaScript("assets/js/Form.js");
         $this->lng->loadLanguageModule('form');
 
-        $ilToolbar->addButton(
+        $this->toolbar->addButton(
             $this->lng->txt('back'),
             $this->ctrl->getLinkTarget($this, $this->getUnitCategoryOverviewCommand())
         );
         if ($this->isCRUDContext()) {
             $this->ctrl->setParameterByClass(get_class($this), 'category_id', $category->getId());
-            $ilToolbar->addButton(
+            $this->toolbar->addButton(
                 $this->lng->txt('un_add_unit'),
                 $this->ctrl->getLinkTarget($this, 'showUnitCreationForm')
             );
diff --git a/components/ILIAS/Questions/src/Units/Repository.php b/components/ILIAS/Questions/src/Units/Repository.php
index b24533463e32..c87b4cd0483b 100755
--- a/components/ILIAS/Questions/src/Units/Repository.php
+++ b/components/ILIAS/Questions/src/Units/Repository.php
@@ -841,4 +841,19 @@ public function cloneUnits(
             }
         }
     }
+
+
+    public function lookupUnitFactor(
+        int $a_unit_id
+    ): float {
+        $res = $this->db->fetchObject(
+            $this->db->queryF(
+                'SELECT factor FROM il_qpl_qst_fq_unit WHERE unit_id = %s',
+                [\ilDBConstants::T_INTEGER],
+                [$a_unit_id]
+            )
+        );
+
+        return (float) $row->factor;
+    }
 }
diff --git a/components/ILIAS/Questions/src/Units/Unit.php b/components/ILIAS/Questions/src/Units/Unit.php
index 3d85e95f75cd..68e29611de53 100755
--- a/components/ILIAS/Questions/src/Units/Unit.php
+++ b/components/ILIAS/Questions/src/Units/Unit.php
@@ -127,21 +127,4 @@ public function getDisplayString(
 
         return $unit;
     }
-
-    public static function lookupUnitFactor(
-        int $a_unit_id
-    ): float {
-        global $DIC;
-        $ilDB = $DIC['ilDB'];
-
-        $res = $ilDB->queryF(
-            'SELECT factor FROM il_qpl_qst_fq_unit WHERE unit_id = %s',
-            [\ilDBConstants::T_INTEGER],
-            [$a_unit_id]
-        );
-
-        $row = $ilDB->fetchAssoc($res);
-
-        return (float) $row['factor'];
-    }
 }
diff --git a/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php b/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php
index 6af76ccbc69b..cf1cc22235ea 100755
--- a/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php
+++ b/components/ILIAS/Questions/src/Units/class.GlobalConfigurationGUI.php
@@ -47,13 +47,14 @@ public function getUniqueId(): string
     #[\Override]
     protected function showGlobalUnitCategories(): void
     {
-        global $DIC;
-
-        $ilToolbar = $DIC->toolbar();
-        $rbacsystem = $DIC->rbac()->system();
-
-        if ($rbacsystem->checkAccess('write', $this->request->getRefId())) {
-            $ilToolbar->addButton($this->lng->txt('un_add_category'), $this->ctrl->getLinkTargetByClass(self::class, 'showUnitCategoryCreationForm'));
+        if ($this->rbac_system->checkAccess('write', $this->request->getRefId())) {
+            $this->toolbar->addButton(
+                $this->lng->txt('un_add_category'),
+                $this->ctrl->getLinkTargetByClass(
+                    self::class,
+                    'showUnitCategoryCreationForm'
+                )
+            );
         }
 
         parent::showGlobalUnitCategories();
diff --git a/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php b/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php
index 1df80ead2bbe..7a634dd02eec 100755
--- a/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php
+++ b/components/ILIAS/Questions/src/Units/class.LocalConfigurationGUI.php
@@ -44,7 +44,7 @@ public function getUnitCategoryOverviewCommand(): string
     public function isCRUDContext(): bool
     {
         if (!$this->request->isset(self::REQUEST_PARAM_SUB_CONTEXT_ID) ||
-            $this->request->raw(self::REQUEST_PARAM_SUB_CONTEXT_ID) === $this->request->getQuestionId()) {
+            $this->request->int(self::REQUEST_PARAM_SUB_CONTEXT_ID) === $this->request->getQuestionId()) {
             return true;
         }
 
@@ -67,61 +67,81 @@ public function getUniqueId(): string
     #[\Override]
     public function executeCommand(): void
     {
-        global $DIC;
-
-        /** @var ilHelpGUI $ilHelp */
-        $ilHelp = $DIC['ilHelp'];
-
         $this->ctrl->saveParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID);
+        $this->help->setScreenIdComponent('qpl');
 
-        $ilHelp->setScreenIdComponent('qpl');
         parent::executeCommand();
     }
 
     #[\Override]
     protected function handleSubtabs(): void
     {
-        global $DIC;
+        $this->ctrl->setParameterByClass(
+            self::class,
+            self::REQUEST_PARAM_SUB_CONTEXT_ID,
+            $this->request->getQuestionId()
+        );
+
+        $this->tabs->addSubTab(
+            'view_unit_ctx_local',
+            $this->lng->txt('un_local_units'),
+            $this->ctrl->getLinkTargetByClass(
+                self::class,
+                'showLocalUnitCategories'
+            )
+        );
 
-        $ilTabs = $DIC->tabs();
+        $this->ctrl->setParameterByClass(
+            self::class,
+            self::REQUEST_PARAM_SUB_CONTEXT_ID,
+            0
+        );
 
-        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, $this->request->getQuestionId());
-        $ilTabs->addSubTab('view_unit_ctx_local', $this->lng->txt('un_local_units'), $this->ctrl->getLinkTarget($this, 'showLocalUnitCategories'));
-        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, 0);
-        $ilTabs->addSubTab('view_unit_ctx_global', $this->lng->txt('un_global_units'), $this->ctrl->getLinkTarget($this, 'showGlobalUnitCategories'));
-        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, '');
+        $this->tabs->addSubTab(
+            'view_unit_ctx_global',
+            $this->lng->txt('un_global_units'),
+            $this->ctrl->getLinkTargetByClass(
+                self::class,
+                'showGlobalUnitCategories'
+            )
+        );
+
+        $this->ctrl->setParameterByClass(
+            self::class,
+            self::REQUEST_PARAM_SUB_CONTEXT_ID,
+            ''
+        );
 
         if ($this->isCRUDContext()) {
-            $ilTabs->activateSubTab('view_unit_ctx_local');
+            $this->tabs->activateSubTab('view_unit_ctx_local');
         } else {
-            $ilTabs->activateSubTab('view_unit_ctx_global');
+            $this->tabs->activateSubTab('view_unit_ctx_global');
         }
     }
 
     protected function showLocalUnitCategories(): void
     {
-        global $DIC;
-
-        $ilToolbar = $DIC->toolbar();
-
-        $ilToolbar->addButton($this->lng->txt('un_add_category'), $this->ctrl->getLinkTarget($this, 'showUnitCategoryCreationForm'));
+        $this->toolbar->addButton(
+            $this->lng->txt('un_add_category'),
+            $this->ctrl->getLinkTargetByClass(
+                self::class,
+                'showUnitCategoryCreationForm'
+            )
+        );
 
         $question_id = $this->request->getQuestionId();
-
-        $categories = array_filter(
-            $this->repository->getAllUnitCategories($question_id),
-            fn(Category $category): bool =>
-                $category->getQuestionFi() === $question_id
+        $this->showUnitCategories(
+            array_map(
+                fn(Category $v): array => [
+                    'category_id' => $v->getId(),
+                    'category' => $v->getDisplayString($this->lng)
+                ],
+                array_filter(
+                    $this->repository->getAllUnitCategories($question_id),
+                    fn(Category $category): bool => $category->getQuestionFi() === $question_id
+                )
+            )
         );
-        $data = [];
-        foreach ($categories as $category) {
-            $data[] = [
-                'category_id' => $category->getId(),
-                'category' => $category->getDisplayString($this->lng)
-            ];
-        }
-
-        $this->showUnitCategories($data);
     }
 
     /**
diff --git a/components/ILIAS/Test/classes/class.ilObjTestGUI.php b/components/ILIAS/Test/classes/class.ilObjTestGUI.php
index 60446de5daf1..e076ac66bacb 100755
--- a/components/ILIAS/Test/classes/class.ilObjTestGUI.php
+++ b/components/ILIAS/Test/classes/class.ilObjTestGUI.php
@@ -64,6 +64,8 @@
 use ILIAS\TestQuestionPool\Questions\GeneralQuestionPropertiesRepository;
 use ILIAS\TestQuestionPool\RequestDataCollector as QPLRequestDataCollector;
 use ILIAS\TestQuestionPool\Import\TestQuestionsImportTrait;
+use ILIAS\Questions\Units\LocalConfigurationGUI as LocalUnitsConfigurationGUI;
+use ILIAS\Questions\Units\Repository as UnitsRepository;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\UI\Component\Modal\Modal;
 use ILIAS\UI\URLBuilder;
@@ -105,12 +107,12 @@
  * @ilCtrl_Calls ilObjTestGUI: assOrderingQuestionGUI, assImagemapQuestionGUI, assNumericGUI, assErrorTextGUI
  * @ilCtrl_Calls ilObjTestGUI: assTextSubsetGUI, assOrderingHorizontalGUI
  * @ilCtrl_Calls ilObjTestGUI: assSingleChoiceGUI, assFileUploadGUI, assTextQuestionGUI
- * @ilCtrl_Calls ilObjTestGUI: assKprimChoiceGUI, assLongMenuGUI
+ * @ilCtrl_Calls ilObjTestGUI: assKprimChoiceGUI, assLongMenuGUI, assFormulaQuestionGUI
  * @ilCtrl_Calls ilObjTestGUI: ilEditClipboardGUI
  * @ilCtrl_Calls ilObjTestGUI: ILIAS\Test\Settings\MainSettings\SettingsMainGUI, ILIAS\Test\Settings\ScoreReporting\SettingsScoringGUI
  * @ilCtrl_Calls ilObjTestGUI: ilCommonActionDispatcherGUI
  * @ilCtrl_Calls ilObjTestGUI: ilTestFixedQuestionSetConfigGUI, ilTestRandomQuestionSetConfigGUI
- * @ilCtrl_Calls ilObjTestGUI: ilAssQuestionFeedbackEditingGUI, ilLocalUnitConfigurationGUI, assFormulaQuestionGUI
+ * @ilCtrl_Calls ilObjTestGUI: ilAssQuestionFeedbackEditingGUI, ILIAS\Questions\Units\LocalConfigurationGUI
  * @ilCtrl_Calls ilObjTestGUI: ilTestPassDetailsOverviewTableGUI
  * @ilCtrl_Calls ilObjTestGUI: ilTestCorrectionsGUI
  * @ilCtrl_Calls ilObjTestGUI: ilTestSettingsChangeConfirmationGUI
@@ -174,6 +176,7 @@ class ilObjTestGUI extends ilObjectGUI implements ilCtrlBaseClassInterface, ilDe
     protected MarkSchemaFactory $mark_schema_factory;
     protected AdditionalInformationGenerator $additional_information_generator;
     protected PersonalSettingsExporter $personal_settings_exporter;
+    protected readonly UnitsRepository $units_repository;
     protected ?QuestionsTableQuery $table_query = null;
     protected ?QuestionsTableActions $table_actions = null;
     protected DataFactory $data_factory;
@@ -234,6 +237,7 @@ public function __construct()
         $this->mark_schema_factory = $local_dic['marks.factory'];
         $this->additional_information_generator = $local_dic['logging.information_generator'];
         $this->personal_settings_exporter = $local_dic['settings.personal_templates.exporter'];
+        $this->units_repository = $local_dic['units.repository'];
 
         $ref_id = 0;
         if ($this->testrequest->hasRefId() && is_numeric($this->testrequest->getRefId())) {
@@ -846,8 +850,8 @@ public function executeCommand(): void
                 $this->ctrl->forwardCommand($pg_gui);
                 break;
 
-            case 'illocalunitconfigurationgui':
-                if ((!$this->access->checkAccess("write", "", $this->testrequest->getRefId()))) {
+            case strtolower(LocalUnitsConfigurationGUI::class):
+                if ((!$this->access->checkAccess('write', '', $this->testrequest->getRefId()))) {
                     $this->redirectAfterMissingWrite();
                 }
                 $this->prepareSubGuiOutput();
@@ -858,10 +862,19 @@ public function executeCommand(): void
                 $question->setObjId($this->getTestObject()->getId());
                 $question_gui->setObject($question);
                 $question_gui->setQuestionTabs();
-                $gui = new ilLocalUnitConfigurationGUI(
-                    new ilUnitConfigurationRepository($this->testrequest->getQuestionId())
+
+                $this->ctrl->forwardCommand(
+                    new LocalUnitsConfigurationGUI(
+                        $this->units_repository,
+                        $this->lng,
+                        $this->ctrl,
+                        $this->rbac_system,
+                        $this->tpl,
+                        $this->toolbar,
+                        $this->tabs_gui,
+                        $this->help
+                    )
                 );
-                $this->ctrl->forwardCommand($gui);
                 break;
 
             case "ilcommonactiondispatchergui":
@@ -1053,7 +1066,7 @@ protected function forwardCommandToQuestionPreview(
             $gui->setPrimaryCmd(
                 $this->lng->txt('edit_question'),
                 $this->ctrl->getLinkTargetByClass(
-                    get_class($question_gui),
+                    $question_gui::class,
                     'editQuestion'
                 )
             );
diff --git a/components/ILIAS/Test/src/TestDIC.php b/components/ILIAS/Test/src/TestDIC.php
index 3aca83d2cc2e..8f168765fd0b 100755
--- a/components/ILIAS/Test/src/TestDIC.php
+++ b/components/ILIAS/Test/src/TestDIC.php
@@ -20,7 +20,6 @@
 
 namespace ILIAS\Test;
 
-use ILIAS\LegalDocuments\ConsumerToolbox\Setting;
 use ILIAS\Test\Participants\ParticipantRepository;
 use ILIAS\Test\Results\Data\Repository as TestResultRepository;
 use ILIAS\Test\Scoring\Marks\MarkSchemaFactory;
@@ -52,6 +51,7 @@
 use ILIAS\Test\Results\Toplist\TestTopListRepository;
 use ILIAS\TestQuestionPool\Questions\GeneralQuestionPropertiesRepository;
 use ILIAS\TestQuestionPool\RequestDataCollector as QPLRequestDataCollector;
+use ILIAS\Questions\Units\Repository as UnitsRepository;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\DI\Container as ILIASContainer;
 use Pimple\Container as PimpleContainer;
@@ -256,6 +256,12 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic['participant.repository'] = static fn($c): ParticipantRepository =>
             new ParticipantRepository($DIC['ilDB']);
 
+        $dic['units.repository'] = static fn($c): UnitsRepository =>
+            new UnitsRepository(
+                $DIC['lng'],
+                $DIC['ilDB']
+            );
+
         $dic['gui.factory'] = static fn($c): GUIFactory =>
             new GUIFactory($DIC, $c);
 
diff --git a/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestion.php b/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestion.php
index f47d721ccda8..fb96dbfc89c6 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestion.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestion.php
@@ -19,7 +19,9 @@
 declare(strict_types=1);
 
 use ILIAS\TestQuestionPool\Questions\QuestionAutosaveable;
+use ILIAS\TestQuestionPool\QuestionPoolDIC;
 use ILIAS\Test\Logging\AdditionalInformationGenerator;
+use ILIAS\Questions\Units\Repository as UnitsRepository;
 
 /**
  * Class for single choice questions
@@ -33,7 +35,7 @@ class assFormulaQuestion extends assQuestion implements iQuestionCondition, Ques
     private array $variables;
     private array $results;
     private array $resultunits;
-    private ilUnitConfigurationRepository $unitrepository;
+    private UnitsRepository $unitrepository;
     protected PassPresentedVariablesRepo $pass_presented_variables_repo;
 
     public function __construct(
@@ -47,7 +49,7 @@ public function __construct(
         $this->variables = [];
         $this->results = [];
         $this->resultunits = [];
-        $this->unitrepository = new ilUnitConfigurationRepository(0);
+        $this->unitrepository = QuestionPoolDIC::dic()['units.repository'];
         $this->pass_presented_variables_repo = new PassPresentedVariablesRepo($this->db);
     }
 
@@ -705,8 +707,6 @@ public function loadFromDb(int $question_id): void
             } catch (ilTestQuestionPoolException $e) {
             }
 
-            $this->unitrepository = new ilUnitConfigurationRepository($question_id);
-
             $this->setQuestion(ilRTE::_replaceMediaObjectImageSrc((string) $data["question_text"], 1));
 
             // load variables
@@ -1118,7 +1118,7 @@ public function getBestSolution(array $solutions): array
                     isset($available_units[$result_name])
                     && in_array($user_solution[$result_name]['unit'] ?? null, $available_units[$result_name])
                 ) {
-                    $unit_factor = assFormulaQuestionUnit::lookupUnitFactor($user_solution[$result_name]['unit']);
+                    $unit_factor = $this->unitrepository->lookupUnitFactor($user_solution[$result_name]['unit']);
                 }
 
                 try {
@@ -1147,15 +1147,9 @@ public function getBestSolution(array $solutions): array
     public function setId(int $id = -1): void
     {
         parent::setId($id);
-        $this->unitrepository->setConsumerId($this->getId());
-    }
-
-    public function setUnitrepository(\ilUnitConfigurationRepository $unitrepository): void
-    {
-        $this->unitrepository = $unitrepository;
     }
 
-    public function getUnitrepository(): ilUnitConfigurationRepository
+    public function getUnitrepository(): UnitsRepository
     {
         return $this->unitrepository;
     }
diff --git a/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionGUI.php b/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionGUI.php
index fb64672008eb..cf7a895bf786 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionGUI.php
@@ -16,6 +16,7 @@
  *
  *********************************************************************/
 
+use ILIAS\Questions\Units\LocalConfigurationGUI as LocalUnitsConfigurationGUI;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Renderer as UIRenderer;
 
@@ -56,8 +57,17 @@ public function __construct($id = -1)
 
     protected function setQuestionSpecificTabs(ilTabsGUI $ilTabs): void
     {
-        $this->ctrl->setParameterByClass(ilLocalUnitConfigurationGUI::class, 'q_id', $this->object->getId());
-        $ilTabs->addTarget('units', $this->ctrl->getLinkTargetByClass(ilLocalUnitConfigurationGUI::class, ''), '', 'illocalunitconfigurationgui');
+        $this->ctrl->setParameterByClass(
+            LocalUnitsConfigurationGUI::class,
+            'q_id',
+            $this->object->getId()
+        );
+
+        $ilTabs->addTab(
+            'units',
+            $this->lng->txt('units'),
+            $this->ctrl->getLinkTargetByClass(LocalUnitsConfigurationGUI::class, ''),
+        );
     }
 
     public function suggestRange(): void
@@ -221,7 +231,9 @@ public function editQuestion(
         $question->setInfo($this->lng->txt('fq_question_desc'));
 
         $variables = $this->object->getVariables();
-        $categorized_units = $this->object->getUnitrepository()->getCategorizedUnits();
+        $categorized_units = $this->object->getUnitrepository()->getCategorizedUnits(
+            $this->object->getId()
+        );
         $result_units = $this->object->getAllResultUnits();
 
         $unit_options = [];
diff --git a/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionUnit.php b/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionUnit.php
deleted file mode 100755
index 959c8362192a..000000000000
--- a/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionUnit.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-/**
- * Formula Question Unit
- * @author Helmut Schottmüller <helmut.schottmueller@mac.com>
- * @ingroup components\ILIASTestQuestionPool
- */
-class assFormulaQuestionUnit
-{
-    private int $id = 0;
-    private string $unit = '';
-    private float $factor = 0.0;
-    private int $category = 0;
-    private int $sequence = 0;
-    private int $baseunit = 0;
-    private ?string $baseunit_title = null;
-
-    public function initFormArray(array $data): void
-    {
-        $this->id = (int) $data['unit_id'];
-        $this->unit = $data['unit'];
-        $this->factor = (float) $data['factor'];
-        $this->baseunit = (int) $data['baseunit_fi'];
-        $this->baseunit_title = $data['baseunit_title'] ?? null;
-        $this->category = (int) $data['category_fi'];
-        $this->sequence = (int) $data['sequence'];
-    }
-
-    public function setId(int $id): void
-    {
-        $this->id = $id;
-    }
-
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    public function setUnit(string $unit): void
-    {
-        $this->unit = $unit;
-    }
-
-    public function getUnit(): string
-    {
-        return $this->unit;
-    }
-
-    public function getSanitizedUnit(): string
-    {
-        return htmlspecialchars($this->getUnit(), ENT_QUOTES | ENT_SUBSTITUTE, 'utf-8');
-    }
-
-    public function setSequence(int $sequence): void
-    {
-        $this->sequence = $sequence;
-    }
-
-    public function getSequence(): int
-    {
-        return $this->sequence;
-    }
-
-    public function setFactor(float $factor): void
-    {
-        $this->factor = $factor;
-    }
-
-    public function getFactor(): float
-    {
-        return $this->factor;
-    }
-
-    public function setBaseUnit(int $baseunit): void
-    {
-        $this->baseunit = $baseunit;
-    }
-
-    public function getBaseUnit(): int
-    {
-        if ($this->baseunit > 0) {
-            return $this->baseunit;
-        }
-
-        return $this->id;
-    }
-
-    public function setBaseunitTitle(?string $baseunit_title): void
-    {
-        $this->baseunit_title = $baseunit_title;
-    }
-
-    public function getBaseunitTitle(): ?string
-    {
-        return $this->baseunit_title;
-    }
-
-    public function getSanitizedBaseunitTitle(): ?string
-    {
-        return $this->sanitizeString($this->getBaseunitTitle() ?? '');
-    }
-
-    public function setCategory(int $category): void
-    {
-        $this->category = $category;
-    }
-
-    public function getCategory(): int
-    {
-        return $this->category;
-    }
-
-    public function getDisplayString(): string
-    {
-        global $DIC;
-
-        $unit = $this->getUnit();
-        $txt = $DIC->language()->txt("qpl_qst_formulaquestion_{$unit}");
-        return strcmp("-qpl_qst_formulaquestion_{$unit}-", $txt) !== 0
-            ? $this->sanitizeString($txt)
-            : $this->getSanitizedUnit();
-    }
-
-    public static function lookupUnitFactor(int $a_unit_id): float
-    {
-        global $DIC;
-        $ilDB = $DIC['ilDB'];
-
-        $res = $ilDB->queryF(
-            'SELECT factor FROM il_qpl_qst_fq_unit WHERE unit_id = %s',
-            ['integer'],
-            [$a_unit_id]
-        );
-
-        $row = $ilDB->fetchAssoc($res);
-
-        return (float) $row['factor'];
-    }
-
-    private function sanitizeString(string $string): string
-    {
-        return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, 'utf-8');
-    }
-}
diff --git a/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionUnitCategory.php b/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionUnitCategory.php
deleted file mode 100755
index 963c0d7637e5..000000000000
--- a/components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionUnitCategory.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-/**
- * Formula Question Unit Category
- * @author Helmut Schottmüller <helmut.schottmueller@mac.com>
- * @ingroup components\ILIASTestQuestionPool
- */
-class assFormulaQuestionUnitCategory
-{
-    private int $id = 0;
-    private string $category = '';
-    private int $question_fi = 0;
-
-    public function initFormArray(array $data): void
-    {
-        $this->id = (int) $data['category_id'];
-        $this->category = $data['category'];
-        $this->question_fi = (int) $data['question_fi'];
-    }
-
-    public function setId(int $id): void
-    {
-        $this->id = $id;
-    }
-
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    public function setCategory(string $category): void
-    {
-        $this->category = $category;
-    }
-
-    public function getCategory(): string
-    {
-        return $this->category;
-    }
-
-    public function getSanitizedCategory(): string
-    {
-        return $this->sanitizeString($this->getCategory());
-    }
-
-    public function setQuestionFi(int $question_fi): void
-    {
-        $this->question_fi = $question_fi;
-    }
-
-    public function getQuestionFi(): int
-    {
-        return $this->question_fi;
-    }
-
-    public function getDisplayString(): string
-    {
-        global $DIC;
-
-        $category = $this->getCategory();
-        $txt = $DIC->language()->txt("qpl_qst_formulaquestion_{$category}");
-        return strcmp("-qpl_qst_formulaquestion_{$category}-", $txt) !== 0
-            ? $this->sanitizeString($txt)
-            : $this->getSanitizedCategory();
-    }
-
-    private function sanitizeString(string $string): string
-    {
-        return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, 'utf-8');
-    }
-}
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilGlobalUnitConfigurationGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilGlobalUnitConfigurationGUI.php
deleted file mode 100755
index b979ac2e2a63..000000000000
--- a/components/ILIAS/TestQuestionPool/classes/class.ilGlobalUnitConfigurationGUI.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-/**
- * Class ilGlobalUnitConfigurationGUI
- */
-class ilGlobalUnitConfigurationGUI extends ilUnitConfigurationGUI
-{
-    public const REQUEST_PARAM_SUB_CONTEXT = 'context';
-
-    protected function getDefaultCommand(): string
-    {
-        return 'showGlobalUnitCategories';
-    }
-
-    public function getUnitCategoryOverviewCommand(): string
-    {
-        return 'showGlobalUnitCategories';
-    }
-
-    public function isCRUDContext(): bool
-    {
-        return true;
-    }
-
-    public function getUniqueId(): string
-    {
-        return $this->repository->getConsumerId() . '_global';
-    }
-
-    protected function showGlobalUnitCategories(): void
-    {
-        global $DIC;
-
-        $ilToolbar = $DIC->toolbar();
-        $rbacsystem = $DIC->rbac()->system();
-
-        if ($rbacsystem->checkAccess('write', $this->request->getRefId())) {
-            $ilToolbar->addButton($this->lng->txt('un_add_category'), $this->ctrl->getLinkTarget($this, 'showUnitCategoryCreationForm'));
-        }
-
-        parent::showGlobalUnitCategories();
-    }
-
-    protected function showUnitCategories(array $categories): void
-    {
-        $table = new ilGlobalUnitCategoryTableGUI($this, $this->getUnitCategoryOverviewCommand());
-        $table->setData($categories);
-
-        $this->tpl->setContent($table->getHTML());
-    }
-}
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilLocalUnitConfigurationGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilLocalUnitConfigurationGUI.php
deleted file mode 100755
index d9f9e2c43a6c..000000000000
--- a/components/ILIAS/TestQuestionPool/classes/class.ilLocalUnitConfigurationGUI.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-/**
- * Class ilLocalUnitConfigurationGUI
- */
-class ilLocalUnitConfigurationGUI extends ilUnitConfigurationGUI
-{
-    private const REQUEST_PARAM_SUB_CONTEXT_ID = 'question_fi';
-
-    protected function getDefaultCommand(): string
-    {
-        return 'showLocalUnitCategories';
-    }
-
-    public function getUnitCategoryOverviewCommand(): string
-    {
-        if ($this->isCRUDContext()) {
-            return 'showLocalUnitCategories';
-        }
-
-        return 'showGlobalUnitCategories';
-    }
-
-    public function isCRUDContext(): bool
-    {
-        if (!$this->request->isset(self::REQUEST_PARAM_SUB_CONTEXT_ID) ||
-            $this->request->raw(self::REQUEST_PARAM_SUB_CONTEXT_ID) == $this->repository->getConsumerId()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function getUniqueId(): string
-    {
-        $id = $this->repository->getConsumerId();
-        if ($this->isCRUDContext()) {
-            $id .= '_local';
-        } else {
-            $id .= '_global';
-        }
-
-        return $id;
-    }
-
-    public function executeCommand(): void
-    {
-        global $DIC;
-
-        /** @var ilHelpGUI $ilHelp */
-        $ilHelp = $DIC['ilHelp'];
-
-        $this->ctrl->saveParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID);
-
-        $ilHelp->setScreenIdComponent('qpl');
-        parent::executeCommand();
-    }
-
-    protected function handleSubtabs(): void
-    {
-        global $DIC;
-
-        $ilTabs = $DIC->tabs();
-
-        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, $this->repository->getConsumerId());
-        $ilTabs->addSubTab('view_unit_ctx_local', $this->lng->txt('un_local_units'), $this->ctrl->getLinkTarget($this, 'showLocalUnitCategories'));
-        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, 0);
-        $ilTabs->addSubTab('view_unit_ctx_global', $this->lng->txt('un_global_units'), $this->ctrl->getLinkTarget($this, 'showGlobalUnitCategories'));
-        $this->ctrl->setParameter($this, self::REQUEST_PARAM_SUB_CONTEXT_ID, '');
-
-        if ($this->isCRUDContext()) {
-            $ilTabs->activateSubTab('view_unit_ctx_local');
-        } else {
-            $ilTabs->activateSubTab('view_unit_ctx_global');
-        }
-    }
-
-    protected function showLocalUnitCategories(): void
-    {
-        global $DIC;
-
-        $ilToolbar = $DIC->toolbar();
-
-        $ilToolbar->addButton($this->lng->txt('un_add_category'), $this->ctrl->getLinkTarget($this, 'showUnitCategoryCreationForm'));
-
-        $repo = $this->repository;
-        $categories = array_filter(
-            $this->repository->getAllUnitCategories(),
-            static function (assFormulaQuestionUnitCategory $category) use ($repo): bool {
-                return $category->getQuestionFi() === $repo->getConsumerId();
-            }
-        );
-        $data = [];
-        foreach ($categories as $category) {
-            /** @var assFormulaQuestionUnitCategory $category */
-            $data[] = [
-                'category_id' => $category->getId(),
-                'category' => $category->getDisplayString($this->lng)
-            ];
-        }
-
-        $this->showUnitCategories($data);
-    }
-
-    /**
-     * @param array $categories
-     */
-    protected function showUnitCategories(array $categories): void
-    {
-        $table = new ilLocalUnitCategoryTableGUI($this, $this->getUnitCategoryOverviewCommand());
-        $table->setData($categories);
-
-        $this->tpl->setContent($table->getHTML());
-    }
-
-    protected function confirmImportGlobalCategory(): void
-    {
-        if (!$this->request->isset('category_id')) {
-            $this->showGlobalUnitCategories();
-            return;
-        }
-        $this->confirmImportGlobalCategories([$this->request->raw('category_id')]);
-    }
-
-    protected function confirmImportGlobalCategories(array $category_ids): void
-    {
-        // @todo: Confirmation Currently not implemented, so forward to import
-        $category_ids === []
-            ? $this->showGlobalUnitCategories()
-            : $this->importGlobalCategories($category_ids);
-    }
-
-    protected function importGlobalCategories(array $category_ids): void
-    {
-        if ($this->isCRUDContext()) {
-            $this->{$this->getDefaultCommand()}();
-            return;
-        }
-
-        $i = 0;
-        foreach ($category_ids as $category_id) {
-            try {
-                $category = $this->repository->getUnitCategoryById((int) $category_id);
-            } catch (ilException $e) {
-                continue;
-            }
-
-            // Copy admin-category to custom-category (with question_fi)
-            $new_cat_id = $this->repository->copyCategory($category->getId(), $this->repository->getConsumerId());
-
-            // Copy units to custom_category
-            $this->repository->copyUnitsByCategories($category->getId(), $new_cat_id, $this->repository->getConsumerId());
-            ++$i;
-        }
-
-        if ($i) {
-            $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'), true);
-            $this->ctrl->setParameter($this, 'question_fi', $this->request->getQuestionId());
-        }
-
-        $this->ctrl->redirect($this, 'showLocalUnitCategories');
-    }
-}
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php
index 3463a66ac425..a0a78d0396fd 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php
@@ -24,6 +24,8 @@
 use ILIAS\TestQuestionPool\Questions\Presentation\QuestionTable;
 use ILIAS\TestQuestionPool\Questions\GeneralQuestionPropertiesRepository;
 use ILIAS\Test\Settings\GlobalSettings\GlobalTestSettings;
+use ILIAS\Questions\Units\LocalConfigurationGUI as LocalUnitsConfigurationGUI;
+use ILIAS\Questions\Units\Repository as UnitsRepository;
 use ILIAS\Taxonomy\Service;
 use ILIAS\UI\Component\Input\Container\Form\Form;
 use ILIAS\UI\Component\Input\Field\Select;
@@ -54,7 +56,7 @@
  * @ilCtrl_Calls   ilObjQuestionPoolGUI: assNumericGUI, assTextSubsetGUI, assSingleChoiceGUI, ilPropertyFormGUI
  * @ilCtrl_Calls   ilObjQuestionPoolGUI: assTextQuestionGUI, ilObjectMetaDataGUI, ilPermissionGUI, ilObjectCopyGUI
  * @ilCtrl_Calls   ilObjQuestionPoolGUI: ilExportGUI, ilInfoScreenGUI, ilTaxonomySettingsGUI, ilCommonActionDispatcherGUI
- * @ilCtrl_Calls   ilObjQuestionPoolGUI: ilAssQuestionFeedbackEditingGUI, ilLocalUnitConfigurationGUI
+ * @ilCtrl_Calls   ilObjQuestionPoolGUI: ilAssQuestionFeedbackEditingGUI, ILIAS\Questions\Units\LocalConfigurationGUI
  * @ilCtrl_Calls   ilObjQuestionPoolGUI: ilObjQuestionPoolSettingsGeneralGUI, assFormulaQuestionGUI
  * @ilCtrl_Calls   ilObjQuestionPoolGUI: ilAssQuestionPreviewGUI
  * @ilCtrl_Calls   ilObjQuestionPoolGUI: assKprimChoiceGUI, assLongMenuGUI
@@ -95,6 +97,7 @@ class ilObjQuestionPoolGUI extends ilObjectGUI implements ilCtrlBaseClassInterfa
     protected RequestDataCollector $request_data_collector;
     protected GeneralQuestionPropertiesRepository $questionrepository;
     protected GlobalTestSettings $global_test_settings;
+    protected UnitsRepository $units_repository;
 
     public function __construct()
     {
@@ -121,6 +124,7 @@ public function __construct()
         $this->request_data_collector = $local_dic['request_data_collector'];
         $this->questionrepository = $local_dic['question.general_properties.repository'];
         $this->global_test_settings = $local_dic['global_test_settings'];
+        $this->units_repository = $local_dic['units.repository'];
 
         parent::__construct('', $this->request_data_collector->getRefId(), true, false);
 
@@ -337,7 +341,7 @@ public function executeCommand(): void
                 $this->infoScreenForward();
                 break;
 
-            case 'illocalunitconfigurationgui':
+            case strtolower(LocalUnitsConfigurationGUI::class):
                 if (!$this->access->checkAccess('write', '', $this->object->getRefId())) {
                     $this->error->raiseError($this->lng->txt('permission_denied'), $this->error->WARNING);
                 }
@@ -351,8 +355,15 @@ public function executeCommand(): void
                 $question_gui->setQuestionTabs();
 
                 $this->ctrl->setReturn($this, self::DEFAULT_CMD);
-                $gui = new ilLocalUnitConfigurationGUI(
-                    new ilUnitConfigurationRepository($this->request_data_collector->getQuestionId())
+                $gui = new LocalUnitsConfigurationGUI(
+                    $this->units_repository,
+                    $this->lng,
+                    $this->ctrl,
+                    $this->rbac_system,
+                    $this->tpl,
+                    $this->toolbar,
+                    $this->tabs_gui,
+                    $this->help
                 );
                 $this->ctrl->forwardCommand($gui);
                 break;
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php
deleted file mode 100755
index d66a01319e8d..000000000000
--- a/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php
+++ /dev/null
@@ -1,798 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-use ILIAS\TestQuestionPool\QuestionPoolDIC;
-use ILIAS\TestQuestionPool\RequestDataCollector;
-
-/**
- * Class ilUnitConfigurationGUI
- */
-abstract class ilUnitConfigurationGUI
-{
-    protected RequestDataCollector $request;
-    protected ?ilPropertyFormGUI $unit_cat_form = null;
-    protected ?ilPropertyFormGUI $unit_form = null;
-    protected ilGlobalTemplateInterface $tpl;
-    protected ilLanguage $lng;
-    protected ilCtrlInterface $ctrl;
-
-    public function __construct(
-        protected ilUnitConfigurationRepository $repository
-    ) {
-        global $DIC;
-        $this->lng = $DIC->language();
-        $this->ctrl = $DIC->ctrl();
-        $this->tpl = $DIC->ui()->mainTemplate();
-
-        $local_dic = QuestionPoolDIC::dic();
-        $this->request = $local_dic['request_data_collector'];
-
-        $this->lng->loadLanguageModule('assessment');
-    }
-
-    abstract protected function getDefaultCommand(): string;
-
-    abstract public function getUnitCategoryOverviewCommand(): string;
-
-    abstract public function isCRUDContext(): bool;
-
-    abstract public function getUniqueId(): string;
-
-    abstract protected function showUnitCategories(array $categories): void;
-
-    protected function getCategoryById(int $id, bool $for_CRUD = true): assFormulaQuestionUnitCategory
-    {
-        $category = $this->repository->getUnitCategoryById($id);
-        if ($for_CRUD && $category->getQuestionFi() !== $this->repository->getConsumerId()) {
-            $this->tpl->setOnScreenMessage('failure', $this->lng->txt('change_adm_categories_not_allowed'), true);
-            $this->ctrl->redirect($this, $this->getDefaultCommand());
-        }
-
-        return $category;
-    }
-
-    protected function handleSubtabs(): void
-    {
-    }
-
-    protected function checkPermissions(string $cmd): void
-    {
-    }
-
-    public function executeCommand(): void
-    {
-        $cmd = $this->ctrl->getCmd($this->getDefaultCommand());
-        $this->checkPermissions($cmd);
-        match ($cmd) {
-            'confirmImportGlobalCategories' => $this->$cmd($this->request->getUnitCategoryIds()),
-            default => $this->$cmd(),
-        };
-
-        $this->handleSubtabs();
-    }
-
-    protected function confirmDeleteUnit(): void
-    {
-        if (!$this->request->isset('unit_id')) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $this->confirmDeleteUnits([$this->request->int('unit_id')]);
-    }
-
-    /**
-     * @param int[]|null $unit_ids
-     * @return void
-     * @throws ilCtrlException
-     */
-    protected function confirmDeleteUnits(?array $unit_ids = null): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $unit_ids = $unit_ids ?? $this->request->getUnitIds();
-        if (count($unit_ids) === 0) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $this->ctrl->setParameter($this, 'category_id', $this->request->int('category_id'));
-        $confirmation = new ilConfirmationGUI();
-        $confirmation->setFormAction($this->ctrl->getFormAction($this, 'deleteUnits'));
-        $confirmation->setConfirm($this->lng->txt('confirm'), 'deleteUnits');
-        $confirmation->setCancel($this->lng->txt('cancel'), 'showUnitsOfCategory');
-
-        $errors = [];
-        $num_to_confirm = 0;
-        foreach ($unit_ids as $unit_id) {
-            try {
-                $unit = $this->repository->getUnit((int) $unit_id);
-                if (!$unit) {
-                    continue;
-                }
-
-                if ($check_result = $this->repository->checkDeleteUnit($unit->getId())) {
-                    $errors[] = $unit->getDisplayString($this->lng) . ' - ' . $check_result;
-                    continue;
-                }
-
-                $confirmation->addItem(
-                    'unit_ids[]',
-                    (string) $unit->getId(),
-                    $unit->getDisplayString($this->lng)
-                );
-                ++$num_to_confirm;
-            } catch (ilException $e) {
-                continue;
-            }
-        }
-
-        if ($errors) {
-            $num_errors = count($errors);
-
-            $error_message = array_map(static function (string $message): string {
-                return '<li>' . $message . '</li>';
-            }, $errors);
-            if ($num_errors === 1) {
-                $this->tpl->setOnScreenMessage(
-                    'failure',
-                    $this->lng->txt('un_unit_deletion_errors_f_s') . '<ul>' . implode('', $error_message) . '<ul>'
-                );
-            } else {
-                $this->tpl->setOnScreenMessage(
-                    'failure',
-                    $this->lng->txt('un_unit_deletion_errors_f') . '<ul>' . implode('', $error_message) . '<ul>'
-                );
-            }
-        }
-
-        if ($num_to_confirm) {
-            if ($num_to_confirm === 1) {
-                $confirmation->setHeaderText($this->lng->txt('un_sure_delete_units_s'));
-            } else {
-                $confirmation->setHeaderText($this->lng->txt('un_sure_delete_units'));
-            }
-
-            $this->tpl->setContent($confirmation->getHTML());
-        } else {
-            $this->showUnitsOfCategory();
-        }
-    }
-
-    public function deleteUnits(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $unit_ids = $this->request->getUnitIds();
-        if (count($unit_ids) === 0) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $errors = [];
-        $num_deleted = 0;
-        foreach ($unit_ids as $unit_id) {
-            try {
-                $unit = $this->repository->getUnit($unit_id);
-                if (!$unit) {
-                    continue;
-                }
-
-                $check_result = $this->repository->deleteUnit($unit->getId());
-                if (!is_null($check_result)) {
-                    $errors[] = $unit->getDisplayString($this->lng)
-                        . ' - ' . $check_result;
-                    continue;
-                }
-
-                ++$num_deleted;
-            } catch (ilException $e) {
-                continue;
-            }
-        }
-
-        if ($errors) {
-            $num_errors = count($errors);
-
-            $error_message = array_map(static function (string $message): string {
-                return '<li>' . $message . '</li>';
-            }, $errors);
-            if ($num_errors === 1) {
-                $this->tpl->setOnScreenMessage(
-                    'failure',
-                    $this->lng->txt('un_unit_deletion_errors_p_s') . '<ul>' . implode('', $error_message) . '<ul>'
-                );
-            } else {
-                $this->tpl->setOnScreenMessage(
-                    'failure',
-                    $this->lng->txt('un_unit_deletion_errors_p') . '<ul>' . implode('', $error_message) . '<ul>'
-                );
-            }
-        }
-
-        if ($num_deleted) {
-            if ($num_deleted === 1) {
-                $this->tpl->setOnScreenMessage('success', $this->lng->txt('un_deleted_units_s'));
-            } else {
-                $this->tpl->setOnScreenMessage('success', $this->lng->txt('un_deleted_units'));
-            }
-        }
-
-        $this->showUnitsOfCategory();
-    }
-
-    protected function saveOrder(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        if (!$this->request->isset('sequence') || !is_array($this->request->raw('sequence'))) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $sequences = $this->request->raw('sequence');
-        foreach ($sequences as $id => $sequence) {
-            $sorting_value = str_replace(',', '.', $sequence);
-            $sorting_value = (int) $sorting_value * 100;
-            $this->repository->saveUnitOrder((int) $id, $sorting_value);
-        }
-
-        $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
-        $this->showUnitsOfCategory();
-    }
-
-    protected function saveUnit(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $category = $this->getCategoryById($this->request->int('category_id'));
-        $unit = $this->repository->getUnit($this->request->int('unit_id'));
-
-        if ($this->repository->isUnitInUse($unit->getId())) {
-            $this->showUnitModificationForm();
-            return;
-        }
-
-        $this->initUnitForm($category, $unit);
-        if ($this->unit_form->checkInput()) {
-            $unit->setUnit($this->unit_form->getInput('unit_title'));
-            $unit->setFactor((float) $this->unit_form->getInput('factor'));
-            $unit->setBaseUnit((int) $this->unit_form->getInput('base_unit') !== $unit->getId() ? (int) $this->unit_form->getInput('base_unit') : 0);
-            $unit->setCategory($category->getId());
-            $this->repository->saveUnit($unit);
-
-            $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $this->unit_form->setValuesByPost();
-
-        $this->tpl->setContent($this->unit_form->getHtml());
-    }
-
-    protected function showUnitModificationForm(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $category = $this->getCategoryById($this->request->int('category_id'));
-        $unit = $this->repository->getUnit($this->request->int('unit_id'));
-
-        $this->initUnitForm($category, $unit);
-        $this->unit_form->setValuesByArray([
-            'factor' => $unit->getFactor(),
-            'unit_title' => $unit->getUnit(),
-            'base_unit' => $unit->getBaseUnit() !== $unit->getId() ? $unit->getBaseUnit() : 0
-        ]);
-
-        $this->tpl->setContent($this->unit_form->getHtml());
-    }
-
-    protected function addUnit(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $category = $this->getCategoryById($this->request->int('category_id'));
-
-        $this->initUnitForm($category);
-        if ($this->unit_form->checkInput()) {
-            $unit = new assFormulaQuestionUnit();
-            $unit->setUnit($this->unit_form->getInput('unit_title'));
-            $unit->setCategory($category->getId());
-
-            $this->repository->createNewUnit($unit);
-
-            $unit->setBaseUnit((int) $this->unit_form->getInput('base_unit'));
-            $unit->setFactor((float) $this->unit_form->getInput('factor'));
-
-            $this->repository->saveUnit($unit);
-
-            $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $this->unit_form->setValuesByPost();
-
-        $this->tpl->setContent($this->unit_form->getHtml());
-    }
-
-    protected function showUnitCreationForm(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->showUnitsOfCategory();
-            return;
-        }
-
-        $category = $this->getCategoryById($this->request->int('category_id'));
-
-        $this->initUnitForm($category);
-        $this->unit_form->setValuesByArray([
-            'factor' => 1,
-            'unit_title' => $this->lng->txt('unit_placeholder')
-        ]);
-
-        $this->tpl->setContent($this->unit_form->getHtml());
-    }
-
-    protected function initUnitForm(
-        ?assFormulaQuestionUnitCategory $category = null,
-        ?assFormulaQuestionUnit $unit = null
-    ): ilPropertyFormGUI {
-        if ($this->unit_form instanceof ilPropertyFormGUI) {
-            return $this->unit_form;
-        }
-
-        $unit_in_use = false;
-        if ($unit instanceof assFormulaQuestionUnit && $this->repository->isUnitInUse($unit->getId())) {
-            $unit_in_use = true;
-        }
-
-        $this->unit_form = new ilPropertyFormGUI();
-
-        $title = new ilTextInputGUI($this->lng->txt('unit'), 'unit_title');
-        $title->setDisabled($unit_in_use);
-        $title->setRequired(true);
-        $this->unit_form->addItem($title);
-
-        $baseunit = new ilSelectInputGUI($this->lng->txt('baseunit'), 'base_unit');
-        $items = $this->repository->getCategorizedUnits();
-        $options = [];
-        $category_name = '';
-        $new_category = false;
-        foreach ($items as $item) {
-            if (
-                $unit instanceof assFormulaQuestionUnit &&
-                $unit->getId() === $item->getId()
-            ) {
-                continue;
-            }
-
-            if ($item instanceof assFormulaQuestionUnitCategory) {
-                if ($category_name !== $item->getDisplayString($this->lng)) {
-                    $new_category = true;
-                    $category_name = $item->getDisplayString($this->lng);
-                }
-                continue;
-            }
-
-            $options[$item->getId()] = $item->getDisplayString($this->lng)
-                . ($new_category ? ' (' . $category_name . ')' : '');
-            $new_category = false;
-        }
-        $baseunit->setDisabled($unit_in_use);
-        $baseunit->setOptions([0 => $this->lng->txt('no_selection')] + $options);
-        $this->unit_form->addItem($baseunit);
-
-        $factor = new ilNumberInputGUI($this->lng->txt('factor'), 'factor');
-        $factor->setRequired(true);
-        $factor->setSize(3);
-        $factor->setMinValue(0);
-        $factor->allowDecimals(true);
-        $factor->setDisabled($unit_in_use);
-        $this->unit_form->addItem($factor);
-
-        $this->ctrl->setParameterByClass(get_class($this), 'category_id', $this->request->int('category_id'));
-        if (null === $unit) {
-            $this->unit_form->setTitle($this->lng->txt('new_unit'));
-            $this->unit_form->setFormAction($this->ctrl->getFormAction($this, 'addUnit'));
-            $this->unit_form->addCommandButton('addUnit', $this->lng->txt('save'));
-        } else {
-            $this->ctrl->setParameter($this, 'unit_id', $unit->getId());
-            if ($unit_in_use) {
-                $this->unit_form->setFormAction($this->ctrl->getFormAction($this, 'showUnitsOfCategory'));
-            } else {
-                $this->unit_form->addCommandButton('saveUnit', $this->lng->txt('save'));
-                $this->unit_form->setFormAction($this->ctrl->getFormAction($this, 'saveUnit'));
-            }
-            $this->unit_form->setTitle(sprintf(
-                $this->lng->txt('un_sel_cat_sel_unit'),
-                $category->getDisplayString($this->lng),
-                $unit->getDisplayString($this->lng)
-            ));
-        }
-        $this->ctrl->clearParameterByClass(get_class($this), 'category_id');
-
-        $this->unit_form->addCommandButton('showUnitsOfCategory', $this->lng->txt('cancel'));
-        return $this->unit_form;
-    }
-
-    protected function showUnitsOfCategory(): void
-    {
-        global $DIC;
-
-        $ilToolbar = $DIC->toolbar();
-
-        $category = $this->getCategoryById($this->request->int('category_id'), false);
-
-        $this->tpl->addJavaScript("assets/js/Basic.js");
-        $this->tpl->addJavaScript("assets/js/Form.js");
-        $this->lng->loadLanguageModule('form');
-
-        $ilToolbar->addButton(
-            $this->lng->txt('back'),
-            $this->ctrl->getLinkTarget($this, $this->getUnitCategoryOverviewCommand())
-        );
-        if ($this->isCRUDContext()) {
-            $this->ctrl->setParameterByClass(get_class($this), 'category_id', $category->getId());
-            $ilToolbar->addButton(
-                $this->lng->txt('un_add_unit'),
-                $this->ctrl->getLinkTarget($this, 'showUnitCreationForm')
-            );
-            $this->ctrl->clearParameterByClass(get_class($this), 'category_id');
-        }
-        $table = new ilUnitTableGUI($this, 'showUnitsOfCategory', $category);
-        $units = $this->repository->loadUnitsForCategory($category->getId());
-        $data = [];
-        foreach ($units as $unit) {
-            /** @var assFormulaQuestionUnit $unit */
-            $data[] = [
-                'unit_id' => $unit->getId(),
-                'unit' => $unit->getSanitizedUnit(),
-                'baseunit' => $unit->getSanitizedBaseunitTitle(),
-                'baseunit_id' => $unit->getBaseUnit(),
-                'factor' => $unit->getFactor(),
-                'sequence' => $unit->getSequence(),
-            ];
-        }
-        $table->setData($data);
-
-        $this->tpl->setContent($table->getHTML());
-    }
-
-    protected function showGlobalUnitCategories(): void
-    {
-        $categories = array_filter(
-            $this->repository->getAllUnitCategories(),
-            static function (assFormulaQuestionUnitCategory $category): bool {
-                return !$category->getQuestionFi() ? true : false;
-            }
-        );
-        $data = [];
-        foreach ($categories as $category) {
-            /** @var assFormulaQuestionUnitCategory $category */
-            $data[] = [
-                'category_id' => $category->getId(),
-                'category' => $category->getDisplayString($this->lng)
-            ];
-        }
-
-        $this->showUnitCategories($data);
-    }
-
-    protected function confirmDeleteCategory(): void
-    {
-        if (!$this->request->isset('category_id')) {
-            $this->{$this->getUnitCategoryOverviewCommand()}();
-            return;
-        }
-
-        $this->confirmDeleteCategories([$this->request->int('category_id')]);
-    }
-
-    /**
-     * @param int[]|null $category_ids
-     * @return void
-     * @throws ilCtrlException
-     */
-    protected function confirmDeleteCategories(?array $category_ids = null): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->{$this->getDefaultCommand()}();
-            return;
-        }
-
-        $category_ids = $category_ids ?? $this->request->getUnitCategoryIds();
-        if (count($category_ids) === 0) {
-            $this->{$this->getUnitCategoryOverviewCommand()}();
-            return;
-        }
-
-        $confirmation = new ilConfirmationGUI();
-        $confirmation->setFormAction($this->ctrl->getFormAction($this, 'deleteCategories'));
-        $confirmation->setConfirm($this->lng->txt('confirm'), 'deleteCategories');
-        $confirmation->setCancel($this->lng->txt('cancel'), $this->getUnitCategoryOverviewCommand());
-
-        $errors = [];
-        $num_to_confirm = 0;
-        foreach ($category_ids as $category_id) {
-            try {
-                $category = $this->repository->getUnitCategoryById($category_id);
-            } catch (ilException $e) {
-                continue;
-            }
-
-            if (!$this->repository->isCRUDAllowed($category_id)) {
-                $errors[] = $category->getDisplayString($this->lng)
-                    . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
-                continue;
-            }
-
-            $possible_error = $this->repository->checkDeleteCategory($category_id);
-            if (is_string($possible_error) && $possible_error !== '') {
-                $errors[] = $category->getDisplayString($this->lng)
-                    . ' - ' . $possible_error;
-                continue;
-            }
-
-            $confirmation->addItem(
-                'category_ids[]',
-                (string) $category->getId(),
-                $category->getDisplayString()
-            );
-            ++$num_to_confirm;
-        }
-
-        if ($errors) {
-            $num_errors = count($errors);
-
-            $error_message = array_map(static function (string $message): string {
-                return '<li>' . $message . '</li>';
-            }, $errors);
-            if ($num_errors === 1) {
-                $this->tpl->setOnScreenMessage(
-                    'failure',
-                    $this->lng->txt('un_cat_deletion_errors_f_s') . '<ul>' . implode('', $error_message) . '<ul>'
-                );
-            } else {
-                $this->tpl->setOnScreenMessage(
-                    'failure',
-                    $this->lng->txt('un_cat_deletion_errors_f') . '<ul>' . implode('', $error_message) . '<ul>'
-                );
-            }
-        }
-
-        if ($num_to_confirm) {
-            if ($num_to_confirm === 1) {
-                $confirmation->setHeaderText($this->lng->txt('un_sure_delete_categories_s'));
-            } else {
-                $confirmation->setHeaderText($this->lng->txt('un_sure_delete_categories'));
-            }
-
-            $this->tpl->setContent($confirmation->getHTML());
-        } else {
-            $this->{$this->getUnitCategoryOverviewCommand()}();
-        }
-    }
-
-    protected function deleteCategories(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->{$this->getDefaultCommand()}();
-            return;
-        }
-
-        $category_ids = $this->request->getUnitCategoryIds();
-        if (count($category_ids) === 0) {
-            $this->{$this->getUnitCategoryOverviewCommand()}();
-            return;
-        }
-
-        $errors = [];
-        $num_deleted = 0;
-        foreach ($category_ids as $category_id) {
-            try {
-                $category = $this->repository->getUnitCategoryById($category_id);
-            } catch (ilException $e) {
-                continue;
-            }
-
-            if (!$this->repository->isCRUDAllowed($category_id)) {
-                $errors[] = $category->getDisplayString($this->lng)
-                    . ' - ' . $this->lng->txt('change_adm_categories_not_allowed');
-                continue;
-            }
-
-            $possible_error = $this->repository->deleteCategory($category_id);
-            if (is_string($possible_error) && $possible_error !== '') {
-                $errors[] = $category->getDisplayString($this->lng)
-                    . ' - ' . $possible_error;
-                continue;
-            }
-
-            ++$num_deleted;
-        }
-
-        if ($errors) {
-            $num_errors = count($errors);
-
-            $error_message = array_map(static function (string $message): string {
-                return '<li>' . $message . '</li>';
-            }, $errors);
-            if ($num_errors === 1) {
-                $this->tpl->setOnScreenMessage(
-                    'failure',
-                    $this->lng->txt('un_cat_deletion_errors_p_s') . '<ul>' . implode('', $error_message) . '<ul>'
-                );
-            } else {
-                $this->tpl->setOnScreenMessage(
-                    'failure',
-                    $this->lng->txt('un_cat_deletion_errors_p') . '<ul>' . implode('', $error_message) . '<ul>'
-                );
-            }
-        }
-
-        if ($num_deleted) {
-            if ($num_deleted === 1) {
-                $this->tpl->setOnScreenMessage('success', $this->lng->txt('un_deleted_categories_s'));
-            } else {
-                $this->tpl->setOnScreenMessage('success', $this->lng->txt('un_deleted_categories'));
-            }
-        }
-
-        $this->{$this->getUnitCategoryOverviewCommand()}();
-    }
-
-    protected function initUnitCategoryForm(?assFormulaQuestionUnitCategory $cat = null): ilPropertyFormGUI
-    {
-        if ($this->unit_cat_form instanceof ilPropertyFormGUI) {
-            return $this->unit_cat_form;
-        }
-
-        $this->unit_cat_form = new ilPropertyFormGUI();
-
-        $title = new ilTextInputGUI($this->lng->txt('title'), 'category_name');
-        $title->setRequired(true);
-        $this->unit_cat_form->addItem($title);
-
-        if (null === $cat) {
-            $this->unit_cat_form->setTitle($this->lng->txt('new_category'));
-            $this->unit_cat_form->setFormAction($this->ctrl->getFormAction($this, 'addCategory'));
-            $this->unit_cat_form->addCommandButton('addCategory', $this->lng->txt('save'));
-        } else {
-            $this->ctrl->setParameter($this, 'category_id', $cat->getId());
-            $this->unit_cat_form->addCommandButton('saveCategory', $this->lng->txt('save'));
-            $this->unit_cat_form->setFormAction($this->ctrl->getFormAction($this, 'saveCategory'));
-            $this->unit_cat_form->setTitle(
-                sprintf(
-                    $this->lng->txt('selected_category'),
-                    $cat->getDisplayString($this->lng)
-                )
-            );
-        }
-
-        $this->unit_cat_form->addCommandButton($this->getUnitCategoryOverviewCommand(), $this->lng->txt('cancel'));
-        return $this->unit_cat_form;
-    }
-
-    protected function addCategory(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->{$this->getDefaultCommand()}();
-            return;
-        }
-
-        $this->initUnitCategoryForm();
-        if ($this->unit_cat_form->checkInput()) {
-            try {
-                $category = new assFormulaQuestionUnitCategory();
-                $category->setCategory($this->unit_cat_form->getInput('category_name'));
-                $this->repository->saveNewUnitCategory($category);
-                $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
-
-                $this->{$this->getUnitCategoryOverviewCommand()}();
-                return;
-            } catch (ilException $e) {
-                $this->unit_cat_form->getItemByPostVar('category_name')->setAlert($this->lng->txt($e->getMessage()));
-                $this->tpl->setOnScreenMessage('failure', $this->lng->txt('form_input_not_valid'));
-            }
-        }
-
-        $this->unit_cat_form->setValuesByPost();
-
-        $this->tpl->setContent($this->unit_cat_form->getHtml());
-    }
-
-    protected function showUnitCategoryCreationForm(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->{$this->getDefaultCommand()}();
-            return;
-        }
-
-        $this->initUnitCategoryForm();
-
-        $this->tpl->setContent($this->unit_cat_form->getHtml());
-    }
-
-    protected function saveCategory(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->{$this->getDefaultCommand()}();
-            return;
-        }
-
-        $category = $this->getCategoryById($this->request->int('category_id'));
-
-        $this->initUnitCategoryForm($category);
-        if ($this->unit_cat_form->checkInput()) {
-            try {
-                $category->setCategory($this->unit_cat_form->getInput('category_name'));
-                $this->repository->saveCategory($category);
-                $this->tpl->setOnScreenMessage('success', $this->lng->txt('saved_successfully'));
-
-                $this->{$this->getUnitCategoryOverviewCommand()}();
-                return;
-            } catch (ilException $e) {
-                $this->unit_cat_form->getItemByPostVar('category_name')->setAlert($this->lng->txt($e->getMessage()));
-                $this->tpl->setOnScreenMessage('failure', $this->lng->txt('form_input_not_valid'));
-            }
-        }
-
-        $this->unit_cat_form->setValuesByPost();
-
-        $this->tpl->setContent($this->unit_cat_form->getHtml());
-    }
-
-    protected function showUnitCategoryModificationForm(): void
-    {
-        if (!$this->isCRUDContext()) {
-            $this->{$this->getDefaultCommand()}();
-            return;
-        }
-
-        $category = $this->getCategoryById($this->request->int('category_id'));
-
-        $this->initUnitCategoryForm($category);
-        $this->unit_cat_form->setValuesByArray([
-            'category_name' => $category->getCategory()
-        ]);
-
-        $this->tpl->setContent($this->unit_cat_form->getHtml());
-    }
-}
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationRepository.php b/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationRepository.php
deleted file mode 100755
index 3f8ddeb4a8f8..000000000000
--- a/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationRepository.php
+++ /dev/null
@@ -1,739 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-/**
- * Class ilUnitConfigurationRepository
- */
-class ilUnitConfigurationRepository
-{
-    protected int $consumer_id = 0;
-    protected ilLanguage $lng;
-    protected ilDBInterface $db;
-    /** @var assFormulaQuestionUnit[] */
-    private array $units = [];
-    /** @var assFormulaQuestionUnit[]|assFormulaQuestionUnitCategory[]  */
-    private array $categorizedUnits = [];
-
-    public function __construct(int $consumer_id)
-    {
-        global $DIC;
-
-        $lng = $DIC->language();
-
-        $this->db = $DIC->database();
-        $this->consumer_id = $consumer_id;
-        $this->lng = $lng;
-    }
-
-    public function setConsumerId(int $consumer_id): void
-    {
-        $this->consumer_id = $consumer_id;
-    }
-
-    public function getConsumerId(): int
-    {
-        return $this->consumer_id;
-    }
-
-    public function isCRUDAllowed(int $category_id): bool
-    {
-        $res = $this->db->queryF(
-            'SELECT * FROM il_qpl_qst_fq_ucat WHERE category_id = %s',
-            ['integer'],
-            [$category_id]
-        );
-        $row = $this->db->fetchAssoc($res);
-        return isset($row['question_fi']) && (int) $row['question_fi'] === $this->getConsumerId();
-    }
-
-    public function copyCategory(int $category_id, int $question_fi, ?string $category_name = null): int
-    {
-        $res = $this->db->queryF(
-            'SELECT category FROM il_qpl_qst_fq_ucat WHERE category_id = %s',
-            ['integer'],
-            [$category_id]
-        );
-        $row = $this->db->fetchAssoc($res);
-
-        if (null === $category_name) {
-            $category_name = $row['category'];
-        }
-
-        $next_id = $this->db->nextId('il_qpl_qst_fq_ucat');
-        $this->db->insert(
-            'il_qpl_qst_fq_ucat',
-            [
-                'category_id' => ['integer', $next_id],
-                'category' => ['text', $category_name],
-                'question_fi' => ['integer', (int) $question_fi]
-            ]
-        );
-
-        return $next_id;
-    }
-
-    public function copyUnitsByCategories(int $from_category_id, int $to_category_id, int $qustion_fi): void
-    {
-        $res = $this->db->queryF(
-            'SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
-            ['integer'],
-            [$from_category_id]
-        );
-        $i = 0;
-        $units = [];
-        while ($row = $this->db->fetchAssoc($res)) {
-            $next_id = $this->db->nextId('il_qpl_qst_fq_unit');
-
-            $units[$i]['old_unit_id'] = $row['unit_id'];
-            $units[$i]['new_unit_id'] = $next_id;
-
-            $this->db->insert(
-                'il_qpl_qst_fq_unit',
-                [
-                    'unit_id' => ['integer', $next_id],
-                    'unit' => ['text', $row['unit']],
-                    'factor' => ['float', $row['factor']],
-                    'baseunit_fi' => ['integer', (int) $row['baseunit_fi']],
-                    'category_fi' => ['integer', (int) $to_category_id],
-                    'sequence' => ['integer', (int) $row['sequence']],
-                    'question_fi' => ['integer', (int) $qustion_fi]
-                ]
-            );
-            $i++;
-        }
-
-        foreach ($units as $unit) {
-            //update unit : baseunit_fi
-            $this->db->update(
-                'il_qpl_qst_fq_unit',
-                ['baseunit_fi' => ['integer', (int) $unit['new_unit_id']]],
-                [
-                    'baseunit_fi' => ['integer', $unit['old_unit_id']],
-                    'category_fi' => ['integer', $to_category_id]
-                ]
-            );
-
-            //update var : unit_fi
-            $this->db->update(
-                'il_qpl_qst_fq_var',
-                ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
-                [
-                    'unit_fi' => ['integer', $unit['old_unit_id']],
-                    'question_fi' => ['integer', $qustion_fi]
-                ]
-            );
-
-            //update res : unit_fi
-            $this->db->update(
-                'il_qpl_qst_fq_res',
-                ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
-                [
-                    'unit_fi' => ['integer', $unit['old_unit_id']],
-                    'question_fi' => ['integer', $qustion_fi]
-                ]
-            );
-
-            //update res_unit : unit_fi
-            $this->db->update(
-                'il_qpl_qst_fq_res_unit',
-                ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
-                [
-                    'unit_fi' => ['integer', $unit['old_unit_id']],
-                    'question_fi' => ['integer', $qustion_fi]
-                ]
-            );
-        }
-    }
-
-    public function getCategoryUnitCount(int $id): int
-    {
-        $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s",
-            ['integer'],
-            [$id]
-        );
-
-        return $this->db->numRows($result);
-    }
-
-    public function isUnitInUse(int $id): bool
-    {
-        $result_1 = $this->db->queryF(
-            "SELECT unit_fi FROM il_qpl_qst_fq_res_unit WHERE unit_fi = %s",
-            ['integer'],
-            [$id]
-        );
-
-        $result_2 = $this->db->queryF(
-            "SELECT unit_fi FROM il_qpl_qst_fq_var WHERE unit_fi = %s",
-            ['integer'],
-            [$id]
-        );
-        $result_3 = $this->db->queryF(
-            "SELECT unit_fi FROM il_qpl_qst_fq_res WHERE unit_fi = %s",
-            ['integer'],
-            [$id]
-        );
-
-        $cnt_1 = $this->db->numRows($result_1);
-        $cnt_2 = $this->db->numRows($result_2);
-        $cnt_3 = $this->db->numRows($result_3);
-
-        return $cnt_1 > 0 || $cnt_2 > 0 || $cnt_3 > 0;
-    }
-
-    public function checkDeleteCategory(int $id): ?string
-    {
-        $res = $this->db->queryF(
-            'SELECT unit_id FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
-            ['integer'],
-            [$id]
-        );
-
-        if ($this->db->numRows($res)) {
-            while ($row = $this->db->fetchAssoc($res)) {
-                $unit_res = $this->checkDeleteUnit((int) $row['unit_id'], $id);
-                if (!is_null($unit_res)) {
-                    return $unit_res;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public function deleteUnit(int $id): ?string
-    {
-        $res = $this->checkDeleteUnit($id);
-        if (!is_null($res)) {
-            return $res;
-        }
-
-        $affectedRows = $this->db->manipulateF(
-            "DELETE FROM il_qpl_qst_fq_unit WHERE unit_id = %s",
-            ['integer'],
-            [$id]
-        );
-
-        if ($affectedRows > 0) {
-            $this->clearUnits();
-        }
-
-        return null;
-    }
-
-    protected function loadUnits(): void
-    {
-        $result = $this->db->query(
-            "
-			SELECT units.*, il_qpl_qst_fq_ucat.category, baseunits.unit baseunit_title
-			FROM il_qpl_qst_fq_unit units
-			INNER JOIN il_qpl_qst_fq_ucat ON il_qpl_qst_fq_ucat.category_id = units.category_fi
-			LEFT JOIN il_qpl_qst_fq_unit baseunits ON baseunits.unit_id = units.baseunit_fi
-			ORDER BY il_qpl_qst_fq_ucat.category, units.sequence"
-        );
-
-        if ($this->db->numRows($result)) {
-            while ($row = $this->db->fetchAssoc($result)) {
-                $unit = new assFormulaQuestionUnit();
-                $unit->initFormArray($row);
-                $this->addUnit($unit);
-            }
-        }
-    }
-
-    /**
-     * @return assFormulaQuestionUnit[]|assFormulaQuestionUnitCategory[]
-     */
-    public function getCategorizedUnits(): array
-    {
-        if (count($this->categorizedUnits) === 0) {
-            $result = $this->db->queryF(
-                "
-				SELECT	units.*, il_qpl_qst_fq_ucat.category, il_qpl_qst_fq_ucat.question_fi, baseunits.unit baseunit_title
-				FROM	il_qpl_qst_fq_unit units
-				INNER JOIN il_qpl_qst_fq_ucat ON il_qpl_qst_fq_ucat.category_id = units.category_fi
-				LEFT JOIN il_qpl_qst_fq_unit baseunits ON baseunits.unit_id = units.baseunit_fi
-				WHERE	units.question_fi = %s
-				ORDER BY il_qpl_qst_fq_ucat.category, units.sequence",
-                ['integer'],
-                [$this->getConsumerId()]
-            );
-
-            if ($this->db->numRows($result) > 0) {
-                $category = 0;
-                while ($row = $this->db->fetchAssoc($result)) {
-                    $unit = new assFormulaQuestionUnit();
-                    $unit->initFormArray($row);
-
-                    if ($category !== $unit->getCategory()) {
-                        $cat = new assFormulaQuestionUnitCategory();
-                        $cat->initFormArray([
-                            'category_id' => (int) $row['category_fi'],
-                            'category' => $row['category'],
-                            'question_fi' => (int) $row['question_fi'],
-                        ]);
-                        $this->categorizedUnits[] = $cat;
-                        $category = $unit->getCategory();
-                    }
-
-                    $this->categorizedUnits[] = $unit;
-                }
-            }
-        }
-
-        return $this->categorizedUnits;
-    }
-
-    protected function clearUnits(): void
-    {
-        $this->units = [];
-    }
-
-    protected function addUnit(assFormulaQuestionUnit $unit): void
-    {
-        $this->units[$unit->getId()] = $unit;
-    }
-
-    /**
-     * @return assFormulaQuestionUnit[]
-     */
-    public function getUnits(): array
-    {
-        if (count($this->units) === 0) {
-            $this->loadUnits();
-        }
-        return $this->units;
-    }
-
-    /**
-     * @param int $category
-     * @return assFormulaQuestionUnit[]
-     */
-    public function loadUnitsForCategory(int $category): array
-    {
-        global $DIC;
-        $ilDB = $DIC['ilDB'];
-
-        $units = [];
-        $result = $ilDB->queryF(
-            "SELECT units.*, baseunits.unit baseunit_title, il_qpl_qst_fq_ucat.category
-			FROM il_qpl_qst_fq_unit units
-			INNER JOIN il_qpl_qst_fq_ucat ON il_qpl_qst_fq_ucat.category_id = units.category_fi
-			LEFT JOIN il_qpl_qst_fq_unit baseunits ON baseunits.unit_id = units.baseunit_fi
-			WHERE il_qpl_qst_fq_ucat.category_id = %s
-			ORDER BY units.sequence",
-            ['integer'],
-            [$category]
-        );
-
-        if ($result->numRows() > 0) {
-            while ($row = $ilDB->fetchAssoc($result)) {
-                $unit = new assFormulaQuestionUnit();
-                $unit->initFormArray($row);
-                $units[] = $unit;
-            }
-        }
-
-        return $units;
-    }
-
-    /**
-     * @param int $id
-     * @return assFormulaQuestionUnit|null
-     */
-    public function getUnit(int $id): ?assFormulaQuestionUnit
-    {
-        if (count($this->units) === 0) {
-            $this->loadUnits();
-        }
-
-        if (array_key_exists($id, $this->units)) {
-            return $this->units[$id];
-        }
-
-        // Maybe this is a new unit, reload $this->units
-
-        $this->loadUnits();
-
-        return $this->units[$id] ?? null;
-    }
-
-    /**
-     * @return array<int, array{value: int, text: string, qst_id: int}>
-     */
-    public function getUnitCategories(): array
-    {
-        $categories = [];
-        $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi > %s ORDER BY category",
-            ['integer'],
-            [0]
-        );
-
-        if ($this->db->numRows($result)) {
-            while ($row = $this->db->fetchAssoc($result)) {
-                $value = strcmp('-qpl_qst_formulaquestion_' . $row['category'] . '-', $this->lng->txt($row['category'])) === 0
-                    ? $row['category']
-                    : $this->lng->txt($row['category']);
-
-                if (trim($row['category']) !== '') {
-                    $cat = [
-                        'value' => (int) $row['category_id'],
-                        'text' => $value,
-                        'qst_id' => (int) $row['question_fi']
-                    ];
-                    $categories[(int) $row['category_id']] = $cat;
-                }
-            }
-        }
-
-        return $categories;
-    }
-
-    /**
-     * @return array<int, array{value: int, text: string, qst_id: int}>
-     */
-    public function getAdminUnitCategories(): array
-    {
-        $categories = [];
-
-        $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi = %s  ORDER BY category",
-            ['integer'],
-            [0]
-        );
-
-        if ($result = $this->db->numRows($result)) {
-            while ($row = $this->db->fetchAssoc($result)) {
-                $value = strcmp('-qpl_qst_formulaquestion_' . $row['category'] . '-', $this->lng->txt($row['category'])) === 0
-                    ? $row['category']
-                    : $this->lng->txt($row['category']);
-
-                if (trim($row['category']) !== '') {
-                    $cat = [
-                        'value' => (int) $row['category_id'],
-                        'text' => $value,
-                        'qst_id' => (int) $row['question_fi']
-                    ];
-                    $categories[(int) $row['category_id']] = $cat;
-                }
-            }
-        }
-
-        return $categories;
-    }
-
-    public function saveUnitOrder(int $unit_id, int $sequence): void
-    {
-        $this->db->manipulateF(
-            'UPDATE il_qpl_qst_fq_unit SET sequence = %s WHERE unit_id = %s AND question_fi = %s',
-            ['integer', 'integer', 'integer'],
-            [$sequence, $unit_id, $this->getConsumerId()]
-        );
-    }
-
-    public function checkDeleteUnit(int $id, ?int $category_id = null): ?string
-    {
-        $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_var WHERE unit_fi = %s",
-            ['integer'],
-            [$id]
-        );
-        if ($this->db->numRows($result) > 0) {
-            return $this->lng->txt("err_unit_in_variables");
-        }
-
-        $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_res WHERE unit_fi = %s",
-            ['integer'],
-            [$id]
-        );
-        if ($this->db->numRows($result) > 0) {
-            return $this->lng->txt("err_unit_in_results");
-        }
-
-        if (!is_null($category_id)) {
-            $result = $this->db->queryF(
-                "SELECT * FROM il_qpl_qst_fq_unit WHERE baseunit_fi = %s AND category_fi != %s",
-                ['integer', 'integer', 'integer'],
-                [$id, $id, $category_id]
-            );
-        } else {
-            $result = $this->db->queryF(
-                "SELECT * FROM il_qpl_qst_fq_unit WHERE baseunit_fi = %s AND unit_id != %s",
-                ['integer', 'integer'],
-                [$id, $id]
-            );
-        }
-
-        if ($this->db->numRows($result) > 0) {
-            return $this->lng->txt("err_unit_is_baseunit");
-        }
-
-        return null;
-    }
-
-    public function getUnitCategoryById(int $id): assFormulaQuestionUnitCategory
-    {
-        $query = 'SELECT * FROM il_qpl_qst_fq_ucat WHERE category_id = ' . $this->db->quote($id, 'integer');
-        $res = $this->db->query($query);
-        if (!$this->db->numRows($res)) {
-            throw new ilException('un_category_not_exist');
-        }
-
-        $row = $this->db->fetchAssoc($res);
-        $category = new assFormulaQuestionUnitCategory();
-        $category->initFormArray($row);
-        return $category;
-    }
-
-    public function saveCategory(assFormulaQuestionUnitCategory $category): void
-    {
-        $res = $this->db->queryF(
-            'SELECT * FROM il_qpl_qst_fq_ucat WHERE category = %s AND question_fi = %s AND category_id != %s',
-            ['text', 'integer', 'integer'],
-            [$category->getCategory(), $this->getConsumerId(), $category->getId()]
-        );
-        if ($this->db->numRows($res)) {
-            throw new ilException('err_wrong_categoryname');
-        }
-
-        $this->db->manipulateF(
-            'UPDATE il_qpl_qst_fq_ucat SET category = %s WHERE question_fi = %s AND category_id = %s',
-            ['text', 'integer', 'integer'],
-            [$category->getCategory(), $this->getConsumerId(), $category->getId()]
-        );
-    }
-
-    public function saveNewUnitCategory(assFormulaQuestionUnitCategory $category): void
-    {
-        $res = $this->db->queryF(
-            'SELECT category FROM il_qpl_qst_fq_ucat WHERE category = %s AND question_fi = %s',
-            ['text', 'integer'],
-            [$category->getCategory(), $this->getConsumerId()]
-        );
-        if ($this->db->numRows($res)) {
-            throw new ilException('err_wrong_categoryname');
-        }
-
-        $next_id = $this->db->nextId('il_qpl_qst_fq_ucat');
-        $this->db->manipulateF(
-            "INSERT INTO il_qpl_qst_fq_ucat (category_id, category, question_fi) VALUES (%s, %s, %s)",
-            ['integer', 'text', 'integer'],
-            [
-                $next_id,
-                $category->getCategory(),
-                $this->getConsumerId()
-            ]
-        );
-        $category->setId($next_id);
-    }
-
-    /**
-     * @return assFormulaQuestionUnitCategory[]
-     */
-    public function getAllUnitCategories(): array
-    {
-        $categories = [];
-        $result = $this->db->queryF(
-            "SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi = %s OR question_fi = %s ORDER BY category",
-            ['integer', 'integer'],
-            [$this->getConsumerId(), 0]
-        );
-
-        if ($result->numRows() > 0) {
-            while ($row = $this->db->fetchAssoc($result)) {
-                $category = new assFormulaQuestionUnitCategory();
-                $category->initFormArray($row);
-                $categories[] = $category;
-            }
-        }
-        return $categories;
-    }
-
-    public function deleteCategory(int $id): ?string
-    {
-        $res = $this->checkDeleteCategory($id);
-        if (!is_null($res)) {
-            return $this->lng->txt('err_category_in_use');
-        }
-
-        $res = $this->db->queryF(
-            'SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
-            ['integer'],
-            [$id]
-        );
-        while ($row = $this->db->fetchAssoc($res)) {
-            $this->deleteUnit((int) $row['unit_id']);
-        }
-
-        $ar = $this->db->manipulateF(
-            'DELETE FROM il_qpl_qst_fq_ucat WHERE category_id = %s',
-            ['integer'],
-            [$id]
-        );
-
-        if ($ar > 0) {
-            $this->clearUnits();
-        }
-
-        return null;
-    }
-
-    public function createNewUnit(assFormulaQuestionUnit $unit): void
-    {
-        $next_id = $this->db->nextId('il_qpl_qst_fq_unit');
-        $this->db->manipulateF(
-            'INSERT INTO il_qpl_qst_fq_unit (unit_id, unit, factor, baseunit_fi, category_fi, sequence, question_fi) VALUES (%s, %s, %s, %s, %s, %s, %s)',
-            ['integer', 'text', 'float', 'integer', 'integer', 'integer', 'integer'],
-            [
-                $next_id,
-                $unit->getUnit(),
-                1,
-                0,
-                $unit->getCategory(),
-                0,
-                $this->getConsumerId()
-            ]
-        );
-        $unit->setId($next_id);
-        $unit->setFactor(1.0);
-        $unit->setBaseUnit(0);
-        $unit->setSequence(0);
-
-        $this->clearUnits();
-    }
-
-    public function saveUnit(assFormulaQuestionUnit $unit): void
-    {
-        $res = $this->db->queryF(
-            'SELECT unit_id FROM il_qpl_qst_fq_unit WHERE unit_id = %s',
-            ['integer'],
-            [$unit->getId()]
-        );
-        if ($this->db->numRows($res)) {
-            $row = $this->db->fetchAssoc($res);
-
-            if ($unit->getBaseUnit() === 0 || $unit->getBaseUnit() === $unit->getId()) {
-                $unit->setFactor(1);
-            }
-
-            $ar = $this->db->manipulateF(
-                'UPDATE il_qpl_qst_fq_unit SET unit = %s, factor = %s, baseunit_fi = %s, category_fi = %s, sequence = %s WHERE unit_id = %s AND question_fi = %s',
-                ['text', 'float', 'integer', 'integer', 'integer', 'integer', 'integer'],
-                [
-                    $unit->getUnit(), $unit->getFactor(), (int) $unit->getBaseUnit(),
-                    $unit->getCategory(),
-                    $unit->getSequence(),
-                    $unit->getId(),
-                    $this->getConsumerId()
-                ]
-            );
-            if ($ar > 0) {
-                $this->clearUnits();
-            }
-        }
-    }
-
-    public function cloneUnits(int $from_consumer_id, int $to_consumer_id): void
-    {
-        $category_mapping = [];
-
-        $res = $this->db->queryF("SELECT * FROM il_qpl_qst_fq_ucat WHERE question_fi = %s", ['integer'], [$from_consumer_id]);
-        while ($row = $this->db->fetchAssoc($res)) {
-            $new_category_id = $this->copyCategory((int) $row['category_id'], $to_consumer_id);
-            $category_mapping[$row['category_id']] = $new_category_id;
-        }
-
-        foreach ($category_mapping as $old_category_id => $new_category_id) {
-            $res = $this->db->queryF(
-                'SELECT * FROM il_qpl_qst_fq_unit WHERE category_fi = %s',
-                ['integer'],
-                [$old_category_id]
-            );
-
-            $i = 0;
-            $units = [];
-            while ($row = $this->db->fetchAssoc($res)) {
-                $next_id = $this->db->nextId('il_qpl_qst_fq_unit');
-
-                $units[$i]['old_unit_id'] = $row['unit_id'];
-                $units[$i]['new_unit_id'] = $next_id;
-
-                $this->db->insert(
-                    'il_qpl_qst_fq_unit',
-                    [
-                        'unit_id' => ['integer', $next_id],
-                        'unit' => ['text', $row['unit']],
-                        'factor' => ['float', $row['factor']],
-                        'baseunit_fi' => ['integer', (int) $row['baseunit_fi']],
-                        'category_fi' => ['integer', (int) $new_category_id],
-                        'sequence' => ['integer', (int) $row['sequence']],
-                        'question_fi' => ['integer', $to_consumer_id]
-                    ]
-                );
-                $i++;
-            }
-
-            foreach ($units as $unit) {
-                //update unit : baseunit_fi
-                $this->db->update(
-                    'il_qpl_qst_fq_unit',
-                    ['baseunit_fi' => ['integer', (int) $unit['new_unit_id']]],
-                    [
-                        'baseunit_fi' => ['integer', (int) $unit['old_unit_id']],
-                        'question_fi' => ['integer', $to_consumer_id]
-                    ]
-                );
-
-                //update var : unit_fi
-                $this->db->update(
-                    'il_qpl_qst_fq_var',
-                    ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
-                    [
-                        'unit_fi' => ['integer', (int) $unit['old_unit_id']],
-                        'question_fi' => ['integer', $to_consumer_id]
-                    ]
-                );
-
-                //update res : unit_fi
-                $this->db->update(
-                    'il_qpl_qst_fq_res',
-                    ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
-                    [
-                        'unit_fi' => ['integer', (int) $unit['old_unit_id']],
-                        'question_fi' => ['integer', $to_consumer_id]
-                    ]
-                );
-
-                //update res_unit : unit_fi
-                $this->db->update(
-                    'il_qpl_qst_fq_res_unit',
-                    ['unit_fi' => ['integer', (int) $unit['new_unit_id']]],
-                    [
-                        'unit_fi' => ['integer', (int) $unit['old_unit_id']],
-                        'question_fi' => ['integer', $to_consumer_id]
-                    ]
-                );
-            }
-        }
-    }
-}
diff --git a/components/ILIAS/TestQuestionPool/classes/import/qti12/class.assFormulaQuestionImport.php b/components/ILIAS/TestQuestionPool/classes/import/qti12/class.assFormulaQuestionImport.php
index 5fb30a0a6003..96da2fea617a 100755
--- a/components/ILIAS/TestQuestionPool/classes/import/qti12/class.assFormulaQuestionImport.php
+++ b/components/ILIAS/TestQuestionPool/classes/import/qti12/class.assFormulaQuestionImport.php
@@ -130,7 +130,6 @@ public function fromXML(
 
     private function importUnitsAndUnitCategories(ilQTIItem $item): void
     {
-        /** @var ilUnitConfigurationRepository $unit_repository */
         $unit_repository = $this->object->getUnitrepository();
         foreach ($item->getUnitCategoryObjets() as $unit_category) {
             $old_category_id = $unit_category->getId();
diff --git a/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitCategoryTableGUI.php b/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitCategoryTableGUI.php
index 6cd8241ff53a..7f187b4db19f 100755
--- a/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitCategoryTableGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitCategoryTableGUI.php
@@ -32,12 +32,8 @@ abstract class ilUnitCategoryTableGUI extends ilTable2GUI
     private RequestDataCollector $request;
     private \ILIAS\Refinery\Factory $refinery;
 
-    /**
-     * @param ilUnitConfigurationGUI $controller
-     * @param string                 $cmd
-     */
     public function __construct(
-        ConfigurationGUI|ilUnitConfigurationGUI $controller,
+        ConfigurationGUI $controller,
         $cmd
     ) {
         /**
diff --git a/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitTableGUI.php b/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitTableGUI.php
index e5e75a078a82..e544df1e6dc7 100755
--- a/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitTableGUI.php
+++ b/components/ILIAS/TestQuestionPool/classes/tables/class.ilUnitTableGUI.php
@@ -31,15 +31,10 @@ class ilUnitTableGUI extends ilTable2GUI
     private \ILIAS\UI\Factory $ui_factory;
     private \ILIAS\UI\Renderer $ui_renderer;
 
-    /**
-     * @param ilUnitConfigurationGUI         $controller
-     * @param string                         $default_cmd
-     * @param assFormulaQuestionUnitCategory $category
-     */
     public function __construct(
-        ConfigurationGUI|ilUnitConfigurationGUI $controller,
+        ConfigurationGUI $controller,
         string $default_cmd,
-        Category|assFormulaQuestionUnitCategory $category
+        Category $category
     ) {
         /**
          * @var $ilCtrl ilCtrl
diff --git a/components/ILIAS/TestQuestionPool/src/QuestionPoolDIC.php b/components/ILIAS/TestQuestionPool/src/QuestionPoolDIC.php
index f2cce4c0a366..076303cabad8 100755
--- a/components/ILIAS/TestQuestionPool/src/QuestionPoolDIC.php
+++ b/components/ILIAS/TestQuestionPool/src/QuestionPoolDIC.php
@@ -28,6 +28,7 @@
 use ILIAS\Test\Participants\ParticipantRepository;
 use ILIAS\Test\Settings\GlobalSettings\Repository as GlobalTestSettingsRepository;
 use ILIAS\Test\Settings\GlobalSettings\GlobalTestSettings;
+use ILIAS\Questions\Units\Repository as UnitsRepository;
 
 class QuestionPoolDIC extends PimpleContainer
 {
@@ -65,7 +66,15 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic['participant_repository'] = static fn($c): ParticipantRepository =>
             new ParticipantRepository($DIC['ilDB']);
         $dic['global_test_settings'] = static fn($c): GlobalTestSettings =>
-            (new GlobalTestSettingsRepository($DIC['ilSetting'], new \ilSetting('assessment')))->getGlobalSettings();
+            (new GlobalTestSettingsRepository(
+                $DIC['ilSetting'],
+                new \ilSetting('assessment')
+            ))->getGlobalSettings();
+        $dic['units.repository'] = static fn($c): UnitsRepository =>
+            new UnitsRepository(
+                $DIC['lng'],
+                $DIC['ilDB']
+            );
 
         return $dic;
     }

From 7a71f585986b34adefde2cedb5a8d73c758a0205 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 8 Jan 2026 11:22:18 +0100
Subject: [PATCH 095/141] Implement Answer Form Editing

---
 .../Administration/class.ilObjQuestions.php   |   6 +-
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  11 +-
 .../Legacy/PageEditor/QstsQuestionPage.php    |  18 +-
 .../PageEditor/class.QstsQuestionPageGUI.php  |   3 -
 .../PageEditor/class.ilPCAnswerForm.php       |  48 ++--
 .../PageEditor/class.ilPCAnswerFormGUI.php    |  29 ++-
 .../src/AnswerForm/Capabilities/Feedback.php  |  10 +-
 .../src/AnswerForm/Capabilities/Marking.php   |   5 +-
 .../src/AnswerForm/Capabilities/Skills.php    |   4 +-
 .../Questions/src/AnswerForm/Definition.php   |  14 +-
 .../Questions/src/AnswerForm/Persistence.php  |   4 +
 .../Questions/src/AnswerForm/Properties.php   |  21 +-
 .../src/AnswerForm/TypeGenericProperties.php  |  15 +-
 .../Questions/src/AnswerForm/Views/Edit.php   |   6 +-
 .../src/AnswerForm/Views/Participant.php      |   1 +
 .../Cloze/Capabilities/Feedback.php           |  14 +-
 .../Cloze/Capabilities/Marking.php            |  10 +-
 .../Cloze/Capabilities/Skills.php             |   7 +-
 .../src/AnswerFormTypes/Cloze/Definition.php  |  26 ++-
 .../Cloze/Layout/OverviewTable.php            | 109 +++++++++
 .../src/AnswerFormTypes/Cloze/Persistence.php |   5 +
 .../Cloze/Properties/ClozeText/Factory.php    |  15 +-
 .../Cloze/Properties/ClozeText/Text.php       |  23 +-
 .../Definitions/ScoringIdentical.php          |   5 +-
 .../Properties/{AnswerForm => }/Factory.php   |  11 +-
 .../Gaps/AnswerOptions/AnswerOption.php       |  37 ++-
 .../Gaps/AnswerOptions/AnswerOptions.php      |  55 ++++-
 .../Properties/Gaps/AnswerOptions/Factory.php |  13 +-
 .../Cloze/Properties/Gaps/Factory.php         |  52 +++--
 .../Cloze/Properties/Gaps/Gap.php             |  38 +++-
 .../Cloze/Properties/Gaps/Gaps.php            | 162 ++++++++++---
 .../Cloze/Properties/Gaps/LongMenu.php        |   7 +-
 .../Cloze/Properties/Gaps/Numeric.php         |  21 +-
 .../Cloze/Properties/Gaps/Select.php          |  16 +-
 .../Cloze/Properties/Gaps/Text.php            |   8 +-
 .../Cloze/Properties/Gaps/Type.php            |  23 +-
 .../Gaps/class.UploadAnswerOptionsGUI.php     |  19 +-
 .../{AnswerForm => }/Properties.php           |  80 ++++++-
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 214 +++++++++++-------
 .../Cloze/Views/Participant.php               |   3 +-
 components/ILIAS/Questions/src/Collector.php  |  17 +-
 .../Questions/src/Persistence/CoreTables.php  |   8 +-
 .../Questions/src/Persistence/Delete.php      |  30 ++-
 .../Questions/src/Persistence/Insert.php      |  12 +-
 .../ILIAS/Questions/src/Persistence/Join.php  |   3 +-
 .../Questions/src/Persistence/Manipulate.php  |  13 +-
 .../src/Persistence/ManipulationType.php      |   1 +
 .../Questions/src/Persistence/Operator.php    |  14 +-
 .../ILIAS/Questions/src/Persistence/Query.php |  32 +--
 .../Questions/src/Persistence/Replace.php     |   1 +
 .../Questions/src/Persistence/Repository.php  | 101 +++++----
 .../Questions/src/Persistence/Storable.php    |   9 +-
 .../src/Persistence/TableNameSpaceCore.php    |   1 +
 .../Questions/src/Persistence/Update.php      |  37 ++-
 .../ILIAS/Questions/src/Persistence/Value.php |  20 +-
 .../ILIAS/Questions/src/Persistence/Where.php |   2 +-
 .../{Layout => }/Definitions/CarryWrapper.php |  13 +-
 .../{Layout => }/Definitions/Environment.php  |  23 +-
 .../Definitions/EnvironmentImplementation.php | 103 +++++++--
 .../{Layout => }/Definitions/Leaf.php         |   2 +-
 .../src/Presentation/Layout/Async.php         |  53 +++++
 .../Layout/{Definitions => }/EditForm.php     |  28 ++-
 .../Layout/{Definitions => }/EditOverview.php |  44 ++--
 .../Layout/{Definitions => }/Factory.php      |  36 ++-
 .../Layout/GlobalScreen/LayoutProvider.php    |  35 ++-
 .../{Definitions => }/QuestionsTable.php      |  55 +++--
 .../Questions/src/Presentation/Views/Edit.php | 183 +++++++++++----
 .../Definitions/TextMatchingOptions.php       |  10 +-
 .../ILIAS/Questions/src/Question/Question.php |   1 -
 .../src/Question/QuestionImplementation.php   |  38 +++-
 .../Questions/src/Question/Views/Edit.php     |  13 +-
 .../src/Question/Views/Participant.php        |  20 +-
 .../Questions/src/Response/Repository.php     |  15 +-
 .../ILIAS/Questions/src/Response/Response.php |  12 +-
 .../ILIAS/Questions/src/Setup/Agent.php       |  12 +-
 .../src/Setup/ClozeQuestionTables.php         |   6 +-
 .../src/Setup/OverarchingQuestionTables.php   |   6 +-
 77 files changed, 1577 insertions(+), 600 deletions(-)
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/{AnswerForm => }/Factory.php (91%)
 rename components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/{AnswerForm => }/Properties.php (82%)
 rename components/ILIAS/Questions/src/Presentation/{Layout => }/Definitions/CarryWrapper.php (84%)
 rename components/ILIAS/Questions/src/Presentation/{Layout => }/Definitions/Environment.php (67%)
 rename components/ILIAS/Questions/src/Presentation/{Layout => }/Definitions/EnvironmentImplementation.php (63%)
 rename components/ILIAS/Questions/src/Presentation/{Layout => }/Definitions/Leaf.php (92%)
 create mode 100644 components/ILIAS/Questions/src/Presentation/Layout/Async.php
 rename components/ILIAS/Questions/src/Presentation/Layout/{Definitions => }/EditForm.php (82%)
 rename components/ILIAS/Questions/src/Presentation/Layout/{Definitions => }/EditOverview.php (62%)
 rename components/ILIAS/Questions/src/Presentation/Layout/{Definitions => }/Factory.php (72%)
 rename components/ILIAS/Questions/src/Presentation/Layout/{Definitions => }/QuestionsTable.php (79%)

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestions.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestions.php
index cb2e27c8333f..b2cb613898d0 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestions.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestions.php
@@ -20,8 +20,10 @@
 
 class ilObjQuestions extends ilObject
 {
-    public function __construct(int $id = 0, bool $referenced = true)
-    {
+    public function __construct(
+        int $id = 0,
+        bool $referenced = true
+    ) {
         $this->type = 'qsts';
         parent::__construct($id, $referenced);
     }
diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index ab24b197fa43..f7c478bdef70 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -25,7 +25,7 @@
 use ILIAS\Questions\Persistence\TableNameSpaceCore;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\Presentation\Views\Edit;
-use ILIAS\Questions\Presentation\Layout\Definitions\Factory as DefinitionsFactory;
+use ILIAS\Questions\Presentation\Layout\Factory as DefinitionsFactory;
 use ILIAS\Questions\Units\Repository as UnitsRepository;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Factory as UuidFactory;
@@ -73,6 +73,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic[DefinitionsFactory::class] = static fn($c): DefinitionsFactory =>
             new DefinitionsFactory(
                 $DIC['ui.factory'],
+                $DIC['http'],
                 $DIC['lng']
             );
         $dic[Edit::class] = static fn($c): Edit => new Edit(
@@ -130,8 +131,8 @@ protected static function buildDIC(ILIASContainer $DIC): self
                     )
                 ]
             );
-        $dic[Cloze\Properties\AnswerForm\Factory::class] = static fn($c): Cloze\Properties\AnswerForm\Factory
-            => new Cloze\Properties\AnswerForm\Factory(
+        $dic[Cloze\Properties\Factory::class] = static fn($c): Cloze\Properties\Factory
+            => new Cloze\Properties\Factory(
                 $c[Cloze\Properties\ClozeText\Factory::class],
                 $c[Cloze\Properties\Gaps\Factory::class]
             );
@@ -145,14 +146,14 @@ protected static function buildDIC(ILIASContainer $DIC): self
                 $DIC['ui.factory'],
                 $DIC['refinery'],
                 $DIC['http'],
-                $c[Cloze\Properties\AnswerForm\Factory::class],
+                $c[Cloze\Properties\Factory::class],
                 $c[Cloze\Properties\ClozeText\Factory::class],
                 $c[Cloze\Properties\Gaps\Factory::class]
             );
         $dic[Cloze\Views\Participant::class] = static fn($c): Cloze\Views\Participant
             => new Cloze\Views\Participant();
         $dic[Cloze\Definition::class] = static fn($c): Cloze\Definition => new Cloze\Definition(
-            $c[Cloze\Properties\AnswerForm\Factory::class],
+            $c[Cloze\Properties\Factory::class],
             $c[Cloze\Persistence::class],
             [
                 Cloze\Capabilities\Marking::class => new Cloze\Capabilities\Marking(),
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
index b600e179ed02..9e23acb982f2 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
@@ -18,36 +18,26 @@
 
 declare(strict_types=1);
 
-use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Question\QuestionImplementation;
 
 class QstsQuestionPage extends ilPageObject
 {
-    private readonly Edit $edit_view;
     private readonly QuestionImplementation $question;
 
+    #[\Override]
     public function getParentType(): string
     {
         return 'qsts';
     }
 
-    public function getEditView(): Edit
-    {
-        return $this->edit_view;
-    }
-
-    public function setEditView(Edit $edit_view): void
-    {
-        $this->edit_view = $edit_view;
-    }
-
     public function getQuestion(): QuestionImplementation
     {
         return $this->question;
     }
 
-    public function setQuestion(QuestionImplementation $question): void
-    {
+    public function setQuestion(
+        QuestionImplementation $question
+    ): void {
         $this->question = $question;
     }
 }
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
index ee196302261c..a8fc70bf1189 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
@@ -18,7 +18,6 @@
 
 declare(strict_types=1);
 
-use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\URI;
 
@@ -31,12 +30,10 @@ class QstsQuestionPageGUI extends ilPageObjectGUI
 {
     public function __construct(
         private readonly URI $return_uri,
-        Edit $edit_view,
         QuestionImplementation $question
     ) {
         parent::__construct('qsts', $question->getPageId());
         $this->obj->setQuestion($question);
-        $this->obj->setEditView($edit_view);
         $this->setEnabledPageFocus(false);
     }
 
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
index b5be94a4d7f7..d299680c0d69 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
@@ -18,6 +18,9 @@
 
 declare(strict_types=1);
 
+use ILIAS\Questions\Legacy\LocalDIC;
+use ILIAS\Questions\Persistence\Repository;
+use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
 
 class ilPCAnswerForm extends ilPageContent
@@ -31,11 +34,13 @@ public function init(): void
         $this->setType('answf');
     }
 
+    #[\Override]
     public static function getLangVars(): array
     {
         return ['ed_insert_pcqst', 'empty_question', 'pc_qst'];
     }
 
+    #[\Override]
     public function modifyPageContentPostXsl(
         string $output,
         string $mode,
@@ -51,14 +56,16 @@ public function modifyPageContentPostXsl(
         return mb_ereg_replace_callback(
             self::ANSWER_FORM_PLACEHOLDER,
             fn(array $matches): string => $question
-                ->getAnswerFormByIdString($matches[1])?->getTypeGenericProperties()
+                ->getAnswerFormPropertiesByIdString($matches[1])?->getTypeGenericProperties()
                 ->getAdditionalText() ?? '',
             $output
         );
     }
 
-    public function getCssFiles(string $a_mode): array
-    {
+    #[\Override]
+    public function getCssFiles(
+        string $a_mode
+    ): array {
         if ($this->getPage()->getPageConfig()->getEnableSelfAssessment()) {
             return array("./components/ILIAS/TestQuestionPool/resources/js/dist/question_handling.css",
                 "components/ILIAS/TestQuestionPool/templates/default/test_javascript.css");
@@ -66,17 +73,7 @@ public function getCssFiles(string $a_mode): array
         return array();
     }
 
-    public function create(
-        Uuid $answer_form_id
-    ): void {
-        $this->createInitialChildNode(
-            $this->hier_id,
-            '',
-            self::ANSWER_FORM_ELEMENT_TAG,
-            [self::ANSWER_FORM_ID_ATTRIBUTE => $answer_form_id->toString()]
-        );
-    }
-
+    #[\Override]
     public static function afterPageUpdate(
         ilPageObject $page,
         DOMDocument $domdoc,
@@ -89,6 +86,7 @@ public static function afterPageUpdate(
 
         global $DIC;
         $dom_util = $DIC->copage()->internal()->domain()->domUtil();
+        $question_repository = LocalDIC::dic()[Repository::class];
 
         /** @var \ILIAS\Questions\Question\QuestionImplementation $question */
         $question = $page->getQuestion();
@@ -97,8 +95,13 @@ public static function afterPageUpdate(
         foreach ($dom_util->path($domdoc, '//AnswerForm') as $node) {
             $answer_forms[] = $node->getAttribute(self::ANSWER_FORM_ID_ATTRIBUTE);
         }
+
+        $question_repository->update(
+            [$question->withoutDeletedAnswerForms($answer_forms)]
+        );
     }
 
+    #[\Override]
     public static function handleCopiedContent(
         DOMDocument $a_domdoc,
         bool $a_self_ass = true,
@@ -154,4 +157,21 @@ public static function handleCopiedContent(
             }
         }
     }
+
+    public function create(
+        Uuid $answer_form_id
+    ): void {
+        $this->createInitialChildNode(
+            $this->hier_id,
+            '',
+            self::ANSWER_FORM_ELEMENT_TAG,
+            [self::ANSWER_FORM_ID_ATTRIBUTE => $answer_form_id->toString()]
+        );
+    }
+
+    public function getAnswerFormIdStringFromAttribute(): string
+    {
+        return $this->getChildNode()->attributes
+                ->getNamedItem(self::ANSWER_FORM_ID_ATTRIBUTE)->nodeValue;
+    }
 }
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
index d46608aab8b1..0f27f5076102 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
@@ -18,6 +18,8 @@
 
 declare(strict_types=1);
 
+use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\Legacy\LocalDIC;
 use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\UI\Renderer as UIRenderer;
@@ -30,6 +32,7 @@ class ilPCAnswerFormGUI extends ilPageContentGUI
     private readonly ilTabsGUI $tabs;
     private readonly UIRenderer $ui_renderer;
     private readonly DataFactory $data_factory;
+    private readonly AnswerFormFactory $answer_form_factory;
     private readonly Edit $edit_view;
 
     public function __construct(
@@ -43,8 +46,12 @@ public function __construct(
         $this->ui_renderer = $DIC['ui.renderer'];
         $this->data_factory = new DataFactory();
 
+        $local_dic = LocalDIC::dic();
+        $this->answer_form_factory = $local_dic[AnswerFormFactory::class];
+        $this->edit_view = $local_dic[Edit::class];
+
+
         parent::__construct($pg_obj, $content_obj, $hier_id, $pc_id);
-        $this->edit_view = $this->pg_obj->getEditView();
     }
 
     public function executeCommand()
@@ -71,16 +78,24 @@ public function insertCmd(): void
 
     public function editCmd(): void
     {
-        $this->setInsertTabs();
-        $content_obj = new ilPCAnswerForm($this->pg_obj);
-        $content_obj->setHierId($this->hier_id);
+        $this->setEditTabs();
+
+        /** @var \ILIAS\Questions\Question\QuestionImplementation $question */
+        $question = $this->pg_obj->getQuestion();
+        $answer_form_properties = $question->getAnswerFormPropertiesByIdString(
+            $this->getContentObject()->getAnswerFormIdStringFromAttribute()
+        );
+
         $this->tpl->setContent(
             $this->edit_view->editAnswerForm(
                 $this->data_factory->uri(
-                    ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'insert')
+                    ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'edit')
                 ),
-                $this->pg_obj->getQuestion(),
-                $content_obj
+                $question,
+                $answer_form_properties,
+                $this->answer_form_factory->getDefinitionForClass(
+                    $answer_form_properties->getDefinitionClass()
+                )
             )->render($this->ui_renderer)
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Feedback.php b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Feedback.php
index b2268af3f4ae..8da8607347e7 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Feedback.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Feedback.php
@@ -24,6 +24,12 @@
 
 interface Feedback extends Capability
 {
-    public function getGeneralFeedback(Response $response): array;
-    public function getSpecificFeedback(Response $response, string $answer_id): array;
+    public function getGeneralFeedback(
+        Response $response
+    ): array;
+
+    public function getSpecificFeedback(
+        Response $response,
+        string $answer_id
+    ): array;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Marking.php b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Marking.php
index c01031fce58a..73f28e03c4d0 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Marking.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Marking.php
@@ -24,6 +24,9 @@
 
 interface Marking extends Capability
 {
-    public function addAchievedPointsToResponse(Response $response): Response;
+    public function addAchievedPointsToResponse(
+        Response $response
+    ): Response;
+
     public function getBestResponse(): Response;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Skills.php b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Skills.php
index 9af7f1e5a4e9..4273cd894f10 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Capabilities/Skills.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Capabilities/Skills.php
@@ -24,5 +24,7 @@
 
 interface Skills extends Capability
 {
-    public function getSkillPointsForResponse(Response $response): float;
+    public function getSkillPointsForResponse(
+        Response $response
+    ): float;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Definition.php b/components/ILIAS/Questions/src/AnswerForm/Definition.php
index e623a00b8b98..865ab114013f 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Definition.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Definition.php
@@ -25,19 +25,27 @@
 use ILIAS\Questions\AnswerForm\Views\Participant;
 use ILIAS\Questions\AnswerForm\Persistence;
 use ILIAS\Questions\Persistence\Query;
-use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Language\Language;
 
 interface Definition
 {
     public function getLabel(Language $lng): string;
+
     public function buildProperties(
         TypeGenericProperties $type_generic_properties,
         ?Query $query
     ): Properties;
     public function getPersistence(): Persistence;
-    public function hasCapability(string $capability_class_name): bool;
-    public function getCapability(string $capability_class_name): ?Capability;
+
+    public function hasCapability(
+        string $capability_class_name
+    ): bool;
+
+    public function getCapability(
+        string $capability_class_name
+    ): ?Capability;
+
     public function getEditView(): Edit;
+
     public function getParticipantView(): Participant;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Persistence.php b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
index 958aeeaa860b..c12d6eccaded 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
@@ -29,22 +29,26 @@
 interface Persistence
 {
     public function getPublicNameSpace(): TableNameSpace;
+
     public function getColumns(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
         ?string $table_identifier = null,
         array $columns_to_skip = []
     ): array;
+
     public function getIdColumn(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
         ?string $table_identifier = null
     ): Column;
+
     public function getForeignKeyColumn(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
         ?string $table_identifier = null
     ): Column;
+
     public function completeQuery(
         Query $query,
         Column $base_table_id_column,
diff --git a/components/ILIAS/Questions/src/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerForm/Properties.php
index 6897d1d0b1ab..9b0fee40d282 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Properties.php
@@ -21,15 +21,32 @@
 namespace ILIAS\Questions\AnswerForm;
 
 use ILIAS\Questions\Persistence\Storable;
+use ILIAS\Questions\Presentation\Definitions\Environment;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
+use ILIAS\UI\Component\Table\Factory as TableFactory;
+use ILIAS\UI\Component\Table\Data as DataTable;
+use ILIAS\UI\Component\Table\Ordering as OrderingTable;
+use Psr\Http\Message\ServerRequestInterface;
 
 interface Properties extends Storable
 {
-    public function getAnswerFormId(): ?Uuid;
-    public function getQuestionId(): ?Uuid;
+    public function getDefinitionClass(): string;
+
+    public function getAnswerFormId(): Uuid;
+
+    public function getQuestionId(): Uuid;
+
     public function getTypeGenericProperties(): TypeGenericProperties;
+
     public function getBasicPropertiesForListing(
         Language $lng
     ): array;
+
+    public function getOverviewTable(
+        TableFactory $table_factory,
+        Language $lng,
+        ServerRequestInterface $request,
+        Environment $environment
+    ): DataTable|OrderingTable;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
index da716c041d08..7f78c29fc7da 100644
--- a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
@@ -99,13 +99,17 @@ public function toDelete(
         Manipulate $manipulate
     ): Manipulate {
         $answer_form_table_definition = CoreTables::AnswerForms;
+
         return $manipulate->withAdditionalStatement(
             new Delete(
                 $answer_form_table_definition->getTable(),
                 [
                     new Where(
                         $answer_form_table_definition->getIdColumn(),
-                        $this->answer_form_id->toString()
+                        new Value(
+                            \ilDBConstants::T_TEXT,
+                            $this->answer_form_id->toString()
+                        )
                     )
                 ]
             )
@@ -142,14 +146,17 @@ private function buildUpdateStatement(): Update
             ]),
             [
                 new Value(\ilDBConstants::T_FLOAT, $this->available_points),
-                new Value(\ilDBConstants::T_INT, $this->image_size),
-                new Value(\ilDBConstants::T_INT, $this->shuffle_answer_options ? 1 : 0),
+                new Value(\ilDBConstants::T_INTEGER, $this->image_size),
+                new Value(\ilDBConstants::T_INTEGER, $this->shuffle_answer_options ? 1 : 0),
                 new Value(\ilDBConstants::T_TEXT, $this->additional_text)
 
             ],
             new Where(
                 $answer_form_table_definition->getIdColumn(),
-                $this->answer_form_id->toString()
+                new Value(
+                    \ilDBConstants::T_TEXT,
+                    $this->answer_form_id->toString()
+                )
             )
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
index 4d76d2c80a98..76e6705616a7 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
@@ -21,9 +21,9 @@
 namespace ILIAS\Questions\AnswerForm\Views;
 
 use ILIAS\Questions\AnswerForm\Properties;
-use ILIAS\Questions\Presentation\Layout\Definitions\EditForm;
-use ILIAS\Questions\Presentation\Layout\Definitions\EditOverview;
-use ILIAS\Questions\Presentation\Layout\Definitions\Environment;
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Questions\Presentation\Layout\EditForm;
+use ILIAS\Questions\Presentation\Layout\EditOverview;
 
 interface Edit
 {
diff --git a/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php b/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php
index 9bd7e2c1d7bc..3d4a18056e5f 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php
@@ -25,6 +25,7 @@
 interface Participant
 {
     public function isAsyncPresentationAvailable(): bool;
+
     public function get(
         ?Response $response
     ): array;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
index f7e6c9176f32..2bedec07703c 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Feedback.php
@@ -25,18 +25,24 @@
 
 class Feedback implements FeedbackInterface
 {
+    #[\Override]
     public function isConfigured(): bool
     {
         return false;
     }
 
-    public function getGeneralFeedback(Response $response): array
-    {
+    #[\Override]
+    public function getGeneralFeedback(
+        Response $response
+    ): array {
 
     }
 
-    public function getSpecificFeedback(Response $response, string $answer_id): array
-    {
+    #[\Override]
+    public function getSpecificFeedback(
+        Response $response,
+        string $answer_id
+    ): array {
 
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
index 97a3a1ee3812..947979f5abfc 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Marking.php
@@ -22,20 +22,24 @@
 
 use ILIAS\Questions\AnswerForm\Capabilities\Marking as MarkingInterface;
 use ILIAS\Questions\Response\Response;
-use ILIAS\Questions\AnswerForm;
 
 class Marking implements MarkingInterface
 {
+    #[\Override]
     public function isConfigured(): bool
     {
         return false;
     }
 
-    public function addAchievedPointsToResponse(Response $response): Response
-    {
+
+    #[\Override]
+    public function addAchievedPointsToResponse(
+        Response $response
+    ): Response {
 
     }
 
+    #[\Override]
     public function getBestResponse(): Response
     {
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php
index 0e3ff7fead41..eb7380fb3d32 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Capabilities/Skills.php
@@ -25,13 +25,16 @@
 
 class Skills implements SkillsInterface
 {
+    #[\Override]
     public function isConfigured(): bool
     {
         return false;
     }
 
-    public function getSkillPointsForResponse(Response $response): float
-    {
+    #[\Override]
+    public function getSkillPointsForResponse(
+        Response $response
+    ): float {
 
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
index 8242d8f66026..18967e1e3c3a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Definition.php
@@ -24,8 +24,8 @@
 use ILIAS\Questions\AnswerForm\Capabilities\Capability;
 use ILIAS\Questions\AnswerForm\Persistence;
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Factory as PropertiesFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Edit;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Participant;
 use ILIAS\Questions\Persistence\Query;
@@ -45,11 +45,14 @@ public function __construct(
     ) {
     }
 
-    public function getLabel(Language $lng): string
-    {
+    #[\Override]
+    public function getLabel(
+        Language $lng
+    ): string {
         return $lng->txt('assClozeTest');
     }
 
+    #[\Override]
     public function buildProperties(
         TypeGenericProperties $type_generic_data,
         ?Query $query
@@ -60,26 +63,33 @@ public function buildProperties(
         );
     }
 
+    #[\Override]
     public function getPersistence(): Persistence
     {
         return $this->persistence;
     }
 
-    public function hasCapability(string $capability_class_name): bool
-    {
+    #[\Override]
+    public function hasCapability(
+        string $capability_class_name
+    ): bool {
         return array_key_exists($capability_class_name, $this->available_capabilities);
     }
 
-    public function getCapability(string $capability_class_name): ?Capability
-    {
+    #[\Override]
+    public function getCapability(
+        string $capability_class_name
+    ): ?Capability {
         return $this->available_capabilities[$capability_class_name];
     }
 
+    #[\Override]
     public function getEditView(): Edit
     {
         return $this->edit_view;
     }
 
+    #[\Override]
     public function getParticipantView(): Participant
     {
         return $this->participant_view;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
new file mode 100644
index 000000000000..748aa24f3645
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Layout;
+
+use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Edit;
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Data\Range;
+use ILIAS\Data\Order;
+use ILIAS\Language\Language;
+use ILIAS\UI\Component\Table\Factory as TableFactory;
+use ILIAS\UI\Component\Table\Data as DataTable;
+use ILIAS\UI\Component\Table\DataRetrieval;
+use ILIAS\UI\Component\Table\DataRowBuilder;
+use Psr\Http\Message\ServerRequestInterface;
+
+class OverviewTable implements DataRetrieval
+{
+    public function __construct(
+        private readonly TableFactory $table_factory,
+        private readonly Language $lng,
+        private readonly ServerRequestInterface $request,
+        private readonly Environment $environment
+    ) {
+    }
+
+    public function getTable(): DataTable
+    {
+        return $this->table_factory->data(
+            $this,
+            $this->lng->txt('gaps'),
+            $this->getColums()
+        )->withActions($this->getActions())
+        ->withRequest($this->request);
+    }
+
+    #[\Override]
+    public function getRows(
+        DataRowBuilder $row_builder,
+        array $visible_column_ids,
+        Range $range,
+        Order $order,
+        mixed $additional_viewcontrol_data,
+        mixed $filter_data,
+        mixed $additional_parameters
+    ): \Generator {
+        yield from $this->environment->getAnswerFormProperties()->getGaps()
+            ->toTableRows($row_builder, $this->lng);
+    }
+
+    #[\Override]
+    public function getTotalRowCount(
+        mixed $additional_viewcontrol_data,
+        mixed $filter_data,
+        mixed $additional_parameters
+    ): ?int {
+        return 0;
+    }
+
+    private function getColums(): array
+    {
+        $f = $this->table_factory->column();
+
+        return [
+            'gap' => $f->text($this->lng->txt('title')),
+            'type' => $f->text($this->lng->txt('question_type')),
+            'answers_options_awarding_points' => $f->text($this->lng->txt('answer_options_awarding_points')),
+            'available_points' => $f->number($this->lng->txt('available_points'))
+        ];
+    }
+
+    private function getActions(): array
+    {
+        return [
+            'edit_gaps' => $this->table_factory->action()->standard(
+                $this->lng->txt('edit_gaps'),
+                ...$this->environment->getUrlBuilderWithStepParameter(Edit::STEP_SET_GAP_TYPES)
+                    ->acquireParameter(Edit::PARAMETER_NAMESPACE, Edit::OVERVIEW_TABLE_ROW_ID)
+            ),
+            'edit_answer_options' => $this->table_factory->action()->standard(
+                $this->lng->txt('edit_answer_options'),
+                ...$this->environment->getUrlBuilderWithStepParameter(Edit::STEP_SET_ANSWER_OPTIONS)
+                    ->acquireParameter(Edit::PARAMETER_NAMESPACE, Edit::OVERVIEW_TABLE_ROW_ID)
+            ),
+            'edit_points' => $this->table_factory->action()->standard(
+                $this->lng->txt('edit_available_points'),
+                ...$this->environment->getUrlBuilderWithStepParameter(Edit::STEP_SET_POINTS)
+                    ->acquireParameter(Edit::PARAMETER_NAMESPACE, Edit::OVERVIEW_TABLE_ROW_ID)
+            )
+        ];
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
index 256706b6a3b7..e20ba498ad78 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
@@ -81,11 +81,13 @@ public function __construct(
     ) {
     }
 
+    #[\Override]
     public function getPublicNameSpace(): TableNameSpace
     {
         return $this->table_namespace;
     }
 
+    #[\Override]
     public function getColumns(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
@@ -108,6 +110,7 @@ public function getColumns(
         );
     }
 
+    #[\Override]
     public function getIdColumn(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
@@ -125,6 +128,7 @@ public function getIdColumn(
         };
     }
 
+    #[\Override]
     public function getForeignKeyColumn(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
@@ -150,6 +154,7 @@ public function getForeignKeyColumn(
         };
     }
 
+    #[\Override]
     public function completeQuery(
         Query $query,
         Column $answer_form_id_column
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
index 1d722fbdfc64..55e2ac30a4c6 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
@@ -33,8 +33,9 @@ public function __construct(
     ) {
     }
 
-    public function buildFromTextString(string $text): Text
-    {
+    public function buildFromTextString(
+        string $text
+    ): Text {
         return new Text(
             $this->refinery,
             $this->mustache_engine,
@@ -43,13 +44,15 @@ public function buildFromTextString(string $text): Text
         );
     }
 
-    public function buildFromHiddenInputString(string $text): Text
-    {
+    public function buildFromHiddenInputString(
+        string $text
+    ): Text {
         return $this->buildFromTextString($this->unmaskTextFromOutputInHiddenInput($text));
     }
 
-    private function unmaskTextFromOutputInHiddenInput(string $text): string
-    {
+    private function unmaskTextFromOutputInHiddenInput(
+        string $text
+    ): string {
         return str_replace(['\{\{', '\}\}'], ['{{', '}}'], $text);
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 49ca76b35e41..92b11995b52a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -65,8 +65,9 @@ public function getInput(
         ->withValue($this->cloze_text->getRawRepresentation());
     }
 
-    public function getCarryInputs(FieldFactory $ff): HiddenInput
-    {
+    public function getCarryInputs(
+        FieldFactory $ff
+    ): HiddenInput {
         return $ff->hidden()->withValue($this->getTextForOutputInHiddenInput());
     }
 
@@ -95,7 +96,7 @@ public function updateGapsFromMarkdown(
         $position = 0;
         return array_reduce(
             $this->mustache_engine->getTokenizer()->scan($this->cloze_text->getRawRepresentation()),
-            function (Gaps $c, array $v) use ($answer_form_id, &$position): Gaps {
+            function (Gaps $c, array $v) use ($answer_form_id, $pre_existing_gaps, &$position): Gaps {
                 if ($v['type'] !== '_v'
                     || !str_starts_with($v['name'], Gap::GAP_PLACEHOLDER_NAME)) {
                     return $c;
@@ -105,14 +106,11 @@ function (Gaps $c, array $v) use ($answer_form_id, &$position): Gaps {
                     return $c->withNewGap($answer_form_id, $position++);
                 }
 
-                $gap = $c->getGapByTagName($v['name']);
+                $gap = $pre_existing_gaps->getGapByTagName($v['name']);
                 if ($gap !== null) {
                     return $c->withGap(
-                        $gap->withProperties(
-                            $gap->getProperties()->withPosition(
-                                $answer_form_id,
-                                $position++
-                            )
+                        $gap->withPosition(
+                            $position++
                         )
                     );
                 }
@@ -123,12 +121,13 @@ function (Gaps $c, array $v) use ($answer_form_id, &$position): Gaps {
                     $position++
                 );
             },
-            $pre_existing_gaps
+            $pre_existing_gaps->withResetGaps()
         );
     }
 
-    public function withIdsOfNewGapsInClozeText(array $new_gaps): self
-    {
+    public function withIdsOfNewGapsInClozeText(
+        array $new_gaps
+    ): self {
         if ($new_gaps === []) {
             return self;
         }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php
index a67115f323e3..5a1903432530 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Definitions/ScoringIdentical.php
@@ -53,8 +53,9 @@ public static function buildInput(
         );
     }
 
-    private static function buildOptionsList(Language $lng): array
-    {
+    private static function buildOptionsList(
+        Language $lng
+    ): array {
         return array_reduce(
             self::cases(),
             function (array $c, self $v) use ($lng): array {
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
similarity index 91%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
index 1e0904d5872a..1af814aa370e 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties;
 
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
@@ -49,7 +49,9 @@ public function fromData(
                     $type_generic_properties->getAdditionalText()
                 ),
                 $type_generic_properties->getAdditionalTextLegacy(),
-                $this->gaps_factory->getEmptyGapsObject()
+                $this->gaps_factory->getEmptyGapsObject(
+                    $type_generic_properties->getAnswerFormId()
+                )
             );
         }
 
@@ -75,7 +77,10 @@ public function fromData(
                 $type_generic_properties->getAdditionalText()
             ),
             $type_generic_properties->getAdditionalTextLegacy(),
-            $this->gaps_factory->fromDatabase($query),
+            $this->gaps_factory->fromDatabase(
+                $type_generic_properties->getAnswerFormId(),
+                $query
+            ),
             $scoring_identical_responses,
             $combinations_activated
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
index 0c8d1132bf44..451b33371706 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
@@ -21,10 +21,7 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions;
 
 use ILIAS\Questions\Persistence\Replace;
-use ILIAS\Questions\Persistence\TableNameBuilder;
-use ILIAS\Questions\Persistence\TableTypes;
 use ILIAS\Questions\Persistence\Value;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Data\UUID\Uuid;
 
 class AnswerOption
@@ -57,8 +54,9 @@ public function getPosition(): ?int
         return $this->position;
     }
 
-    public function withPosition(int $position): self
-    {
+    public function withPosition(
+        int $position
+    ): self {
         $clone = clone $this;
         $clone->position = $position;
         return $clone;
@@ -69,8 +67,9 @@ public function getTextValue(): string
         return $this->text_value;
     }
 
-    public function withTextValue(string $text_value): self
-    {
+    public function withTextValue(
+        string $text_value
+    ): self {
         $clone = clone $this;
         $clone->text_value = $text_value;
         return $clone;
@@ -81,8 +80,9 @@ public function getLowerLimit(): ?float
         return $this->lower_limit;
     }
 
-    public function withLowerLimit(float $lower_limit): self
-    {
+    public function withLowerLimit(
+        float $lower_limit
+    ): self {
         $clone = clone $this;
         $clone->lower_limit = $lower_limit;
         return $clone;
@@ -93,8 +93,9 @@ public function getUpperLimit(): ?float
         return $this->upper_limit;
     }
 
-    public function withUpperLimit(?float $upper_limit): self
-    {
+    public function withUpperLimit(
+        ?float $upper_limit
+    ): self {
         $clone = clone $this;
         $clone->upper_limit = $upper_limit;
         return $clone;
@@ -105,8 +106,9 @@ public function getAvailablePoints(): ?float
         return $this->available_points;
     }
 
-    public function withAvailablePoints(?float $available_points): self
-    {
+    public function withAvailablePoints(
+        ?float $available_points
+    ): self {
         $clone = clone $this;
         $clone->available_points = $available_points;
         return $clone;
@@ -120,7 +122,7 @@ public function buildArrayForHiddenInput(): array
             self::FORM_KEY_TEXT_VALUE => $this->getTextValue()
         ];
 
-        if ($this->getUpperLimit() !== null) {
+        if ($this->getLowerLimit() !== null) {
             $values[self::FORM_KEY_LOWER_LIMIT] = (string) $this->getLowerLimit();
         }
 
@@ -137,14 +139,11 @@ public function buildArrayForHiddenInput(): array
 
     public function buildReplace(
         ?Replace $replace,
-        Persistence $persistence,
-        TableNameBuilder $table_name_builder
+        array $columns
     ): Replace {
-        $table_definition = TableTypes::AnswerOptions;
-
         if ($replace === null) {
             return new Replace(
-                $persistence->getColumns($table_name_builder, $table_definition),
+                $columns,
                 $this->buildValuesForGapReplace()
             );
         }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
index 4c90762f832a..97981839291a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
@@ -20,8 +20,12 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions;
 
+use ILIAS\Questions\Persistence\Delete;
 use ILIAS\Questions\Persistence\Replace;
 use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Value;
+use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Refinery\Factory as Refinery;
@@ -33,17 +37,20 @@ class AnswerOptions
 
     public function __construct(
         private readonly Factory $factory,
+        private readonly Uuid $answer_input_id,
         private array $answer_options
     ) {
         $this->answer_options_awarding_points = $this->buildAnswerOptionsAwardingPointsFromAnswerOptions($answer_options);
     }
 
     public function getAnswerOptionForPositionOrNew(
-        Uuid $answer_input_id,
         int $position
     ): AnswerOption {
         return $this->answer_options[$position]
-            ?? $this->factory->getDefaultAnswerOptionForPosition($answer_input_id, $position);
+            ?? $this->factory->getDefaultAnswerOptionForPosition(
+                $this->answer_input_id,
+                $position
+            );
     }
 
     public function getTagsArrayFromAnswerOptions(): array
@@ -86,7 +93,6 @@ public function withAnswerOptions(
     }
 
     public function withValuesFromHiddenInputValue(
-        Uuid $answer_input_id,
         ?string $value
     ): self {
         if ($value === null
@@ -101,7 +107,7 @@ public function withValuesFromHiddenInputValue(
         $clone->answer_options = array_map(
             fn(array $vs): AnswerOption => $this->factory->buildAnswerOption(
                 $vs[AnswerOption::FORM_KEY_ID],
-                $answer_input_id,
+                $this->answer_input_id,
                 $vs[AnswerOption::FORM_KEY_POSITION],
                 $vs[AnswerOption::FORM_KEY_TEXT_VALUE],
                 $vs[AnswerOption::FORM_KEY_LOWER_LIMIT] ?? null,
@@ -123,15 +129,13 @@ public function withValuesFromHiddenInputValue(
     }
 
     public function withAnswerOptionsFromTags(
-        Uuid $answer_input_id,
         array $tags
     ): self {
         $clone = clone $this;
         $position = 0;
         $clone->answer_options = array_map(
-            function (string $v) use ($answer_input_id, &$position): AnswerOption {
+            function (string $v) use (&$position): AnswerOption {
                 return $this->buildAnswerOptionFromTag(
-                    $answer_input_id,
                     $position++,
                     $v
                 );
@@ -160,9 +164,10 @@ function (AnswerOption $v) use ($refinery, $values_from_form): AnswerOption {
 
                 return $v;
             },
-            $this->answer_options
+            $clone->answer_options
         );
-        $this->answer_options_awarding_points = $this->buildAnswerOptionsAwardingPointsFromAnswerOptions($this->answer_options);
+        $clone->answer_options_awarding_points = $clone
+            ->buildAnswerOptionsAwardingPointsFromAnswerOptions($clone->answer_options);
         return $clone;
     }
 
@@ -206,13 +211,36 @@ public function buildReplace(
             $this->answer_options,
             fn(?Replace $c, AnswerOption $v): Replace => $v->buildReplace(
                 $c,
-                $persistence,
+                $persistence->getColumns($table_name_builder, TableTypes::AnswerOptions),
                 $table_name_builder
             ),
             $replace
         );
     }
 
+    public function buildDelete(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Delete {
+        $answer_options_table_definition = TableTypes::AnswerOptions;
+
+        return new Delete(
+            $answer_options_table_definition->getTable($table_name_builder),
+            [
+                new Where(
+                    $persistence->getForeignKeyColumn(
+                        $table_name_builder,
+                        $answer_options_table_definition
+                    ),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        $this->answer_input_id->toString()
+                    )
+                )
+            ]
+        );
+    }
+
     private function buildAnswerOptionsAwardingPointsFromAnswerOptions(
         array $answer_options
     ): array {
@@ -223,12 +251,15 @@ private function buildAnswerOptionsAwardingPointsFromAnswerOptions(
     }
 
     private function buildAnswerOptionFromTag(
-        Uuid $answer_input_id,
         int $position,
         string $text_value
     ): AnswerOption {
         $answer_option = $this->retrieveAnswerOptionByTextValue($text_value)
-            ?? $this->factory->getDefaultAnswerOptionForPosition($answer_input_id, $position);
+            ?? $this->factory->getDefaultAnswerOptionForPosition(
+                $this->answer_input_id,
+                $position
+            );
+
         return $answer_option
             ->withPosition($position)
             ->withTextValue($text_value);
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
index 9d31efe2526f..bf71bfed14b5 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
@@ -35,10 +35,12 @@ public function __construct(
     ) {
     }
 
-    public function getDefaultAnswerOptions(): AnswerOptions
-    {
+    public function getDefaultAnswerOptions(
+        Uuid $answer_input_id
+    ): AnswerOptions {
         return new AnswerOptions(
             $this,
+            $answer_input_id,
             []
         );
     }
@@ -89,6 +91,7 @@ function (array $vs): array {
                             && $v['answer_input_id'] !== $previous_answer_input_id) {
                             $return_array[$previous_answer_input_id] = new AnswerOptions(
                                 $this,
+                                $this->uuid_factory->fromString($previous_answer_input_id),
                                 $answer_options
                             );
                             $answer_options = [];
@@ -107,6 +110,7 @@ function (array $vs): array {
 
                     $return_array[$v['answer_input_id']] = new AnswerOptions(
                         $this,
+                        $this->uuid_factory->fromString($v['answer_input_id']),
                         $answer_options
                     );
 
@@ -116,8 +120,9 @@ function (array $vs): array {
         );
     }
 
-    private function convertToFloatOrNull(?string $value): ?float
-    {
+    private function convertToFloatOrNull(
+        ?string $value
+    ): ?float {
         return $this->refinery->byTrying([
             $this->refinery->kindlyTo()->float(),
             $this->refinery->always(null)
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index 8a416f060ec9..b8ec08440d08 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -70,20 +70,23 @@ public function getNewGap(
             $answer_input_id,
             $answer_form_id,
             $position,
-            $this->answer_options_factory->getDefaultAnswerOptions()
+            $this->answer_options_factory->getDefaultAnswerOptions($answer_input_id)
         );
     }
 
-    public function getEmptyGapsObject(): Gaps
-    {
+    public function getEmptyGapsObject(
+        Uuid $answer_form_id,
+    ): Gaps {
         return new Gaps(
             $this,
+            $answer_form_id,
             []
         );
     }
 
-    public function getGapTypeByIdentifier(string $identifier): Type
-    {
+    public function getGapTypeByIdentifier(
+        string $identifier
+    ): Type {
         if (!array_key_exists($identifier, $this->available_gap_types)) {
             throw new \InvalidArgumentException('Gap type does not exist.');
         }
@@ -91,6 +94,7 @@ public function getGapTypeByIdentifier(string $identifier): Type
     }
 
     public function fromDatabase(
+        Uuid $answer_form_id,
         Query $query
     ): Gaps {
         $answer_options = $this->answer_options_factory->fromDatabase($query);
@@ -98,7 +102,7 @@ public function fromDatabase(
         return $query->retrieveCurrentRecord(
             TableTypes::AnswerInputs->getTable($query->getTableNameBuilder(Definition::class)),
             $query->getRefinery()->custom()->transformation(
-                function (array $vs) use ($answer_options): Gaps {
+                function (array $vs) use ($answer_form_id, $answer_options): Gaps {
                     $previous_answer_input_id = null;
                     $gaps = [];
                     foreach ($vs as $v) {
@@ -106,27 +110,35 @@ function (array $vs) use ($answer_options): Gaps {
                             continue;
                         }
                         $previous_answer_input_id = $v['id'];
-                        $gaps[] = new Gap(
-                            $this->uuid_factory->fromString($v['id']),
-                            $this->uuid_factory->fromString($v['answer_form_id']),
-                            $v['position'],
-                            $answer_options[$v['id']],
-                            $this->getGapTypeByIdentifier($v['gap_type']),
-                            $v['max_chars'],
-                            $v['step_size'],
-                            $v['text_matching_method'] === null
-                                ? null
-                                : TextMatchingOptions::tryFrom($v['text_matching_method']),
-                            $v['min_autocomplete'],
-                            $v['shuffle_answer_options'] === 1
-                        );
+                        $gaps[] = $this->buildGapFromDBValues($v, $answer_options);
                     }
                     return new Gaps(
                         $this,
+                        $answer_form_id,
                         $gaps
                     );
                 }
             )
         );
     }
+
+    private function buildGapFromDBValues(
+        array $values,
+        array $answer_options
+    ): Gap {
+        return new Gap(
+            $this->uuid_factory->fromString($values['id']),
+            $this->uuid_factory->fromString($values['answer_form_id']),
+            $values['position'],
+            $answer_options[$values['id']],
+            $this->getGapTypeByIdentifier($values['gap_type']),
+            $values['max_chars'],
+            $values['step_size'],
+            $values['text_matching_method'] === null
+                ? null
+                : TextMatchingOptions::tryFrom($values['text_matching_method']),
+            $values['min_autocomplete'],
+            $values['shuffle_answer_options'] === 1
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index c65b249a8298..7554191746a0 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -26,7 +26,7 @@
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
 use ILIAS\Questions\Persistence\Value;
-use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
+use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
@@ -34,6 +34,8 @@
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Table\DataRow;
+use ILIAS\UI\Component\Table\DataRowBuilder;
 use ILIAS\Refinery\Transformation;
 
 class Gap
@@ -325,6 +327,34 @@ public function getEditPointsSection(
         );
     }
 
+    public function toTableRow(
+        DataRowBuilder $row_builder,
+        Language $lng
+    ): DataRow {
+        $total_points = 0;
+        $answer_options_list = '';
+        foreach ($this->answer_options->getAnswerOptionsAwardingPoints() as $option) {
+            $total_points += $option->getAvailablePoints();
+
+            $gap_text = $option->getTextValue();
+            if ($gap_text === '') {
+                $gap_text = $option->getLowerlimit();
+            }
+
+            $answer_options_list .= "{$gap_text} ({$option->getAvailablePoints()})<br>";
+        }
+
+        return $row_builder->buildDataRow(
+            $this->answer_input_id->toString(),
+            [
+                'gap' => $this->buildShortenedGapName(),
+                'type' => $lng->txt("{$this->type->getIdentifier()}_gap"),
+                'answers_options_awarding_points' => $answer_options_list,
+                'available_points' => $total_points
+            ]
+        );
+    }
+
     private function buildValuesForGapReplace(): array
     {
         return [
@@ -427,10 +457,8 @@ private function retrieveAnswerOptionsFromCarry(
         return $carry->retrieve(
             self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
             $refinery->custom()->transformation(
-                fn(?string $v): AnswerOptions => $this->answer_options->withValuesFromHiddenInputValue(
-                    $this->answer_input_id,
-                    $v
-                )
+                fn(?string $v): AnswerOptions => $this->answer_options
+                    ->withValuesFromHiddenInputValue($v)
             )
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 0df4837ec8bc..49045364e1c7 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -29,7 +29,7 @@
 use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
-use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
+use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -37,13 +37,28 @@
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Table\DataRowBuilder;
 
 class Gaps
 {
+    /**
+     * @var array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap>
+     */
+    private array $gaps;
+
     public function __construct(
         private readonly Factory $factory,
-        private array $gaps
+        private Uuid $answer_form_id,
+        array $gaps
     ) {
+        $this->gaps = array_reduce(
+            $gaps,
+            function (array $c, Gap $v): array {
+                $c[$v->getAnswerInputId()->toString()] = $v;
+                return $c;
+            },
+            []
+        );
     }
 
     public function getGapById(
@@ -115,6 +130,18 @@ public function getUndefinedGaps(): array
         );
     }
 
+    public function getRemovedGaps(
+        self $old_gaps
+    ): array {
+        return array_diff_key($old_gaps->gaps, $this->gaps);
+    }
+
+    public function getAddedGaps(
+        self $old_gaps
+    ): array {
+        return array_diff_key($this->gaps, $old_gaps->gaps);
+    }
+
     public function getPlaceholderArrayForPreview(): array
     {
         return array_reduce(
@@ -259,33 +286,23 @@ function (?CarryWrapper $v) use ($refinery, $gaps_factory): self {
         );
     }
 
+    public function toTableRows(
+        DataRowBuilder $row_builder,
+        Language $lng
+    ): \Generator {
+        foreach ($this->gaps as $gap) {
+            yield $gap->toTableRow(
+                $row_builder,
+                $lng
+            );
+        }
+    }
+
     public function toStorage(
         Manipulate $manipulate,
         Persistence $persistence,
         TableNameBuilder $table_name_builder
     ): Manipulate {
-        $table_definition = TableTypes::AnswerInputs;
-        $manipulate->withAdditionalStatement(
-            new Delete(
-                $table_definition->getTable($table_name_builder),
-                [
-                    new Where(
-                        $persistence->getIdColumn($table_name_builder, $table_definition),
-                        new Value(
-                            \ilDBConstants::T_TEXT,
-                            array_map(
-                                fn(Gap $v): string => $v->getAnswerInputId()->toString(),
-                                $this->gaps
-                            )
-                        ),
-                        Operator::In,
-                        Junctor::Conjunction,
-                        true
-                    )
-                ]
-            )
-        );
-
         [
             'gaps' => $replace_for_gaps,
             'answer_options' => $replace_for_answer_options
@@ -309,12 +326,101 @@ public function toStorage(
             ]
         );
 
-        return $manipulate->withAdditionalStatement($replace_for_gaps)
-            ->withAdditionalStatement($replace_for_answer_options);
+        return $manipulate->withAdditionalStatement(
+            $this->buildDeleteForRemovedGaps(
+                $persistence,
+                $table_name_builder
+            )
+        )->withAdditionalStatement($replace_for_gaps)
+        ->withAdditionalStatement($replace_for_answer_options);
     }
 
-    private function extractIdFromTagName(string $tag_name): string
-    {
+    public function toDelete(
+        Manipulate $manipulate,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Manipulate {
+        return array_reduce(
+            $this->gaps,
+            fn(Manipulate $c, Gap $v): Manipulate => $c->withAdditionalStatement(
+                $v->getAnswerOptions()->buildDelete(
+                    $persistence,
+                    $table_name_builder
+                )
+            ),
+            $manipulate->withAdditionalStatement(
+                $this->buildDeleteForDeletionOfAnswerForm(
+                    $persistence,
+                    $table_name_builder
+                )
+            )
+        );
+    }
+
+    private function buildDeleteForRemovedGaps(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Delete {
+        $table_definition = TableTypes::AnswerInputs;
+        return new Delete(
+            $table_definition->getTable($table_name_builder),
+            [
+                new Where(
+                    $persistence->getForeignKeyColumn(
+                        $table_name_builder,
+                        $table_definition
+                    ),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        $this->answer_form_id->toString()
+                    )
+                ),
+                new Where(
+                    $persistence->getIdColumn(
+                        $table_name_builder,
+                        $table_definition
+                    ),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        array_map(
+                            fn(Gap $v): string => $v->getAnswerInputId()->toString(),
+                            $this->gaps
+                        )
+                    ),
+                    Operator::In,
+                    Junctor::Conjunction,
+                    true
+                )
+            ]
+        );
+    }
+
+    private function buildDeleteForDeletionOfAnswerForm(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Delete {
+        $table_definition = TableTypes::AnswerInputs;
+
+        return new Delete(
+            $table_definition->getTable($table_name_builder),
+            [
+                new Where(
+                    $persistence->getForeignKeyColumn(
+                        $table_name_builder,
+                        $table_definition
+                    ),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        $this->answer_form_id->toString()
+                    ),
+                )
+            ]
+        );
+    }
+
+    private function extractIdFromTagName(
+        string $tag_name
+    ): string {
         return mb_substr($tag_name, mb_strlen(Gap::GAP_PLACEHOLDER_NAME) + 1);
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
index 1e5bb45de089..6ddb6cc03b53 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
@@ -22,7 +22,6 @@
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\Properties;
 use ILIAS\FileUpload\MimeType;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -43,11 +42,13 @@ public function __construct(
         parent::__construct($refinery);
     }
 
+    #[\Override]
     public function getIdentifier(): string
     {
         return 'long_menu';
     }
 
+    #[\Override]
     public function getEditAnswerOptionsInputs(
         Gap $gap
     ): array {
@@ -108,6 +109,7 @@ public function getEditPointsInputs(
         );
     }
 
+    #[\Override]
     public function getEditPointsSectionConstraint(): ?Constraint
     {
         return $this->refinery->custom()->constraint(
@@ -123,6 +125,7 @@ function (array $vs): bool {
         );
     }
 
+    #[\Override]
     public function getBuildGapTransformation(
         Gap $gap
     ): Transformation {
@@ -131,7 +134,6 @@ public function getBuildGapTransformation(
                 ->withMinAutocomplete($vs['min_autocomplete'])
                 ->withAnswerOptions(
                     $gap->getAnswerOptions()->withAnswerOptionsFromTags(
-                        $gap->getAnswerInputId(),
                         array_merge(
                             $vs['answer_options'],
                             $this->retrieveAnswerOptionsArrayFromUpload($vs['upload_answer_options'])
@@ -141,6 +143,7 @@ public function getBuildGapTransformation(
         );
     }
 
+    #[\Override]
     public function getAnswerInput(): \ilFormPropertyGUI
     {
         ;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
index df1cd1bc5dfa..8bfacea654e8 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
@@ -22,7 +22,6 @@
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\Properties;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
@@ -42,18 +41,17 @@ public function __construct(
         parent::__construct($refinery);
     }
 
+    #[\Override]
     public function getIdentifier(): string
     {
         return 'numeric';
     }
 
+    #[\Override]
     public function getEditAnswerOptionsInputs(
         Gap $gap
     ): array {
-        $answer_option = $gap->getAnswerOptions()->getAnswerOptionForPositionOrNew(
-            $gap->getAnswerInputId(),
-            0
-        );
+        $answer_option = $gap->getAnswerOptions()->getAnswerOptionForPositionOrNew(0);
 
         $ff = $this->ui_factory->input()->field();
         return [
@@ -71,6 +69,7 @@ public function getEditAnswerOptionsInputs(
         ];
     }
 
+    #[\Override]
     public function getEditAnswerOptionsSectionConstraint(): ?Constraint
     {
         return $this->refinery->custom()->constraint(
@@ -81,6 +80,7 @@ public function getEditAnswerOptionsSectionConstraint(): ?Constraint
         );
     }
 
+    #[\Override]
     public function getEditPointsInputs(
         AnswerOptions $answer_options
     ): array {
@@ -107,27 +107,28 @@ function (AnswerOption $v): string {
         );
     }
 
+    #[\Override]
     public function getEditPointsSectionConstraint(): ?Constraint
     {
         return null;
     }
 
+    #[\Override]
     public function getBuildGapTransformation(
         Gap $gap
     ): Transformation {
         return $this->refinery->custom()->transformation(
             fn(array $vs): Gap => $gap->withAnswerOptions(
                 $gap->getAnswerOptions()->withAnswerOptions([
-                    $gap->getAnswerOptions()->getAnswerOptionForPositionOrNew(
-                        $gap->getAnswerInputId(),
-                        0
-                    )->withLowerLimit($vs['lower_limit'])
-                    ->withUpperLimit($vs['upper_limit'])
+                    $gap->getAnswerOptions()->getAnswerOptionForPositionOrNew(0)
+                        ->withLowerLimit($vs['lower_limit'])
+                        ->withUpperLimit($vs['upper_limit'])
                 ])
             )->withStepSize($vs['step_size'])
         );
     }
 
+    #[\Override]
     public function getAnswerInput(): \ilFormPropertyGUI
     {
         ;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
index e2ccaf3a51da..9ab7af64e505 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
@@ -40,11 +40,13 @@ public function __construct(
         parent::__construct($refinery);
     }
 
+    #[\Override]
     public function getIdentifier(): string
     {
         return 'select';
     }
 
+    #[\Override]
     public function getEditAnswerOptionsInputs(
         Gap $gap
     ): array {
@@ -61,11 +63,13 @@ public function getEditAnswerOptionsInputs(
         ];
     }
 
+    #[\Override]
     public function getEditAnswerOptionsSectionConstraint(): ?Constraint
     {
         return null;
     }
 
+    #[\Override]
     public function getEditPointsInputs(
         AnswerOptions $answer_options
     ): array {
@@ -75,6 +79,7 @@ public function getEditPointsInputs(
         );
     }
 
+    #[\Override]
     public function getEditPointsSectionConstraint(): ?Constraint
     {
         return $this->refinery->custom()->constraint(
@@ -90,21 +95,20 @@ function (array $vs): bool {
         );
     }
 
+    #[\Override]
     public function getBuildGapTransformation(
         Gap $gap
     ): Transformation {
         return $this->refinery->custom()->transformation(
-            fn(array $vs): Gap => $gap->withProperties(
-                $gap->withAnswerOptions(
-                    $gap->getAnswerOptions()->withAnswerOptionsFromTags(
-                        $gap->getAnswerInputId(),
-                        $vs['answer_options']
-                    )
+            fn(array $vs): Gap => $gap->withAnswerOptions(
+                $gap->getAnswerOptions()->withAnswerOptionsFromTags(
+                    $vs['answer_options']
                 )
             )
         );
     }
 
+    #[\Override]
     public function getAnswerInput(): \ilFormPropertyGUI
     {
         ;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
index ab2a08cd3c86..55621e7a17bc 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
@@ -41,11 +41,13 @@ public function __construct(
         parent::__construct($refinery);
     }
 
+    #[\Override]
     public function getIdentifier(): string
     {
         return 'text';
     }
 
+    #[\Override]
     public function getEditAnswerOptionsInputs(
         Gap $gap
     ): array {
@@ -67,6 +69,7 @@ public function getEditAnswerOptionsInputs(
         ];
     }
 
+    #[\Override]
     public function getEditAnswerOptionsSectionConstraint(): ?Constraint
     {
         return $this->refinery->custom()->constraint(
@@ -78,6 +81,7 @@ public function getEditAnswerOptionsSectionConstraint(): ?Constraint
         );
     }
 
+    #[\Override]
     public function getEditPointsInputs(
         AnswerOptions $answer_options
     ): array {
@@ -87,6 +91,7 @@ public function getEditPointsInputs(
         );
     }
 
+    #[\Override]
     public function getEditPointsSectionConstraint(): ?Constraint
     {
         return $this->refinery->custom()->constraint(
@@ -102,6 +107,7 @@ function (array $vs): bool {
         );
     }
 
+    #[\Override]
     public function getBuildGapTransformation(
         Gap $gap
     ): Transformation {
@@ -112,13 +118,13 @@ public function getBuildGapTransformation(
                         ?? self::DEFAULT_TECT_MATCHING_METHOD
                 )->withAnswerOptions(
                     $gap->getAnswerOptions()->withAnswerOptionsFromTags(
-                        $gap->getAnswerInputId(),
                         $vs['answer_options']
                     )
                 )
         );
     }
 
+    #[\Override]
     public function getAnswerInput(): \ilFormPropertyGUI
     {
         ;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
index e0c04bf318e8..2e4121a62406 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
@@ -33,15 +33,28 @@ public function __construct(
     }
 
     abstract public function getIdentifier(): string;
-    abstract public function getEditAnswerOptionsInputs(Gap $gap): array;
+
+    abstract public function getEditAnswerOptionsInputs(
+        Gap $gap
+    ): array;
+
     abstract public function getEditAnswerOptionsSectionConstraint(): ?Constraint;
-    abstract public function getEditPointsInputs(AnswerOptions $answer_options): array;
+
+    abstract public function getEditPointsInputs(
+        AnswerOptions $answer_options
+    ): array;
+
     abstract public function getEditPointsSectionConstraint(): ?Constraint;
-    abstract public function getBuildGapTransformation(Gap $gap): Transformation;
+
+    abstract public function getBuildGapTransformation(
+        Gap $gap
+    ): Transformation;
+
     abstract public function getAnswerInput(): \ilFormPropertyGUI;
 
-    public function getAddPointsTransformation(Gap $gap): Transformation
-    {
+    public function getAddPointsTransformation(
+        Gap $gap
+    ): Transformation {
         return $this->refinery->custom()->transformation(
             fn(array $vs): Gap => $gap->withAnswerOptions(
                 $gap->getAnswerOptions()
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/class.UploadAnswerOptionsGUI.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/class.UploadAnswerOptionsGUI.php
index 99ab4d033dc2..94c0f296d8a9 100755
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/class.UploadAnswerOptionsGUI.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/class.UploadAnswerOptionsGUI.php
@@ -34,6 +34,7 @@
  */
 class UploadAnswerOptionsGUI extends AbstractCtrlAwareUploadHandler
 {
+    #[\Override]
     protected function getUploadResult(): HandlerResult
     {
         $this->upload->process();
@@ -61,8 +62,10 @@ protected function getUploadResult(): HandlerResult
         );
     }
 
-    protected function getRemoveResult(string $identifier): HandlerResult
-    {
+    #[\Override]
+    protected function getRemoveResult(
+        string $identifier
+    ): HandlerResult {
         return new BasicHandlerResult(
             $this->getFileIdentifierParameterName(),
             HandlerResult::STATUS_OK,
@@ -71,8 +74,10 @@ protected function getRemoveResult(string $identifier): HandlerResult
         );
     }
 
-    public function getInfoResult(string $identifier): ?FileInfoResult
-    {
+    #[\Override]
+    public function getInfoResult(
+        string $identifier
+    ): ?FileInfoResult {
         return new BasicFileInfoResult(
             $this->getFileIdentifierParameterName(),
             $identifier,
@@ -82,11 +87,13 @@ public function getInfoResult(string $identifier): ?FileInfoResult
         );
     }
 
+    #[\Override]
     /**
      * @return \ILIAS\FileUpload\Handler\BasicFileInfoResult[]
      */
-    public function getInfoForExistingFiles(array $file_ids): array
-    {
+    public function getInfoForExistingFiles(
+        array $file_ids
+    ): array {
         $info_results = [];
         foreach ($file_ids as $identifier) {
             $info_results[] = $this->getInfoResult($identifier);
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
similarity index 82%
rename from components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
rename to components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index 845e6ba93c9f..b1f543b4b093 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -18,17 +18,19 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties;
 
 use ILIAS\Questions\AnswerForm\Persistence;
 use ILIAS\Questions\AnswerForm\Properties as PropertiesInterface;
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Layout\OverviewTable;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
+use ILIAS\Questions\Persistence\Delete;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\Update;
 use ILIAS\Questions\Persistence\Manipulate;
@@ -37,13 +39,17 @@
 use ILIAS\Questions\Persistence\TableTypes;
 use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\Persistence\Where;
-use ILIAS\Questions\Presentation\Layout\Definitions\CarryWrapper;
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Table\Factory as TableFactory;
+use ILIAS\UI\Component\Table\Data as DataTable;
+use Psr\Http\Message\ServerRequestInterface;
 
 class Properties implements PropertiesInterface
 {
@@ -67,16 +73,25 @@ public function __construct(
     ) {
     }
 
-    public function getAnswerFormId(): ?Uuid
+    #[\Override]
+    public function getDefinitionClass(): string
+    {
+        return Definition::class;
+    }
+
+    #[\Override]
+    public function getAnswerFormId(): Uuid
     {
         return $this->answer_form_id;
     }
 
+    #[\Override]
     public function getQuestionId(): Uuid
     {
         return $this->question_id;
     }
 
+    #[\Override]
     public function getTypeGenericProperties(): TypeGenericProperties
     {
         return new TypeGenericProperties(
@@ -148,6 +163,7 @@ public function withGaps(
         return $clone;
     }
 
+    #[\Override]
     public function getBasicPropertiesForListing(
         Language $lng
     ): array {
@@ -159,6 +175,21 @@ public function getBasicPropertiesForListing(
         ];
     }
 
+    #[\Override]
+    public function getOverviewTable(
+        TableFactory $table_factory,
+        Language $lng,
+        ServerRequestInterface $request,
+        Environment $environment
+    ): DataTable {
+        return new OverviewTable(
+            $table_factory,
+            $lng,
+            $request,
+            $environment
+        )->getTable();
+    }
+
     public function buildBasicEditingInputs(
         Language $lng,
         FieldFactory $ff,
@@ -268,6 +299,7 @@ public function withValuesFromCarry(
         return $clone;
     }
 
+    #[\Override]
     public function toStorage(
         Manipulate $manipulate
     ): Manipulate {
@@ -292,6 +324,25 @@ public function toStorage(
         );
     }
 
+    #[\Override]
+    public function toDelete(
+        Manipulate $manipulate
+    ): Manipulate {
+        $persistence = $manipulate->getPersistenceForDefinitionClass(Definition::class);
+        $table_name_builder = $manipulate->getTableNameBuilder(Definition::class);
+
+        return $this->gaps->toDelete(
+            $manipulate->withAdditionalStatement(
+                $this->buildDeleteAnswerFormStatement(
+                    $persistence,
+                    $table_name_builder
+                )
+            ),
+            $persistence,
+            $table_name_builder
+        );
+    }
+
     private function buildInsertAnswerFormStatement(
         Persistence $persistence,
         TableNameBuilder $table_name_builder
@@ -335,4 +386,27 @@ private function buildUpdateAnswerFormStatement(
             ]
         );
     }
+
+    private function buildDeleteAnswerFormStatement(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Delete {
+        $table_definition = TableTypes::TypeSpecificAnswerForms;
+
+        return new Delete(
+            $table_definition->getTable($table_name_builder),
+            [
+                new Where(
+                    $persistence->getForeignKeyColumn(
+                        $table_name_builder,
+                        $table_definition
+                    ),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        $this->answer_form_id->toString()
+                    )
+                )
+            ]
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 76e1aa301b34..a02d06eea570 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -21,27 +21,34 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
 
 use ILIAS\Questions\AnswerForm\Views\Edit as EditViewInterface;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Factory as PropertiesFactory;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\AnswerForm\Properties;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Factory as PropertiesFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
-use ILIAS\Questions\Presentation\Layout\Definitions\Environment;
-use ILIAS\Questions\Presentation\Layout\Definitions\EditForm;
-use ILIAS\Questions\Presentation\Layout\Definitions\EditOverview;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Questions\Presentation\Layout\EditForm;
+use ILIAS\Questions\Presentation\Layout\EditOverview;
 use ILIAS\HTTP\Services as HTTPServices;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
+use ILIAS\UI\Component\Modal\InterruptiveItem\Standard as InterruptiveItem;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\Refinery\Factory as Refinery;
 
 class Edit implements EditViewInterface
 {
     private const string STEP_EDIT_BASIC_PROPERTIES = 'ebp';
-    private const string STEP_SET_GAP_TYPES = 'sgt';
-    private const string STEP_SET_ANSWER_OPTIONS = 'sao';
-    private const string STEP_SET_POINTS = 'sap';
+    private const string STEP_CONFIRMED_GAP_REMOVAL = 'cgr';
+    public const string STEP_SET_GAP_TYPES = 'sgt';
+    public const string STEP_SET_ANSWER_OPTIONS = 'sao';
+    public const string STEP_SET_POINTS = 'sp';
     private const string STEP_SAVE = 's';
 
+    public const array PARAMETER_NAMESPACE = ['c'];
+    public const string OVERVIEW_TABLE_ROW_ID = 'g';
+
     public function __construct(
         private readonly Language $lng,
         private readonly UIFactory $ui_factory,
@@ -53,96 +60,82 @@ public function __construct(
     ) {
     }
 
+    #[\Override]
     public function create(
         Environment $environment
     ): EditForm|Properties {
         return match($environment->getStep()) {
-            self::STEP_SET_GAP_TYPES => $this->processBasicEditingForm(
-                $environment->withProperties(
-                    $environment->getProperties()->withValuesFromCarry(
-                        $this->refinery,
-                        $this->cloze_text_factory,
-                        $this->gap_factory,
-                        $environment->getDefinitionsFactory()->getCarrySectionData(
-                            $this->http->wrapper()->post(),
-                            $this->refinery
-                        )
-                    )
-                )
-            ),
-            self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm(
-                $environment->withProperties(
-                    $environment->getProperties()->withValuesFromCarry(
-                        $this->refinery,
-                        $this->cloze_text_factory,
-                        $this->gap_factory,
-                        $environment->getDefinitionsFactory()->getCarrySectionData(
-                            $this->http->wrapper()->post(),
-                            $this->refinery
-                        )
-                    )
-                )
-            ),
-            self::STEP_SET_POINTS => $this->processAnswerOptionsForm(
-                $environment->withProperties(
-                    $environment->getProperties()->withValuesFromCarry(
-                        $this->refinery,
-                        $this->cloze_text_factory,
-                        $this->gap_factory,
-                        $environment->getDefinitionsFactory()->getCarrySectionData(
-                            $this->http->wrapper()->post(),
-                            $this->refinery
-                        )
-                    )
-                )
-            ),
-            self::STEP_SAVE => $this->processAssignPointsForm(
-                $environment->withProperties(
-                    $environment->getProperties()->withValuesFromCarry(
-                        $this->refinery,
-                        $this->cloze_text_factory,
-                        $this->gap_factory,
-                        $environment->getDefinitionsFactory()->getCarrySectionData(
-                            $this->http->wrapper()->post(),
-                            $this->refinery
-                        )
-                    )
-                )
-            ),
-            default => $this->buildBasicEditingForm($environment)
+            '' => $this->buildBasicEditingForm($environment),
+            default => $this->callIntermediateStep($environment)
         };
     }
 
+    #[\Override]
     public function edit(
         Environment $environment
     ): EditOverview|EditForm|Properties {
-        return match ($step) {
-            default => $this->buildEditingOverview($environment)
+        return match ($environment->getStep()) {
+            '' => $environment->getPresentationFactory()->getEditOverview(
+                $environment,
+                $environment->getUrlBuilderWithStepParameter(self::STEP_EDIT_BASIC_PROPERTIES)
+                    ->buildURI()
+            ),
+            self::STEP_EDIT_BASIC_PROPERTIES => $this->buildBasicEditingForm($environment),
+            default => $this->callIntermediateStep($environment)
         };
     }
 
+    #[\Override]
     public function other(
         Environment $environment
     ): EditForm|Properties {
 
     }
 
-    private function buildEditingOverview(
+    private function callIntermediateStep(
         Environment $environment
-    ): EditOverview {
-        return $environment->getDefinitionsFactory()->getEditOverview(
-            $environment->getEditability(),
-            $environment->getUrlBuilderWithStepParameter(self::STEP_EDIT_BASIC_PROPERTIES),
-            $environment->getProperties()
+    ): EditForm|Properties {
+        $environment_with_properties = $environment->getAnswerFormProperties()->withValuesFromCarry(
+            $this->refinery,
+            $this->cloze_text_factory,
+            $this->gap_factory,
+            $environment->getPresentationFactory()->getCarrySectionData(
+                $this->http->wrapper()->post(),
+                $this->refinery
+            )
         );
+
+        return match ($environment->getStep()) {
+            self::STEP_SET_GAP_TYPES,
+            self::STEP_CONFIRMED_GAP_REMOVAL => $this->processBasicEditingForm(
+                $environment->withAnswerFormProperties(
+                    $environment_with_properties
+                )
+            ),
+            self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm(
+                $environment->withAnswerFormProperties(
+                    $environment_with_properties
+                )
+            ),
+            self::STEP_SET_POINTS => $this->processAnswerOptionsForm(
+                $environment->withAnswerFormProperties(
+                    $environment_with_properties
+                )
+            ),
+            self::STEP_SAVE => $this->processAssignPointsForm(
+                $environment->withAnswerFormProperties(
+                    $environment_with_properties
+                )
+            )
+        };
     }
 
     private function buildBasicEditingForm(
         Environment $environment
     ): EditForm {
-        return $environment->getDefinitionsFactory()->getEditForm(
+        return $environment->getPresentationFactory()->getEditForm(
             $environment->getUrlBuilderWithStepParameter(self::STEP_SET_GAP_TYPES),
-            $environment->getProperties()->buildBasicEditingInputs(
+            $environment->getAnswerFormProperties()->buildBasicEditingInputs(
                 $this->lng,
                 $this->ui_factory->input()->field(),
                 $this->refinery,
@@ -155,25 +148,45 @@ private function buildBasicEditingForm(
 
     private function processBasicEditingForm(
         Environment $environment
-    ): EditForm {
+    ): EditForm|Properties {
         $form = $this->buildBasicEditingForm(
             $environment
         )->withRequest($this->http->request());
 
         $data = $form->getData();
-        return $data === null
-            ? $form
-            : $this->buildGapTypesForm(
-                $environment->withProperties($data)
-            );
+        if ($data === null) {
+            return $form;
+        }
+
+        if ($environment->getStep() !== self::STEP_CONFIRMED_GAP_REMOVAL) {
+            $new_gaps = $data->getGaps();
+            $old_gaps = $environment->getAnswerFormProperties()->getGaps();
+            $removed_gaps = $new_gaps->getRemovedGaps($old_gaps);
+            if ($removed_gaps !== []) {
+                return $form->withConfirmation(
+                    $this->buildRemovedGapsConfirmation(
+                        $environment,
+                        $removed_gaps
+                    )
+                );
+            }
+        }
+
+        if ($new_gaps->getAddedGaps($old_gaps) === []) {
+            return $environment->getAnswerFormProperties();
+        }
+
+        return $this->buildGapTypesForm(
+            $environment->withAnswerFormProperties($data)
+        );
     }
 
     private function buildGapTypesForm(
         Environment $environment
     ): EditForm {
-        $properties = $environment->getProperties();
+        $properties = $environment->getAnswerFormProperties();
         $ff = $this->ui_factory->input()->field();
-        return $environment->getDefinitionsFactory()->getEditForm(
+        return $environment->getPresentationFactory()->getEditForm(
             $environment->getUrlBuilderWithStepParameter(self::STEP_SET_ANSWER_OPTIONS),
             $properties->getGaps()->buildGapsTypeInputs(
                 $this->lng,
@@ -200,8 +213,8 @@ private function processGapTypesForm(
         return $data === null
             ? $form
             : $this->buildAnswerOptionsForm(
-                $environment->withProperties(
-                    $environment->getProperties()->withGaps($data)
+                $environment->withAnswerFormProperties(
+                    $environment->getAnswerFormProperties()->withGaps($data)
                 )
             );
     }
@@ -209,9 +222,9 @@ private function processGapTypesForm(
     private function buildAnswerOptionsForm(
         Environment $environment
     ): EditForm {
-        $properties = $environment->getProperties();
+        $properties = $environment->getAnswerFormProperties();
         $ff = $this->ui_factory->input()->field();
-        return $environment->getDefinitionsFactory()->getEditForm(
+        return $environment->getPresentationFactory()->getEditForm(
             $environment->getUrlBuilderWithStepParameter(self::STEP_SET_POINTS),
             $properties->getGaps()->buildAnswerOptionsInputs($this->lng, $ff, $this->refinery),
             false,
@@ -232,8 +245,8 @@ private function processAnswerOptionsForm(
         return $data === null
             ? $form
             : $this->buildAssignPointsForm(
-                $environment->withProperties(
-                    $environment->getProperties()->withGaps($data)
+                $environment->withAnswerFormProperties(
+                    $environment->getAnswerFormProperties()->withGaps($data)
                 )
             );
     }
@@ -241,9 +254,9 @@ private function processAnswerOptionsForm(
     private function buildAssignPointsForm(
         Environment $environment
     ): EditForm {
-        $properties = $environment->getProperties();
+        $properties = $environment->getAnswerFormProperties();
         $ff = $this->ui_factory->input()->field();
-        return $environment->getDefinitionsFactory()->getEditForm(
+        return $environment->getPresentationFactory()->getEditForm(
             $environment->getUrlBuilderWithStepParameter(self::STEP_SAVE),
             $properties->getGaps()->buildPointInputs($this->lng, $ff, $this->refinery),
             true,
@@ -260,7 +273,7 @@ private function processAssignPointsForm(
             $environment
         )->withRequest($this->http->request());
 
-        $properties = $environment->getProperties();
+        $properties = $environment->getAnswerFormProperties();
         $data = $form->getData();
         return $data === null
             ? $form->withContentBeforeForm(
@@ -280,4 +293,29 @@ private function buildClozeTextPanel(
             )
         );
     }
+
+    /**
+     * @param array<\ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap> $removed_gaps
+     */
+    private function buildRemovedGapsConfirmation(
+        Environment $environment,
+        array $removed_gaps
+    ): InterruptiveModal {
+        return $this->ui_factory->modal()->interruptive(
+            $this->lng->txt('confirm'),
+            $this->lng->txt('confirm_remove_gaps'),
+            $environment->getUrlBuilderWithStepParameter(
+                self::STEP_CONFIRMED_GAP_REMOVAL
+            )->buildURI()->__toString()
+        )->withAffectedItems(
+            array_map(
+                fn(Gap $v): InterruptiveItem => $this->ui_factory->modal()
+                    ->interruptiveItem()->standard(
+                        $v->getAnswerInputId()->toString(),
+                        $v->buildShortenedGapName()
+                    ),
+                $removed_gaps
+            )
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
index 135596235c55..361c8523884f 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
@@ -21,16 +21,17 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
 
 use ILIAS\Questions\AnswerForm\Views\Participant as ParticipantViewInterface;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Type;
 use ILIAS\Questions\Response\Response;
 
 class Participant implements ParticipantViewInterface
 {
+    #[\Override]
     public function isAsyncPresentationAvailable(): bool
     {
         return true;
     }
 
+    #[\Override]
     public function get(
         ?Response $response
     ): array {
diff --git a/components/ILIAS/Questions/src/Collector.php b/components/ILIAS/Questions/src/Collector.php
index 39165d20e65d..68df3dc761ef 100644
--- a/components/ILIAS/Questions/src/Collector.php
+++ b/components/ILIAS/Questions/src/Collector.php
@@ -32,26 +32,29 @@ public function __construct(
     ) {
     }
 
-    public function withRequiredCapabilities(array $capability_class_names): self
-    {
+    public function withRequiredCapabilities(
+        array $capability_class_names
+    ): self {
         $this->checkCapabilities($capability_class_names);
         $clone = clone $this;
         $clone->required_capabilities = $capability_class_names;
         return $clone;
     }
 
-    public function getQuestionsForId(int $id): Question|null
-    {
+    public function getQuestionsForId(
+        int $id
+    ): ?Question {
         return $this->repository->getForQuestionId($id);
     }
 
     /**
      *
-     * @param array<int> $ids
+     * @param list<int> $ids
      * @return \Generator<ILIAS\Questions\Question\Question>
      */
-    public function getQuestionsForIds(array $ids): \Generator
-    {
+    public function getQuestionsForIds(
+        array $ids
+    ): \Generator {
         yield from $this->repository->getForQuestionIds($ids);
     }
 }
diff --git a/components/ILIAS/Questions/src/Persistence/CoreTables.php b/components/ILIAS/Questions/src/Persistence/CoreTables.php
index e1940c63ade2..8c3f4f1bd5a1 100644
--- a/components/ILIAS/Questions/src/Persistence/CoreTables.php
+++ b/components/ILIAS/Questions/src/Persistence/CoreTables.php
@@ -69,9 +69,11 @@ public function getColumns(
         };
         return array_map(
             fn(string $v): Column => new Column($table, $v),
-            array_filter(
-                $column_identifiers,
-                fn(string $v) => !in_array($v, $columns_to_skip)
+            array_values(
+                array_filter(
+                    $column_identifiers,
+                    fn(string $v) => !in_array($v, $columns_to_skip)
+                )
             )
         );
     }
diff --git a/components/ILIAS/Questions/src/Persistence/Delete.php b/components/ILIAS/Questions/src/Persistence/Delete.php
index be8173df325e..7abec2bc259e 100644
--- a/components/ILIAS/Questions/src/Persistence/Delete.php
+++ b/components/ILIAS/Questions/src/Persistence/Delete.php
@@ -30,30 +30,44 @@ public function __construct(
     ) {
     }
 
-    public function toManipulateString(\ilDBInterface $db): string
+    public function getTableToLock(): string
     {
+        return $this->table->getName();
+    }
+
+    public function toManipulateString(
+        \ilDBInterface $db
+    ): string {
         return "DELETE FROM {$this->table->getName()}" . PHP_EOL
             . $this->buildWhereString($db);
     }
 
-    private function buildWhereString(\ilDBInterface $db): string
-    {
+    private function buildWhereString(
+        \ilDBInterface $db
+    ): string {
         $values = [];
-
         return sprintf(
             array_reduce(
                 $this->where,
                 function (?string $c, Where $v) use ($db, &$values): string {
-                    $values[] = $v->getRight()->getQuotedValue($db);
+                    $quoted_value = $v->getRight()->getQuotedValue($db);
+                    if (is_array($quoted_value)) {
+                        $values = array_merge(
+                            $values,
+                            array_values($quoted_value)
+                        );
+                    } else {
+                        $values[] = $quoted_value;
+                    }
 
                     if ($c === null) {
                         return "WHERE {$v->toSql()}" . PHP_EOL;
                     }
 
-                    return "{$c}{$v->getLogicalOperator()} {$v->toSql()}" . PHP_EOL;
+                    return "{$c}{$v->getLogicalOperator()->value} {$v->toSql()}" . PHP_EOL;
                 }
-            ),
-            $values
+            ) ?? '',
+            ...$values
         );
     }
 }
diff --git a/components/ILIAS/Questions/src/Persistence/Insert.php b/components/ILIAS/Questions/src/Persistence/Insert.php
index 41a9ec9182b8..bccf22ee793d 100644
--- a/components/ILIAS/Questions/src/Persistence/Insert.php
+++ b/components/ILIAS/Questions/src/Persistence/Insert.php
@@ -67,10 +67,9 @@ public function withAdditionalValues(
         return $clone;
     }
 
-    public function lockTable(
-        \ilAtomQuery $atom_query
-    ): void {
-        $atom_query->addTableLock($this->columns[0]->getTableName());
+    public function getTableToLock(): string
+    {
+        return $this->columns[0]->getTableName();
     }
 
     public function toManipulateString(
@@ -93,8 +92,9 @@ protected function buildColumnsString(): string
             ) . ')';
     }
 
-    protected function buildValuesString(\ilDBInterface $db): string
-    {
+    protected function buildValuesString(
+        \ilDBInterface $db
+    ): string {
         $return = [];
         foreach ($this->value_sets as $values) {
             $return[] = '(' . implode(
diff --git a/components/ILIAS/Questions/src/Persistence/Join.php b/components/ILIAS/Questions/src/Persistence/Join.php
index a107fd063115..4e1a0446b741 100644
--- a/components/ILIAS/Questions/src/Persistence/Join.php
+++ b/components/ILIAS/Questions/src/Persistence/Join.php
@@ -31,7 +31,8 @@ public function __construct(
 
     public function toSql(): string
     {
-        return "{$this->type->value} JOIN {$this->right->getTableName()} ON {$this->left->getColumnString()} = {$this->right->getColumnString()}";
+        return "{$this->type->value} JOIN {$this->right->getTableName()} "
+        . "ON {$this->left->getColumnString()} = {$this->right->getColumnString()}";
     }
 
     public function getLeft(): Column
diff --git a/components/ILIAS/Questions/src/Persistence/Manipulate.php b/components/ILIAS/Questions/src/Persistence/Manipulate.php
index 74cefe53b0b6..6a9388d11183 100644
--- a/components/ILIAS/Questions/src/Persistence/Manipulate.php
+++ b/components/ILIAS/Questions/src/Persistence/Manipulate.php
@@ -25,7 +25,7 @@
 
 class Manipulate
 {
-    private array $statements;
+    private array $statements = [];
 
     public function __construct(
         private readonly \ilDBInterface $db,
@@ -68,11 +68,20 @@ public function withAdditionalStatement(
 
     public function run(): void
     {
+        if ($this->statements === []) {
+            return;
+        }
+
         $atom_query = $this->db->buildAtomQuery();
 
         $manipulates = [];
+        $locked_tables = [];
         foreach ($this->statements as $statement) {
-            $statement->lockTable($atom_query);
+            $table_to_lock = $statement->getTableToLock();
+            if (!in_array($table_to_lock, $locked_tables)) {
+                $atom_query->addTableLock($table_to_lock);
+                $locked_tables[] = $table_to_lock;
+            }
             $manipulates[] = $statement->toManipulateString($this->db);
         }
         $atom_query->addQueryCallable(
diff --git a/components/ILIAS/Questions/src/Persistence/ManipulationType.php b/components/ILIAS/Questions/src/Persistence/ManipulationType.php
index b52c8c6b6f33..069a58b51d5f 100644
--- a/components/ILIAS/Questions/src/Persistence/ManipulationType.php
+++ b/components/ILIAS/Questions/src/Persistence/ManipulationType.php
@@ -24,4 +24,5 @@ enum ManipulationType
 {
     case Create;
     case Update;
+    case Delete;
 }
diff --git a/components/ILIAS/Questions/src/Persistence/Operator.php b/components/ILIAS/Questions/src/Persistence/Operator.php
index 8f8a6a418ce9..d1e19d3eb882 100644
--- a/components/ILIAS/Questions/src/Persistence/Operator.php
+++ b/components/ILIAS/Questions/src/Persistence/Operator.php
@@ -32,13 +32,13 @@ enum Operator: string
     case Like = 'LIKE';
     case Between = 'BETWEEN';
 
-    public function toSql(Column $left, int $nr_of_values): string
-    {
-        if ($nr_of_values > 1) {
-            $placeholders = '%s';
-            for ($i = 1; $i < $nr_of_values; $i++) {
-                $placeholders .= ', %s';
-            }
+    public function toSql(
+        Column $left,
+        int $nr_of_values
+    ): string {
+        $placeholders = '%s';
+        for ($i = 1; $i < $nr_of_values; $i++) {
+            $placeholders .= ', %s';
         }
 
         return match($this) {
diff --git a/components/ILIAS/Questions/src/Persistence/Query.php b/components/ILIAS/Questions/src/Persistence/Query.php
index 0dcda7f2a046..5c28eb794215 100644
--- a/components/ILIAS/Questions/src/Persistence/Query.php
+++ b/components/ILIAS/Questions/src/Persistence/Query.php
@@ -95,36 +95,41 @@ public function getRefinery(): Refinery
         return $this->refinery;
     }
 
-    public function withAdditionalSelect(Select $select): self
-    {
+    public function withAdditionalSelect(
+        Select $select
+    ): self {
         $clone = clone $this;
         $clone->select[] = $select;
         return $clone;
     }
 
-    public function withAdditionalJoin(Join $join): self
-    {
+    public function withAdditionalJoin(
+        Join $join
+    ): self {
         $clone = clone $this;
         $clone->joins[] = $join;
         return $clone;
     }
 
-    public function withAdditionalWhere(Where $where): self
-    {
+    public function withAdditionalWhere(
+        Where $where
+    ): self {
         $clone = clone $this;
         $clone->where[] = $where;
         return $clone;
     }
 
-    public function withAdditionalOrder(Order $order): self
-    {
+    public function withAdditionalOrder(
+        Order $order
+    ): self {
         $clone = clone $this;
         $clone->order[] = $order;
         return $clone;
     }
 
-    public function withLimit(int $limit): self
-    {
+    public function withLimit(
+        int $limit
+    ): self {
         $clone = clone $this;
         $clone->limit = $limit;
         return $clone;
@@ -203,9 +208,10 @@ function (?string $c, Where $v): string {
         ) ?? '';
     }
 
-    private function addValueToBinding(Value $value): void
-    {
-        if (!is_array($value)) {
+    private function addValueToBinding(
+        Value $value
+    ): void {
+        if (!is_array($value->getValue())) {
             $this->binding_types[] = $value->getType();
             $this->binding_values[] = $value->getValue();
             return;
diff --git a/components/ILIAS/Questions/src/Persistence/Replace.php b/components/ILIAS/Questions/src/Persistence/Replace.php
index 3554ea426818..9b34db9f6d8c 100644
--- a/components/ILIAS/Questions/src/Persistence/Replace.php
+++ b/components/ILIAS/Questions/src/Persistence/Replace.php
@@ -22,6 +22,7 @@
 
 class Replace extends Insert
 {
+    #[\Override]
     public function toManipulateString(
         \ilDBInterface $db
     ): string {
diff --git a/components/ILIAS/Questions/src/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
index 262d8a99d595..58fcf6f17b07 100644
--- a/components/ILIAS/Questions/src/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -22,7 +22,6 @@
 
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\AnswerForm\Definition as AnswerFormDefinition;
-use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\UUID\Factory as UuidFactory;
@@ -60,8 +59,9 @@ public function getAllQuestions(): \Generator
         );
     }
 
-    public function getForQuestionId(Uuid $question_id): ?QuestionImplementation
-    {
+    public function getForQuestionId(
+        Uuid $question_id
+    ): ?QuestionImplementation {
         return $this->getForBaseQuery(
             (new Query(
                 $this->db,
@@ -85,8 +85,9 @@ public function getForQuestionId(Uuid $question_id): ?QuestionImplementation
      * @param array<\ILIAS\Data\Uuid> $question_ids
      * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
      */
-    public function getForQuestionIds(array $question_ids): \Generator
-    {
+    public function getForQuestionIds(
+        array $question_ids
+    ): \Generator {
         yield from $this->getForBaseQuery(
             (new Query(
                 $this->db,
@@ -109,32 +110,17 @@ public function getForQuestionIds(array $question_ids): \Generator
     }
 
     /**
-     * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
+     * @param array<\ILIAS\Questions\Question\QuestionImplementation> $questions
      */
-    private function getForBaseQuery(Query $query): \Generator
-    {
-        $query_with_answer_forms = array_reduce(
-            $this->answer_form_factory->getAvailableDefinitions(),
-            fn(Query $c, AnswerFormDefinition $v) => $v->getPersistence()->completeQuery(
-                $c,
-                CoreTables::AnswerForms->getIdColumn()
-            ),
-            $query
-        );
-
-        foreach ($query_with_answer_forms->loadNextRecord() as $query_with_record) {
-            yield $this->retrieveQuestionFromQuery(
-                $query_with_record,
-                $this->retrieveAnswerFormsFromQuery($query_with_record)
-            );
-        }
-    }
-
     public function create(
-        array $storable
+        array $questions
     ): void {
         $this->store(
-            $storable,
+            array_map(
+                fn(QuestionImplementation $v): QuestionImplementation => $v
+                    ->withPageId($this->buildQuestionPage()),
+                $questions
+            ),
             new Manipulate(
                 $this->db,
                 $this->answer_form_factory,
@@ -143,11 +129,14 @@ public function create(
         );
     }
 
+    /**
+     * @param array<\ILIAS\Questions\Question\QuestionImplementation> $questions
+     */
     public function update(
-        array $storable
+        array $questions
     ): void {
         $this->store(
-            $storable,
+            $questions,
             new Manipulate(
                 $this->db,
                 $this->answer_form_factory,
@@ -156,6 +145,43 @@ public function update(
         );
     }
 
+    public function delete(
+        array $questions
+    ): void {
+        array_reduce(
+            $questions,
+            fn(Manipulate $c, QuestionImplementation $v): Manipulate => $v->toDelete($c),
+            new Manipulate(
+                $this->db,
+                $this->answer_form_factory,
+                ManipulationType::Delete
+            )
+        )->run();
+    }
+
+    /**
+     * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
+     */
+    private function getForBaseQuery(
+        Query $query
+    ): \Generator {
+        $query_with_answer_forms = array_reduce(
+            $this->answer_form_factory->getAvailableDefinitions(),
+            fn(Query $c, AnswerFormDefinition $v) => $v->getPersistence()->completeQuery(
+                $c,
+                CoreTables::AnswerForms->getIdColumn()
+            ),
+            $query
+        );
+
+        foreach ($query_with_answer_forms->loadNextRecord() as $query_with_record) {
+            yield $this->retrieveQuestionFromQuery(
+                $query_with_record,
+                $this->retrieveAnswerFormsFromQuery($query_with_record)
+            );
+        }
+    }
+
     private function retrieveQuestionFromQuery(
         Query $query,
         array $answer_forms
@@ -213,17 +239,15 @@ function (array $vs) use ($query): array {
     }
 
     /**
-     *
-     * @param array<\ILIAS\Questions\Persistence\Storable> $storable
-     * @return array<ILIAS\Data\UUID\Uuid>
+     * @param array<\ILIAS\Questions\Question\QuestionImplementation> $questions
      */
     private function store(
-        array $storable,
+        array $questions,
         Manipulate $manipulate
     ): void {
         array_reduce(
-            $storable,
-            fn(Manipulate $c, Storable $v): Manipulate => $v->toStorage($c),
+            $questions,
+            fn(Manipulate $c, QuestionImplementation $v): Manipulate => $v->toStorage($c),
             $manipulate
         )->run();
     }
@@ -238,11 +262,12 @@ private function buildAvailableUuid(): Uuid
         } while (true);
     }
 
-    private function checkAvailabilityOfId(Uuid $uuid): bool
-    {
+    private function checkAvailabilityOfId(
+        Uuid $uuid
+    ): bool {
         return $this->db->fetchObject(
             $this->db->query(
-                'SELECT COUNT(*) as cnt FROM ' . self::QUESTION_TABLE
+                'SELECT COUNT(*) as cnt FROM ' . CoreTables::Questions->value
                     . " WHERE id='{$uuid->toString()}'"
             )
         )->cnt === 0;
diff --git a/components/ILIAS/Questions/src/Persistence/Storable.php b/components/ILIAS/Questions/src/Persistence/Storable.php
index 429e65f8ef30..82290134d3e6 100644
--- a/components/ILIAS/Questions/src/Persistence/Storable.php
+++ b/components/ILIAS/Questions/src/Persistence/Storable.php
@@ -22,6 +22,11 @@
 
 interface Storable
 {
-    public function toStorage(Manipulate $manipulate): Manipulate;
-    public function toDelete(Manipulate $manipulate): Manipulate;
+    public function toStorage(
+        Manipulate $manipulate
+    ): Manipulate;
+
+    public function toDelete(
+        Manipulate $manipulate
+    ): Manipulate;
 }
diff --git a/components/ILIAS/Questions/src/Persistence/TableNameSpaceCore.php b/components/ILIAS/Questions/src/Persistence/TableNameSpaceCore.php
index 9c8b747841e5..aa7815dabc80 100644
--- a/components/ILIAS/Questions/src/Persistence/TableNameSpaceCore.php
+++ b/components/ILIAS/Questions/src/Persistence/TableNameSpaceCore.php
@@ -27,6 +27,7 @@ public function __construct(
     ) {
     }
 
+    #[\Override]
     public function getTypeSpecificTableNamePart(): string
     {
         return $this->answer_form_id;
diff --git a/components/ILIAS/Questions/src/Persistence/Update.php b/components/ILIAS/Questions/src/Persistence/Update.php
index df4e1bd22cdf..0631f6099b59 100644
--- a/components/ILIAS/Questions/src/Persistence/Update.php
+++ b/components/ILIAS/Questions/src/Persistence/Update.php
@@ -48,44 +48,59 @@ public function __construct(
         }
     }
 
-    public function toManipulateString(\ilDBInterface $db): string
+    public function getTableToLock(): string
     {
+        return $this->columns[0]->getTableName();
+    }
+
+    public function toManipulateString(
+        \ilDBInterface $db
+    ): string {
         return "UPDATE {$this->columns[0]->getTableName()}" . PHP_EOL
             . $this->buildSetterString($db) . PHP_EOL
             . $this->buildWhereString($db);
     }
 
-    private function buildSetterString(\ilDBInterface $db): string
-    {
+    private function buildSetterString(
+        \ilDBInterface $db
+    ): string {
         return trim(
             array_reduce(
                 array_keys($this->columns),
                 fn(string $c, int $v): string => $c
-                    . "{$this->columns[$v]->getColumnString()} = {$this->values[$v]->getQuotedValue()},",
+                    . "{$this->columns[$v]->getColumnString()} = {$this->values[$v]->getQuotedValue($db)},",
                 'SET '
             ),
             ','
         );
     }
 
-    private function buildWhereString(\ilDBInterface $db): string
-    {
+    private function buildWhereString(
+        \ilDBInterface $db
+    ): string {
         $values = [];
-
         return sprintf(
             array_reduce(
                 $this->where,
                 function (?string $c, Where $v) use ($db, &$values): string {
-                    $values[] = $v->getRight()->getQuotedValue($db);
+                    $quoted_value = $v->getRight()->getQuotedValue($db);
+                    if (is_array($quoted_value)) {
+                        $values = array_merge(
+                            $values,
+                            array_values($quoted_value)
+                        );
+                    } else {
+                        $values[] = $quoted_value;
+                    }
 
                     if ($c === null) {
                         return "WHERE {$v->toSql()}" . PHP_EOL;
                     }
 
-                    return "{$c}{$v->getLogicalOperator()} {$v->toSql()}" . PHP_EOL;
+                    return "{$c}{$v->getLogicalOperator()->value} {$v->toSql()}" . PHP_EOL;
                 }
-            ),
-            $values
+            ) ?? '',
+            ...$values
         );
     }
 }
diff --git a/components/ILIAS/Questions/src/Persistence/Value.php b/components/ILIAS/Questions/src/Persistence/Value.php
index 9d7e48fa54fc..bb986140fd4c 100644
--- a/components/ILIAS/Questions/src/Persistence/Value.php
+++ b/components/ILIAS/Questions/src/Persistence/Value.php
@@ -22,6 +22,9 @@
 
 class Value
 {
+    /*
+     * @param $type Type definition as provided by \ilDBConstants
+     */
     public function __construct(
         private readonly string $type,
         private readonly null|string|int|float|array $value
@@ -38,9 +41,20 @@ public function getValue(): string|int|array
         return $this->value;
     }
 
-    public function getQuotedValue(\ilDBInterface $db): string
-    {
-        return $db->quote($this->value, $this->type);
+    public function getQuotedValue(
+        \ilDBInterface $db
+    ): array|string {
+        if (!is_array($this->value)) {
+            return $db->quote(
+                $this->value,
+                $this->type
+            );
+        }
+
+        return array_map(
+            fn(mixed $v): string => $db->quote($v, $this->type),
+            $this->value
+        );
     }
 
     public function getNumberOfElements(): int
diff --git a/components/ILIAS/Questions/src/Persistence/Where.php b/components/ILIAS/Questions/src/Persistence/Where.php
index 179345f5e6cc..b57d202bdde3 100644
--- a/components/ILIAS/Questions/src/Persistence/Where.php
+++ b/components/ILIAS/Questions/src/Persistence/Where.php
@@ -33,7 +33,7 @@ public function __construct(
 
     public function toSql(): string
     {
-        return $this->negate ? 'NOT ' : ''
+        return ($this->negate ? 'NOT ' : '')
             . $this->comparison->toSql(
                 $this->left,
                 $this->right->getNumberOfElements()
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/CarryWrapper.php b/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
similarity index 84%
rename from components/ILIAS/Questions/src/Presentation/Layout/Definitions/CarryWrapper.php
rename to components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
index 87a4328128a4..3733be691737 100755
--- a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/CarryWrapper.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Layout\Definitions;
+namespace ILIAS\Questions\Presentation\Definitions;
 
 use ILIAS\Refinery\Transformation;
 
@@ -34,15 +34,18 @@ public function __construct(
      * of `CarrySectionData` containing the next nesting level if the value contains
      * values from multiple variables from $_POST.
      */
-    public function retrieve(string $key, Transformation $transformation): mixed
-    {
+    public function retrieve(
+        string $key,
+        Transformation $transformation
+    ): mixed {
         return $transformation->transform(
             $this->retrieveValueFromArray($key)
         );
     }
 
-    private function retrieveValueFromArray(string $key): mixed
-    {
+    private function retrieveValueFromArray(
+        string $key
+    ): mixed {
         $value = $this->raw_values[$key] ?? null;
 
         if ($value === null) {
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Environment.php b/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
similarity index 67%
rename from components/ILIAS/Questions/src/Presentation/Layout/Definitions/Environment.php
rename to components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
index 151bfd712cee..47a22825935d 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Environment.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
@@ -18,20 +18,31 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Layout\Definitions;
+namespace ILIAS\Questions\Presentation\Definitions;
 
 use ILIAS\Questions\AnswerForm\Properties;
-use ILIAS\Questions\Presentation\Definitions\Editability;
+use ILIAS\Questions\Presentation\Layout\Factory;
 use ILIAS\UI\URLBuilder;
 
 interface Environment
 {
-    public function getDefinitionsFactory(): Factory;
+    public function getPresentationFactory(): Factory;
+
     public function getUrlBuilder(): URLBuilder;
-    public function getUrlBuilderWithStepParameter(string $step): URLBuilder;
+
+    public function getUrlBuilderWithStepParameter(
+        string $step
+    ): URLBuilder;
+
     public function getStep(): string;
+
     public function withDefaultStep(): self;
+
     public function getEditability(): Editability;
-    public function getProperties(): ?Properties;
-    public function withProperties(Properties $properties): self;
+
+    public function getAnswerFormProperties(): ?Properties;
+
+    public function withAnswerFormProperties(
+        Properties $properties
+    ): self;
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
similarity index 63%
rename from components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php
rename to components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
index 4d45ddd4c373..c197e52faca3 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EnvironmentImplementation.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
@@ -18,10 +18,10 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Layout\Definitions;
+namespace ILIAS\Questions\Presentation\Definitions;
 
 use ILIAS\Questions\AnswerForm\Properties;
-use ILIAS\Questions\Presentation\Definitions\Editability;
+use ILIAS\Questions\Presentation\Layout\Factory;
 use ILIAS\Data\URI;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
@@ -37,8 +37,11 @@ class EnvironmentImplementation implements Environment
     private const string TOKEN_STRING_ACTION = 'a';
     private const string TOKEN_STRING_STEP = 's';
     private const string TOKEN_STRING_QUESTION_ID = 'q';
+    private const string TOKEN_STRING_QUESTION_IDS = 'qs';
     private const string TOKEN_TYPE_HASH = 't';
 
+    private const string INTERRUPTIVE_ITEMS_KEY = 'interruptive_items';
+
     private ?Properties $properties = null;
 
     private bool $default_step = false;
@@ -47,6 +50,7 @@ class EnvironmentImplementation implements Environment
     private readonly URLBuilderToken $action_token;
     private readonly URLBuilderToken $step_token;
     private readonly URLBuilderToken $question_id_token;
+    private readonly URLBuilderToken $question_ids_token;
     private readonly URLBuilderToken $type_hash_token;
 
     public function __construct(
@@ -54,28 +58,33 @@ public function __construct(
         private readonly HTTPServices $http,
         private readonly Refinery $refinery,
         private readonly UuidFactory $uuid_factory,
-        private readonly Factory $definitions_factory,
+        private readonly Factory $presentation_factory,
         private readonly Editability $editability,
         URI $base_uri
     ) {
         $this->acquireURLBuilderAndParameters($base_uri);
     }
 
-    public function getDefinitionsFactory(): Factory
+    #[\Override]
+    public function getPresentationFactory(): Factory
     {
-        return $this->definitions_factory;
+        return $this->presentation_factory;
     }
 
+    #[\Override]
     public function getUrlBuilder(): URLBuilder
     {
         return $this->url_builder;
     }
 
-    public function getUrlBuilderWithStepParameter(string $step): URLBuilder
-    {
+    #[\Override]
+    public function getUrlBuilderWithStepParameter(
+        string $step
+    ): URLBuilder {
         return $this->getUrlBuilder()->withParameter($this->step_token, $step);
     }
 
+    #[\Override]
     public function withDefaultStep(): self
     {
         $clone = clone $this;
@@ -83,6 +92,7 @@ public function withDefaultStep(): self
         return $clone;
     }
 
+    #[\Override]
     public function getStep(): string
     {
         return $this->default_step
@@ -90,46 +100,58 @@ public function getStep(): string
             : $this->retrieveStringValueForToken($this->step_token, self::TOKEN_STRING_STEP);
     }
 
+    #[\Override]
     public function getEditability(): Editability
     {
         return $this->editability;
     }
 
-    public function getProperties(): ?Properties
+    #[\Override]
+    public function getAnswerFormProperties(): ?Properties
     {
         return $this->properties;
     }
 
-    public function withProperties(Properties $properties): self
-    {
+    #[\Override]
+    public function withAnswerFormProperties(
+        Properties $properties
+    ): self {
         $clone = clone $this;
         $clone->properties = $properties;
         return $clone;
     }
 
+    public function getQuestionIdsToken(): URLBuilderToken
+    {
+        return $this->question_ids_token;
+    }
+
     public function getAction(): string
     {
         return $this->retrieveStringValueForToken($this->action_token);
     }
 
-    public function withActionParameter(string $action): self
-    {
+    public function withActionParameter(
+        string $action
+    ): self {
         $clone = clone $this;
         $clone->url_builder = $this->url_builder
             ->withParameter($this->action_token, $action);
         return $clone;
     }
 
-    public function withQuestionIdParameter(Uuid $question_id): self
-    {
+    public function withQuestionIdParameter(
+        Uuid $question_id
+    ): self {
         $clone = clone $this;
         $clone->url_builder = $this->url_builder
             ->withParameter($this->question_id_token, $question_id->toString());
         return $clone;
     }
 
-    public function withAnswerFormTypeHashParameter(string $type_hash): self
-    {
+    public function withAnswerFormTypeHashParameter(
+        string $type_hash
+    ): self {
         $clone = clone $this;
         $clone->url_builder = $this->url_builder
             ->withParameter($this->type_hash_token, $type_hash);
@@ -142,10 +164,43 @@ public function getQuestionId(): ?Uuid
             $this->question_id_token->getName(),
             $this->refinery->byTrying([
                 $this->refinery->custom()->transformation(
-                    fn($v): Uuid => $this->uuid_factory->fromString($v)
+                    $this->buildRetrieveQuestionIdClosure()
+                ),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
+    /**
+     * This function will either return the QuestionIds from the corresponding
+     * $_GET parameter OR from an InterruptiveItems $_POST value.
+     * @return array<\ILIAS\Data\UUID\Uuid>|string|null
+     */
+    public function getQuestionIds(): array|string|null
+    {
+        return $this->http->wrapper()->query()->retrieve(
+            $this->question_ids_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->custom()->transformation(
+                    fn($v): string => $v === ['ALL_OBJECTS']
+                        ? 'ALL_OBJECTS'
+                        : throw new \UnexpectedValueException()
+                ),
+                $this->refinery->kindlyTo()->listOf(
+                    $this->refinery->custom()->transformation(
+                        $this->buildRetrieveQuestionIdClosure()
+                    )
                 ),
                 $this->refinery->always(null)
             ])
+        ) ?? $this->http->wrapper()->post()->retrieve(
+            self::INTERRUPTIVE_ITEMS_KEY,
+            $this->refinery->kindlyTo()->listOf(
+                $this->refinery->custom()->transformation(
+                    $this->buildRetrieveQuestionIdClosure()
+                )
+            ),
+            $this->refinery->always(null)
         );
     }
 
@@ -163,13 +218,15 @@ public function setParametersForQuestionCmds(): void
         );
     }
 
-    private function acquireURLBuilderAndParameters(URI $base_uri): void
-    {
+    private function acquireURLBuilderAndParameters(
+        URI $base_uri
+    ): void {
         [
             $this->url_builder,
             $this->action_token,
             $this->step_token,
             $this->question_id_token,
+            $this->question_ids_token,
             $this->type_hash_token
         ] = (new URLBuilder($base_uri))
             ->acquireParameters(
@@ -177,6 +234,7 @@ private function acquireURLBuilderAndParameters(URI $base_uri): void
                 self::TOKEN_STRING_ACTION,
                 self::TOKEN_STRING_STEP,
                 self::TOKEN_STRING_QUESTION_ID,
+                self::TOKEN_STRING_QUESTION_IDS,
                 self::TOKEN_TYPE_HASH
             );
     }
@@ -197,4 +255,11 @@ private function buildStringTrafo(): Transformation
             $this->refinery->always('')
         ]);
     }
+
+    private function buildRetrieveQuestionIdClosure(): \Closure
+    {
+        return fn($v): Uuid => is_string($v)
+            ? $this->uuid_factory->fromString($v)
+            : throw new \UnexpectedValueException();
+    }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Leaf.php b/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
similarity index 92%
rename from components/ILIAS/Questions/src/Presentation/Layout/Definitions/Leaf.php
rename to components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
index 66e8e0bf572d..55e80b2bc9a3 100755
--- a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Leaf.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Layout\Definitions;
+namespace ILIAS\Questions\Presentation\Definitions;
 
 class Leaf
 {
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Async.php b/components/ILIAS/Questions/src/Presentation/Layout/Async.php
new file mode 100644
index 000000000000..f1de349ba47c
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Async.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation\Layout;
+
+use ILIAS\Filesystem\Stream\Streams;
+use ILIAS\HTTP\Services as HttpService;
+use ILIAS\UI\Component\MessageBox\MessageBox;
+use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
+use ILIAS\UI\Component\Modal\RoundTrip as RoundTripModal;
+use ILIAS\UI\Renderer as UIRenderer;
+
+class Async
+{
+    public function __construct(
+        private readonly HttpService $http,
+        private readonly InterruptiveModal|RoundTripModal|MessageBox $content
+    ) {
+    }
+
+    public function render(
+        UIRenderer $ui_renderer
+    ): void {
+        $this->http->saveResponse(
+            $this->http->response()->withBody(
+                Streams::ofString(
+                    $ui_renderer->renderAsync($this->content)
+                )
+            )
+        );
+        $this->http->sendResponse();
+        $this->http->close();
+    }
+
+
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditForm.php b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
similarity index 82%
rename from components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditForm.php
rename to components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
index dfe92b2075b8..2cb3470ad41c 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditForm.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
@@ -18,13 +18,14 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Layout\Definitions;
+namespace ILIAS\Questions\Presentation\Layout;
 
 use ILIAS\Language\Language;
 use ILIAS\UI\Component\Input\Container\Form\Factory as FormFactory;
 use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\Renderer as UIRenderer;
@@ -39,6 +40,7 @@ class EditForm
 
     private ?StandardPanel $content_before_form = null;
     private ?StandardPanel $content_after_form = null;
+    private ?InterruptiveModal $confirmation = null;
 
     public function __construct(
         private readonly FormFactory $form_factory,
@@ -51,20 +53,30 @@ public function __construct(
         $this->form = $this->buildForm();
     }
 
-    public function withContentBeforeForm(StandardPanel $content): self
-    {
+    public function withContentBeforeForm(
+        StandardPanel $content
+    ): self {
         $clone = clone $this;
         $clone->content_before_form = $content;
         return $clone;
     }
 
-    public function withContentAfterForm(StandardPanel $content): self
-    {
+    public function withContentAfterForm(
+        StandardPanel $content
+    ): self {
         $clone = clone $this;
         $clone->content_after_form = $content;
         return $clone;
     }
 
+    public function withConfirmation(
+        InterruptiveModal $confirmation_modal
+    ): self {
+        $clone = clone $this;
+        $clone->confirmation = $confirmation_modal;
+        return $clone;
+    }
+
     public function render(
         UIRenderer $ui_renderer
     ): string {
@@ -99,6 +111,12 @@ private function buildContent(): array
             $content[] = $this->content_after_form;
         }
 
+        if ($this->confirmation !== null) {
+            $content[] = $this->confirmation->withOnLoad(
+                $this->confirmation->getShowSignal()
+            );
+        }
+
         return $content;
     }
 
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditOverview.php b/components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php
similarity index 62%
rename from components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditOverview.php
rename to components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php
index eee4451940e2..440884a95599 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/EditOverview.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php
@@ -18,11 +18,12 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Layout\Definitions;
+namespace ILIAS\Questions\Presentation\Layout;
 
-use ILIAS\Questions\AnswerForm\Properties;
+use ILIAS\Questions\Presentation\Definitions\Editability;
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Data\URI;
 use ILIAS\Language\Language;
-use ILIAS\UI\URLBuilder;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\UI\Renderer as UIRenderer;
@@ -30,16 +31,13 @@
 
 class EditOverview
 {
-    private bool $orderable = false;
-
     public function __construct(
         private readonly UIFactory $ui_factory,
         private readonly Language $lng,
-        private readonly Editability $editability,
-        private readonly URLBuilder $url_builder,
-        private readonly Properties $answer_form_properties
+        private readonly ServerRequestInterface $request,
+        private readonly Environment $environment,
+        private readonly URI $uri_to_edit_basic_answer_form_properties
     ) {
-        $this->form = $this->buildForm();
     }
 
     public function render(
@@ -48,26 +46,16 @@ public function render(
         return $ui_renderer->render($this->buildContent());
     }
 
-    public function withRequest(
-        ServerRequestInterface $request
-    ): self {
-        $clone = clone $this;
-        $clone->form = $clone->form->withRequest($request);
-        return $clone;
-    }
-
-    public function withOrderable(bool $orderable): self
-    {
-        $clone = clone $this;
-        $clone->orderable = $orderable;
-        return $clone;
-    }
-
     private function buildContent(): array
     {
         return [
             $this->buildBasicAnswerFormPanel(),
-            $this->answer_form_properties->getOverviewTable()
+            $this->environment->getAnswerFormProperties()->getOverviewTable(
+                $this->ui_factory->table(),
+                $this->lng,
+                $this->request,
+                $this->environment
+            )
         ];
     }
 
@@ -75,14 +63,14 @@ private function buildBasicAnswerFormPanel(): StandardPanel
     {
         $content = [
             $this->ui_factory->listing()->descriptive(
-                $this->answer_form_properties->getBasicPropertiesForListing($this->lng)
+                $this->environment->getAnswerFormProperties()->getBasicPropertiesForListing($this->lng)
             )
         ];
 
-        if ($this->editability === Editability::Full) {
+        if ($this->environment->getEditability() === Editability::Full) {
             $content[] = $this->ui_factory->button()->standard(
                 $this->lng->txt('edit_basic_answer_form_properties'),
-                $this->url_builder->buildURI()->__toString()
+                $this->uri_to_edit_basic_answer_form_properties->__toString()
             );
         }
 
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Factory.php b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
similarity index 72%
rename from components/ILIAS/Questions/src/Presentation/Layout/Definitions/Factory.php
rename to components/ILIAS/Questions/src/Presentation/Layout/Factory.php
index d5ee413e8c5f..a2bc23fbc70d 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/Factory.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
@@ -18,9 +18,13 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Layout\Definitions;
+namespace ILIAS\Questions\Presentation\Layout;
 
-use ILIAS\Questions\AnswerForm\Properties;
+use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Questions\Presentation\Definitions\Leaf;
+use ILIAS\Data\URI;
+use ILIAS\HTTP\Services as HttpService;
 use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -28,30 +32,29 @@
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
-use ILIAS\UI\Component\Table\Data as DataTable;
-use ILIAS\UI\Component\Table\Ordering as OrderingTable;
+use ILIAS\UI\Component\MessageBox\MessageBox;
+use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
+use ILIAS\UI\Component\Modal\RoundTrip as RoundTripModal;
 
 class Factory
 {
     public function __construct(
         private readonly UIFactory $ui_factory,
+        private readonly HttpService $http,
         private readonly Language $lng
     ) {
     }
 
     public function getEditOverview(
-        Editability $editability,
-        URLBuilder $url_builder,
-        DataTable|OrderingTable $answer_elements_table,
-        Properties $answer_form_properties
+        Environment $environment,
+        URI $uri_to_edit_basic_answer_form_properties
     ): EditOverview {
         return new EditOverview(
             $this->ui_factory,
             $this->lng,
-            $editability,
-            $url_builder,
-            $answer_elements_table,
-            $answer_form_properties
+            $this->http->request(),
+            $environment,
+            $uri_to_edit_basic_answer_form_properties
         );
     }
 
@@ -71,6 +74,15 @@ public function getEditForm(
         );
     }
 
+    public function getAsync(
+        InterruptiveModal|RoundTripModal|MessageBox $content
+    ): Async {
+        return new Async(
+            $this->http,
+            $content
+        );
+    }
+
     public function getCarrySectionData(
         ArrayBasedRequestWrapper $post_wrapper,
         Refinery $refinery
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/GlobalScreen/LayoutProvider.php b/components/ILIAS/Questions/src/Presentation/Layout/GlobalScreen/LayoutProvider.php
index e3a9cb948116..590231b8a9c0 100755
--- a/components/ILIAS/Questions/src/Presentation/Layout/GlobalScreen/LayoutProvider.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/GlobalScreen/LayoutProvider.php
@@ -43,19 +43,23 @@ class LayoutProvider extends AbstractModificationProvider
 
     private const MODIFICATION_PRIORITY = 5; //slightly above "low"
 
+    #[\Override]
     public function isInterestedInContexts(): ContextCollection
     {
         return $this->context_collection->main();
     }
 
-    protected function isModeEnabled(CalledContexts $called_contexts): bool
-    {
+    protected function isModeEnabled(
+        CalledContexts $called_contexts
+    ): bool {
         return $called_contexts->current()->getAdditionalData()
             ->is(self::MODE_ENABLED, true);
     }
 
-    public function getBreadCrumbsModification(CalledContexts $called_contexts): ?BreadCrumbsModification
-    {
+    #[\Override]
+    public function getBreadCrumbsModification(
+        CalledContexts $called_contexts
+    ): ?BreadCrumbsModification {
         if (!$this->isModeEnabled($called_contexts)) {
             return null;
         }
@@ -68,8 +72,10 @@ function (?Breadcrumbs $current): ?Breadcrumbs {
             )->withPriority(self::MODIFICATION_PRIORITY);
     }
 
-    public function getMainBarModification(CalledContexts $called_contexts): ?MainBarModification
-    {
+    #[\Override]
+    public function getMainBarModification(
+        CalledContexts $called_contexts
+    ): ?MainBarModification {
         $mainbar = $this->globalScreen()->layout()->factory()->mainbar();
 
         if (!$this->isModeEnabled($called_contexts)) {
@@ -82,8 +88,10 @@ public function getMainBarModification(CalledContexts $called_contexts): ?MainBa
             )->withPriority(self::MODIFICATION_PRIORITY);
     }
 
-    public function getMetaBarModification(CalledContexts $called_contexts): ?MetaBarModification
-    {
+    #[\Override]
+    public function getMetaBarModification(
+        CalledContexts $called_contexts
+    ): ?MetaBarModification {
         if (!$this->isModeEnabled($called_contexts)) {
             return null;
         }
@@ -96,8 +104,10 @@ function (?MetaBar $current): ?MetaBar {
             )->withPriority(self::MODIFICATION_PRIORITY);
     }
 
-    public function getPageBuilderDecorator(CalledContexts $called_contexts): ?PageBuilderModification
-    {
+    #[\Override]
+    public function getPageBuilderDecorator(
+        CalledContexts $called_contexts
+    ): ?PageBuilderModification {
         if (!$this->isModeEnabled($called_contexts)) {
             return null;
         }
@@ -118,8 +128,9 @@ static function (PagePartProvider $parts) use ($mode_info): Page {
             );
     }
 
-    private function buildMainbarModification(CalledContexts $called_contexts): \Closure
-    {
+    private function buildMainbarModification(
+        CalledContexts $called_contexts
+    ): \Closure {
         return function (?MainBar $mainbar) use ($called_contexts): ?MainBar {
             if ($mainbar === null) {
                 return null;
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
similarity index 79%
rename from components/ILIAS/Questions/src/Presentation/Layout/Definitions/QuestionsTable.php
rename to components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
index 7be8ac24903a..b6e87a2e7c11 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Definitions/QuestionsTable.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
@@ -18,26 +18,28 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Layout\Definitions;
+namespace ILIAS\Questions\Presentation\Layout;
 
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Presentation\Views\Edit;
-use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Persistence\Repository;
 use ILIAS\Data\Range;
 use ILIAS\Data\Order;
-use ILIAS\UI\Component\Table;
+use ILIAS\Language\Language;
+use ILIAS\UI\Component\Table\DataRetrieval;
+use ILIAS\UI\Component\Table\DataRowBuilder;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Renderer as UIRenderer;
 use ILIAS\UI\Component\Input\Container\Filter\Standard as Filter;
 use Psr\Http\Message\ServerRequestInterface;
 
-class QuestionsTable implements Table\DataRetrieval
+class QuestionsTable implements DataRetrieval
 {
     public function __construct(
         private readonly UIFactory $ui_factory,
         private readonly \ilUIService $ui_service,
-        private readonly \ilLanguage $lng,
+        private readonly Language $lng,
         private readonly ServerRequestInterface $request,
         private readonly AnswerFormFactory $answer_form_factory,
         private readonly Repository $questions_repository,
@@ -52,18 +54,9 @@ public function render(
         return $ui_renderer->render($this->buildContent());
     }
 
-    public function getColums(): array
-    {
-        $f = $this->ui_factory->table()->column();
-
-        return [
-            'title' => $f->link($this->lng->txt('title')),
-            'type' => $f->text($this->lng->txt('question_type'))->withIsOptional(true, true),
-        ];
-    }
-
+    #[\Override]
     public function getRows(
-        Table\DataRowBuilder $row_builder,
+        DataRowBuilder $row_builder,
         array $visible_column_ids,
         Range $range,
         Order $order,
@@ -83,6 +76,7 @@ public function getRows(
         }
     }
 
+    #[\Override]
     public function getTotalRowCount(
         mixed $additional_viewcontrol_data,
         mixed $filter_data,
@@ -99,12 +93,15 @@ private function buildContent(): array
                 $this,
                 $this->lng->txt('questions'),
                 $this->getColums(),
+            )->withActions(
+                $this->getActions()
             )->withRequest($this->request)
         ];
     }
 
-    private function buildFilter(string $action): Filter
-    {
+    private function buildFilter(
+        string $action
+    ): Filter {
         $question_type_options = [
             '' => $this->lng->txt('filter_all_question_types')
         ];
@@ -130,4 +127,26 @@ private function buildFilter(string $action): Filter
         );
         return $filter;
     }
+
+    private function getColums(): array
+    {
+        $f = $this->ui_factory->table()->column();
+
+        return [
+            'title' => $f->link($this->lng->txt('title')),
+            'type' => $f->text($this->lng->txt('question_type'))->withIsOptional(true, true),
+        ];
+    }
+
+    private function getActions(): array
+    {
+        return [
+            'delete' => $this->ui_factory->table()->action()->standard(
+                $this->lng->txt('delete'),
+                $this->environment->withActionParameter(Edit::CMD_DELETE_QUESTION)
+                    ->getUrlBuilder(),
+                $this->environment->getQuestionIdsToken()
+            )->withAsync(true)
+        ];
+    }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index e92128dad7c5..5aacdf92d1d6 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -20,15 +20,19 @@
 
 namespace ILIAS\Questions\Presentation\Views;
 
-use ILIAS\Questions\Presentation\Layout\Definitions\EditForm;
-use ILIAS\Questions\Presentation\Layout\Definitions\Factory as DefinitionsFactory;
+use ILIAS\Questions\Presentation\Layout\Async;
+use ILIAS\Questions\Presentation\Layout\EditForm;
+use ILIAS\Questions\Presentation\Layout\EditOverview;
+use ILIAS\Questions\Presentation\Layout\Factory as DefinitionsFactory;
 use ILIAS\Questions\Presentation\Definitions\Editability;
-use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
-use ILIAS\Questions\Presentation\Layout\Definitions\QuestionsTable;
+use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
+use ILIAS\Questions\Presentation\Layout\QuestionsTable;
 use ILIAS\Questions\Presentation\Layout\GlobalScreen\LayoutProvider;
 use ILIAS\Questions\AnswerForm\Definition;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
+use ILIAS\Questions\AnswerForm\Views\Edit as AnswerFormEditView;
 use ILIAS\Questions\Persistence\Repository;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\Factory as DataFactory;
@@ -48,6 +52,7 @@ class Edit
 {
     private const string CMD_CREATE_QUESTION = 'create';
     public const string CMD_EDIT_QUESTION = 'edit';
+    public const string CMD_DELETE_QUESTION = 'delete';
     private const string CMD_CREATE_ANSWER_FORM = 'create_af';
     private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
 
@@ -73,23 +78,26 @@ public function __construct(
     ) {
     }
 
-    public function withRequiredCapabilities(array $capability_class_names): self
-    {
+    public function withRequiredCapabilities(
+        array $capability_class_names
+    ): self {
         $this->checkCapabilities($capability_class_names);
         $clone = clone $this;
         $clone->required_capabilities = $capability_class_names;
         return $clone;
     }
 
-    public function withEditable(Editability $editability): self
-    {
+    public function withEditable(
+        Editability $editability
+    ): self {
         $clone = clone $this;
         $clone->editability = $editability;
         return $clone;
     }
 
-    public function withOrderingEnabled(bool $enable): self
-    {
+    public function withOrderingEnabled(
+        bool $enable
+    ): self {
         $clone = clone $this;
         $clone->ordering_enabled = $enable;
         return $clone;
@@ -98,11 +106,12 @@ public function withOrderingEnabled(bool $enable): self
     public function view(
         \ilToolbarGUI $toolbar,
         URI $base_uri
-    ): QuestionsTable|EditForm {
+    ): Async|QuestionsTable|EditForm {
         $environment = $this->buildEnvironment($base_uri);
         return match($environment->getAction()) {
             self::CMD_CREATE_QUESTION => $this->createQuestion($environment),
             self::CMD_EDIT_QUESTION => $this->editQuestion($environment),
+            self::CMD_DELETE_QUESTION => $this->deleteQuestion($environment),
             default => $this->showTable($toolbar, $environment)
         };
     }
@@ -123,7 +132,6 @@ public function forwardPageCmds(
                         ->withQuestionIdParameter($environment->getQuestionId())
                         ->getUrlBuilder()
                         ->buildURI(),
-                    $this,
                     $this->questions_repository->getForQuestionId($environment->getQuestionId())
                 )
             )
@@ -140,15 +148,23 @@ public function createAnswerForm(
             ->withQuestionIdParameter($question->getId());
 
         $answer_form_type_class_hash = $environment->getTypeClassHast();
+
         if ($answer_form_type_class_hash !== '') {
+            $type = $this->answer_form_factory
+                ->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash);
+
             return $this->forwardCreateAnswerFormCmd(
-                $environment->withAnswerFormTypeHashParameter($answer_form_type_class_hash),
+                $environment->withAnswerFormProperties(
+                    $type->buildProperties(
+                        $this->answer_form_factory->getDefaultTypeGenericProperties(
+                            $question->getId()
+                        ),
+                        null
+                    )
+                )->withAnswerFormTypeHashParameter($answer_form_type_class_hash),
                 $question,
                 $content_object,
-                $this->answer_form_factory->buildTypeDefinitionFromSelectValue($answer_form_type_class_hash),
-                $this->answer_form_factory->getDefaultTypeGenericProperties(
-                    $question->getId()
-                )
+                $type->getEditView()
             );
         }
 
@@ -166,16 +182,25 @@ public function createAnswerForm(
     public function editAnswerForm(
         URI $base_uri,
         QuestionImplementation $question,
-        \ilPCAnswerForm $content_object
-    ): EditForm|EditOverview {
+        AnswerFormProperties $answer_form_properties,
+        Definition $type
+    ): Async|EditForm|EditOverview {
         $environment = $this->buildEnvironment($base_uri)
+            ->withAnswerFormProperties($answer_form_properties)
             ->withActionParameter(self::CMD_EDIT_ANSWER_FORM)
             ->withQuestionIdParameter($question->getId());
 
-        return match($environment->getAction()) {
-            self::CMD_EDIT_ANSWER_FORM => $this->processCreateAnswerForm($environment->getUrlBuilder()),
-            default => $this->forwardEditAnswerFormCmd($environment)
-        };
+        $edit = $type->getEditView()->edit($environment);
+
+        if (!($edit instanceof AnswerFormProperties)) {
+            return $edit;
+        }
+
+        $this->questions_repository->update(
+            [$question->withAnswerForm($edit)]
+        );
+
+        $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
     }
 
     private function createQuestion(
@@ -200,12 +225,14 @@ private function createQuestion(
         }
 
         $this->questions_repository->create([$create]);
-        return $this->buildEditStartView(
+        return $this->ctrl->redirectToURL(
             $environment
                 ->withDefaultStep()
                 ->withActionParameter(self::CMD_EDIT_QUESTION)
-                ->withQuestionIdParameter($create->getId()),
-            $create
+                ->withQuestionIdParameter($create->getId())
+                ->getUrlBuilder()
+                ->buildURI()
+                ->__toString()
         );
 
     }
@@ -237,11 +264,53 @@ private function editQuestion(
 
         $this->questions_repository->update([$edit]);
         return $this->buildEditStartView(
-            $environment->withQuestionIdParameter($question_id),
+            $environment
+                ->withDefaultStep()
+                ->withActionParameter(self::CMD_EDIT_QUESTION)
+                ->withQuestionIdParameter($question_id),
             $edit
         );
     }
 
+    private function deleteQuestion(
+        EnvironmentImplementation $environment
+    ): Async {
+        $question_ids = $environment->getQuestionIds();
+
+        if ($question_ids === null) {
+            return $environment->getPresentationFactory()->getAsync(
+                $this->ui_factory->messageBox()->failure(
+                    $this->lng->txt('msg_no_questions_selected')
+                )
+            );
+        }
+
+        if ($environment->getStep() === self::CMD_DELETE_QUESTION) {
+            $this->questions_repository->delete(
+                iterator_to_array(
+                    $this->questions_repository->getForQuestionIds($question_ids)
+                )
+            );
+            $this->ctrl->redirectToURL(
+                $environment->getUrlBuilder()->buildURI()->__toString()
+            );
+        }
+
+        return $environment->getPresentationFactory()->getAsync(
+            $this->ui_factory->modal()->interruptive(
+                $this->lng->txt('confirm'),
+                $this->lng->txt('qpl_confirm_delete_questions'),
+                $environment->withActionParameter(
+                    self::CMD_DELETE_QUESTION
+                )->getUrlBuilderWithStepParameter(
+                    self::CMD_DELETE_QUESTION
+                )->buildURI()->__toString()
+            )->withAffectedItems(
+                $this->buildAffectedItems($question_ids)
+            )
+        );
+    }
+
     private function showTable(
         \ilToolbarGUI $toolbar,
         EnvironmentImplementation $environment
@@ -279,13 +348,17 @@ private function processCreateAnswerForm(
         return $data === null
             ? $form
             : $this->forwardCreateAnswerFormCmd(
-                $environment->withAnswerFormTypeHashParameter(
+                $environment->withAnswerFormProperties(
+                    $data->buildProperties(
+                        $generic_answer_form_properties,
+                        null
+                    )
+                )->withAnswerFormTypeHashParameter(
                     $this->answer_form_factory->getHashedClass($data::class)
                 ),
                 $question,
                 $content_obj,
-                $data,
-                $generic_answer_form_properties
+                $data->getEditView()
             );
     }
 
@@ -293,14 +366,9 @@ private function forwardCreateAnswerFormCmd(
         EnvironmentImplementation $environment,
         QuestionImplementation $question,
         \ilPCAnswerForm $content_obj,
-        Definition $type,
-        TypeGenericProperties $type_generic_properties,
+        AnswerFormEditView $answer_form_edit_view
     ): ?EditForm {
-        $create = $type->getEditView()->create(
-            $environment->withProperties(
-                $type->buildProperties($type_generic_properties, null)
-            )
-        );
+        $create = $answer_form_edit_view->create($environment);
 
         if ($create instanceof EditForm) {
             return $create;
@@ -316,6 +384,14 @@ private function forwardCreateAnswerFormCmd(
         $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
     }
 
+    private function forwardEditAnswerFormCmd(
+        EnvironmentImplementation $environment,
+        QuestionImplementation $question,
+        AnswerFormEditView $answer_form_edit_view
+    ): EditForm|EditOverview|Async|null {
+
+    }
+
     private function initializeEditMode(
         EnvironmentImplementation $environment
     ): void {
@@ -395,7 +471,7 @@ private function buildCreateAnswerForm(
         EnvironmentImplementation $environemt
     ): EditForm {
         $if = $this->ui_factory->input();
-        return $environemt->getDefinitionsFactory()->getEditForm(
+        return $environemt->getPresentationFactory()->getEditForm(
             $environemt->getUrlBuilder(),
             $if->field()->section(
                 [
@@ -414,11 +490,36 @@ private function buildCreateAnswerForm(
         );
     }
 
-    private function checkCapabilities(array $capabilities): void
-    {
+    /**
+     *
+     * @param string|array<\ILIAS\Data\UUID\Uuid> $question_ids
+     * @return array<\ILIAS\UI\Component\Modal\InterruptiveItem\Standard>
+     */
+    private function buildAffectedItems(
+        string|array $question_ids
+    ): array {
+        $questions = $question_ids === 'ALL_OBJECTS'
+                ? $this->questions_repository->getAllQuestions()
+                : $this->questions_repository->getForQuestionIds($question_ids);
+        $affected_items = [];
+        foreach ($questions as $question) {
+            $affected_items[] = $this->ui_factory->modal()->interruptiveItem()->standard(
+                $question->getId()->toString(),
+                $question->getTitle()
+            );
+        }
+        return $affected_items;
+    }
+
+    private function checkCapabilities(
+        array $capabilities
+    ): void {
         foreach ($capabilities as $capability) {
             if (!$this->questions_repository->capabilityExists($capability)) {
-                throw new \InvalidArgumentException('All provided capabilities must implement ILIAS\Questions\AnswerForm\Capabilities\Capability.');
+                throw new \InvalidArgumentException(
+                    'All provided capabilities must implement '
+                    . 'ILIAS\Questions\AnswerForm\Capabilities\Capability.'
+                );
             }
         }
     }
diff --git a/components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php b/components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php
index 004f8903c66a..f3debbb9aca0 100644
--- a/components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php
+++ b/components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php
@@ -32,16 +32,18 @@ enum TextMatchingOptions: string
     case Levenstein4 = '4';
     case Levenstein5 = '5';
 
-    public function getLabel(Language $lng): string
-    {
+    public function getLabel(
+        Language $lng
+    ): string {
         return match ($this) {
             self::CaseInsensitive, self::CaseSensitive => $lng->txt($this->value),
             default => sprintf($lng->txt('cloze_textgap_levenshtein_of'), $this->value)
         };
     }
 
-    public static function buildOptionsList(Language $lng): array
-    {
+    public static function buildOptionsList(
+        Language $lng
+    ): array {
         return array_reduce(
             self::cases(),
             function (array $c, self $v) use ($lng): array {
diff --git a/components/ILIAS/Questions/src/Question/Question.php b/components/ILIAS/Questions/src/Question/Question.php
index 3172fdf85186..8ffa5808e0ca 100644
--- a/components/ILIAS/Questions/src/Question/Question.php
+++ b/components/ILIAS/Questions/src/Question/Question.php
@@ -21,7 +21,6 @@
 namespace ILIAS\Questions\Question;
 
 use ILIAS\Questions\Question\Views\Participant;
-use ILIAS\Questions\Persistence\Storable;
 
 interface Question
 {
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index 3620aea14457..9eaa46ab5679 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -22,14 +22,14 @@
 
 use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
 use ILIAS\Questions\Persistence\CoreTables;
+use ILIAS\Questions\Persistence\Delete;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\Update;
 use ILIAS\Questions\Persistence\Manipulate;
 use ILIAS\Questions\Persistence\ManipulationType;
-use ILIAS\Questions\Persistence\Storable;
 use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\Persistence\Where;
-use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
+use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Uuid;
@@ -42,7 +42,7 @@
 use ILIAS\Refinery\Factory as Refinery;
 use Psr\Http\Message\RequestInterface;
 
-class QuestionImplementation implements Question, Storable
+class QuestionImplementation implements Question
 {
     private bool $self_updated = false;
     private array $updated_answer_forms = [];
@@ -181,7 +181,7 @@ public function getAnswerForms(): array
         return $this->answer_forms;
     }
 
-    public function getAnswerFormByIdString(
+    public function getAnswerFormPropertiesByIdString(
         string $form_id
     ): ?AnswerFormProperties {
         return $this->answer_forms[$form_id] ?? null;
@@ -202,7 +202,7 @@ public function withoutDeletedAnswerForms(
         $clone = clone $this;
         foreach (array_keys($this->answer_forms) as $answer_form_id) {
             if (!in_array($answer_form_id, $found_answer_form_ids)) {
-                $this->deleted_answer_forms = $clone->answer_forms[$answer_form_id];
+                $clone->deleted_answer_forms[] = $clone->answer_forms[$answer_form_id];
                 unset($clone->answer_forms[$answer_form_id]);
             }
         }
@@ -282,7 +282,12 @@ public function toStorage(
     public function toDelete(
         Manipulate $manipulate
     ): Manipulate {
-        ;
+        return $this->addDeleteAnswerFormsStatementsToManipulate(
+            $manipulate->withAdditionalStatement(
+                $this->buildDeleteQuestionStatement()
+            ),
+            $this->answer_forms
+        );
     }
 
     private function addInsertStatementsToManipulation(
@@ -321,7 +326,7 @@ private function addUpdateStatementsToManipulation(
         }
 
         if ($this->deleted_answer_forms !== []) {
-            $manipulate = $this->addDeleteAnswerFormStatementsToManipulate(
+            $manipulate = $this->addDeleteAnswerFormsStatementsToManipulate(
                 $manipulate,
                 $this->deleted_answer_forms
             );
@@ -351,6 +356,23 @@ private function buildInsertQuestionStatement(): Insert
         );
     }
 
+    private function buildDeleteQuestionStatement(): Delete
+    {
+        $table_definition = CoreTables::Questions;
+        return new Delete(
+            $table_definition->getTable(),
+            [
+                new Where(
+                    $table_definition->getIdColumn(),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        $this->id->toString()
+                    )
+                )
+            ]
+        );
+    }
+
     private function addAnswerFormStatementsToManipulate(
         Manipulate $manipulate,
         array $answer_forms
@@ -364,7 +386,7 @@ private function addAnswerFormStatementsToManipulate(
         );
     }
 
-    private function addDeleteAnswerFormStatementsToManipulate(
+    private function addDeleteAnswerFormsStatementsToManipulate(
         Manipulate $manipulate,
         array $answer_forms_to_delete
     ): Manipulate {
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index fc7667749e75..db8eb546da50 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -20,8 +20,8 @@
 
 namespace ILIAS\Questions\Question\Views;
 
-use ILIAS\Questions\Presentation\Layout\Definitions\EditForm;
-use ILIAS\Questions\Presentation\Layout\Definitions\EnvironmentImplementation;
+use ILIAS\Questions\Presentation\Layout\EditForm;
+use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Question\Question;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
@@ -74,7 +74,7 @@ public function edit(
     private function buildBasicPropertiesForm(
         EnvironmentImplementation $environment
     ): EditForm {
-        return $environment->getDefinitionsFactory()->getEditForm(
+        return $environment->getPresentationFactory()->getEditForm(
             $environment->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION),
             $this->buildBasicPropertiesInputs(),
             true
@@ -101,8 +101,7 @@ private function buildBasicPropertiesInputs(): Section
             [
                 'title' => $ff->text($this->lng->txt('title'))
                     ->withRequired(true),
-                'author' => $ff->text($this->lng->txt('author'))
-                    ->withValue($this->current_user->getFullname()),
+                'author' => $ff->text($this->lng->txt('author')),
                 'lifecycle' => $ff->select(
                     $this->lng->txt('qst_lifecycle'),
                     array_reduce(
@@ -121,7 +120,9 @@ function (array $c, Lifecycle $v): array {
 
         return $section->withValue([
             'title' => $this->question->getTitle(),
-            'author' => $this->question->getAuthor(),
+            'author' => $this->question->getAuthor() !== ''
+                ? $this->question->getAuthor()
+                : $this->current_user->getFullname(),
             'lifecycle' => $this->question->getLifecycle()->value,
             'remarks' => $this->question->getRemarks()
         ]);
diff --git a/components/ILIAS/Questions/src/Question/Views/Participant.php b/components/ILIAS/Questions/src/Question/Views/Participant.php
index 186f8477de0c..a200938bcdbb 100644
--- a/components/ILIAS/Questions/src/Question/Views/Participant.php
+++ b/components/ILIAS/Questions/src/Question/Views/Participant.php
@@ -34,8 +34,9 @@ public function __construct(
     ) {
     }
 
-    public function withIsAsync(bool $async): self
-    {
+    public function withIsAsync(
+        bool $async
+    ): self {
         foreach ($this->question->getAnswerForms() as $form) {
             if (!$form->getType()->isAsyncPresentationAvailable()) {
                 throw \Exception('This QuestionType has no async presentation.');
@@ -46,15 +47,17 @@ public function withIsAsync(bool $async): self
         return $clone;
     }
 
-    public function withIsInteractive(bool $interactive): self
-    {
+    public function withIsInteractive(
+        bool $interactive
+    ): self {
         $clone = clone $this;
         $clone->interactive = $interactive;
         return $clone;
     }
 
-    public function withShowMarks(bool $show_marks): self
-    {
+    public function withShowMarks(
+        bool $show_marks
+    ): self {
         foreach ($this->question->getAnswerForms() as $form) {
             if (!$form->getType()->isMarkable()) {
                 throw \Exception('This QuestionType cannot be marked.');
@@ -66,8 +69,9 @@ public function withShowMarks(bool $show_marks): self
         return $clone;
     }
 
-    public function withShowCorrectSolution(bool $show_correct_solution): self
-    {
+    public function withShowCorrectSolution(
+        bool $show_correct_solution
+    ): self {
         foreach ($this->question->getAnswerForms() as $form) {
             if (!$form->getType()->isMarkable()) {
                 throw \Exception('This QuestionType cannot be marked.');
diff --git a/components/ILIAS/Questions/src/Response/Repository.php b/components/ILIAS/Questions/src/Response/Repository.php
index 62d40c84fdd4..01e2ff350f1b 100644
--- a/components/ILIAS/Questions/src/Response/Repository.php
+++ b/components/ILIAS/Questions/src/Response/Repository.php
@@ -22,7 +22,16 @@
 
 interface Repository
 {
-    public function getForUser(int $question_id, int $user_id): Result;
-    public function getAllForQuestion(int $question_id): Result;
-    public function storeResult(Result $result): void;
+    public function getForUser(
+        int $question_id,
+        int $user_id
+    ): Result;
+
+    public function getAllForQuestion(
+        int $question_id
+    ): Result;
+
+    public function storeResult(
+        Result $result
+    ): void;
 }
diff --git a/components/ILIAS/Questions/src/Response/Response.php b/components/ILIAS/Questions/src/Response/Response.php
index 5e5f849c3dc9..b2cffed5cb8c 100644
--- a/components/ILIAS/Questions/src/Response/Response.php
+++ b/components/ILIAS/Questions/src/Response/Response.php
@@ -23,8 +23,16 @@
 interface Response
 {
     public function getCorrespondingQuestionType(): QuestionType;
+
     public function getQuestionId(): ?int;
-    public function withQuestionId(int $question_id): self;
+
+    public function withQuestionId(
+        int $question_id
+    ): self;
+
     public function getParticipantId(): ?int;
-    public function withParticipantId(int $participant_id): self;
+
+    public function withParticipantId(
+        int $participant_id
+    ): self;
 }
diff --git a/components/ILIAS/Questions/src/Setup/Agent.php b/components/ILIAS/Questions/src/Setup/Agent.php
index 82af39742651..8c4c934bad95 100644
--- a/components/ILIAS/Questions/src/Setup/Agent.php
+++ b/components/ILIAS/Questions/src/Setup/Agent.php
@@ -30,8 +30,10 @@
 
 class Agent extends NullAgent
 {
-    public function getUpdateObjective(?Config $config = null): Objective
-    {
+    #[\Override]
+    public function getUpdateObjective(
+        ?Config $config = null
+    ): Objective {
         return new ObjectiveCollection(
             'Database is updated for ILIAS\Questions',
             false,
@@ -52,8 +54,10 @@ public function getUpdateObjective(?Config $config = null): Objective
         );
     }
 
-    public function getStatusObjective(Storage $storage): Objective
-    {
+    #[\Override]
+    public function getStatusObjective(
+        Storage $storage
+    ): Objective {
         return new ObjectiveCollection(
             'ILIAS\Questions',
             true,
diff --git a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
index f41dc833c0d8..91a85ec837f4 100644
--- a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
@@ -32,8 +32,10 @@ public function __construct(
     ) {
     }
 
-    public function prepare(\ilDBInterface $db): void
-    {
+    #[\Override]
+    public function prepare(
+        \ilDBInterface $db
+    ): void {
         $this->db = $db;
     }
 
diff --git a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
index b4d007a48138..facc1bbfd274 100644
--- a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
@@ -24,8 +24,10 @@ class OverarchingQuestionTables implements \ilDatabaseUpdateSteps
 {
     protected \ilDBInterface $db;
 
-    public function prepare(\ilDBInterface $db): void
-    {
+    #[\Override]
+    public function prepare(
+        \ilDBInterface $db
+    ): void {
         $this->db = $db;
     }
 

From 93a55830bd0fbc32b9e3790124bae5fd6b089b2a Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 8 Jan 2026 15:34:25 +0100
Subject: [PATCH 096/141] Implement Editing

---
 .../src/AnswerForm/TypeGenericProperties.php  | 16 ++++++++-------
 .../src/AnswerFormTypes/Cloze/Persistence.php |  8 +++++---
 .../Cloze/Properties/ClozeText/Text.php       |  2 +-
 .../Gaps/AnswerOptions/AnswerOptions.php      |  6 ++++++
 .../Cloze/Properties/Gaps/Factory.php         |  3 ++-
 .../Cloze/Properties/Gaps/Gaps.php            |  8 ++++++++
 .../Cloze/Properties/Properties.php           |  4 +++-
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  |  7 ++++---
 .../src/Presentation/Layout/EditForm.php      | 20 +++++++++++++------
 9 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
index 7f78c29fc7da..751f931f2d09 100644
--- a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
@@ -139,7 +139,7 @@ private function buildUpdateStatement(): Update
         $answer_form_table_definition = CoreTables::AnswerForms;
         return new Update(
             $answer_form_table_definition->getColumns([
-                $answer_form_table_definition->getIdColumn(),
+                'id',
                 'type',
                 'question_id',
                 'additional_text_legacy'
@@ -151,13 +151,15 @@ private function buildUpdateStatement(): Update
                 new Value(\ilDBConstants::T_TEXT, $this->additional_text)
 
             ],
-            new Where(
-                $answer_form_table_definition->getIdColumn(),
-                new Value(
-                    \ilDBConstants::T_TEXT,
-                    $this->answer_form_id->toString()
+            [
+                new Where(
+                    $answer_form_table_definition->getIdColumn(),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        $this->answer_form_id->toString()
+                    )
                 )
-            )
+            ]
         );
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
index e20ba498ad78..8f69949b8267 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
@@ -103,9 +103,11 @@ public function getColumns(
         };
         return array_map(
             fn(string $v): Column => new Column($table, $v),
-            array_filter(
-                $column_identifiers,
-                fn(string $v) => !in_array($v, $columns_to_skip)
+            array_values(
+                array_filter(
+                    $column_identifiers,
+                    fn(string $v) => !in_array($v, $columns_to_skip)
+                )
             )
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 92b11995b52a..d9c36a9a09e1 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -129,7 +129,7 @@ public function withIdsOfNewGapsInClozeText(
         array $new_gaps
     ): self {
         if ($new_gaps === []) {
-            return self;
+            return $this;
         }
 
         $clone = clone $this;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
index 97981839291a..87fb7d45d67e 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
@@ -43,6 +43,12 @@ public function __construct(
         $this->answer_options_awarding_points = $this->buildAnswerOptionsAwardingPointsFromAnswerOptions($answer_options);
     }
 
+    public function isIncomplete(): bool
+    {
+        return $this->answer_options === []
+            || $this->answer_options_awarding_points === [];
+    }
+
     public function getAnswerOptionForPositionOrNew(
         int $position
     ): AnswerOption {
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index b8ec08440d08..cce432c55096 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -106,7 +106,8 @@ function (array $vs) use ($answer_form_id, $answer_options): Gaps {
                     $previous_answer_input_id = null;
                     $gaps = [];
                     foreach ($vs as $v) {
-                        if ($previous_answer_input_id === $v['id']) {
+                        if ($v['answer_form_id'] !== $answer_form_id->toString()
+                            || $previous_answer_input_id === $v['id']) {
                             continue;
                         }
                         $previous_answer_input_id = $v['id'];
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 49045364e1c7..e7f377cdc0eb 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -197,6 +197,10 @@ public function buildAnswerOptionsInputs(
             array_reduce(
                 $this->gaps,
                 function (array $c, Gap $v) use ($lng, $ff): array {
+                    if (!$v->getAnswerOptions()->isIncomplete()) {
+                        return $c;
+                    }
+
                     $c[$v->getAnswerInputId()->toString()] = $v->getEditAnswerOptionsSection(
                         $lng,
                         $ff
@@ -226,6 +230,10 @@ public function buildPointInputs(
             array_reduce(
                 $this->gaps,
                 function (array $c, Gap $v) use ($lng, $ff): array {
+                    if (!$v->getAnswerOptions()->isIncomplete()) {
+                        return $c;
+                    }
+
                     $c[$v->getAnswerInputId()->toString()] = $v->getEditPointsSection(
                         $lng,
                         $ff
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index b1f543b4b093..96993bffbc56 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -369,7 +369,9 @@ private function buildUpdateAnswerFormStatement(
         return new Update(
             $persistence->getColumns(
                 $table_name_builder,
-                $table_definition
+                $table_definition,
+                null,
+                ['answer_form_id']
             ),
             [
                 new Value(\ilDBConstants::T_TEXT, $this->scoring_identical->value),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index a02d06eea570..aa8bc12bcb6f 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -158,9 +158,10 @@ private function processBasicEditingForm(
             return $form;
         }
 
+        $new_gaps = $data->getGaps();
+        $old_gaps = $environment->getAnswerFormProperties()->getGaps();
+
         if ($environment->getStep() !== self::STEP_CONFIRMED_GAP_REMOVAL) {
-            $new_gaps = $data->getGaps();
-            $old_gaps = $environment->getAnswerFormProperties()->getGaps();
             $removed_gaps = $new_gaps->getRemovedGaps($old_gaps);
             if ($removed_gaps !== []) {
                 return $form->withConfirmation(
@@ -173,7 +174,7 @@ private function processBasicEditingForm(
         }
 
         if ($new_gaps->getAddedGaps($old_gaps) === []) {
-            return $environment->getAnswerFormProperties();
+            return $data;
         }
 
         return $this->buildGapTypesForm(
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
index 2cb3470ad41c..cad255b94886 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
@@ -105,18 +105,26 @@ private function buildContent(): array
             $content[] = $this->content_before_form;
         }
 
-        $content[] = $this->form;
-
-        if ($this->content_after_form !== null) {
-            $content[] = $this->content_after_form;
-        }
-
         if ($this->confirmation !== null) {
             $content[] = $this->confirmation->withOnLoad(
                 $this->confirmation->getShowSignal()
+            )->withAdditionalOnLoadCode(
+                function ($id) {
+                    return "var button = {$id}.querySelector('input[type=\"submit\"]'); "
+                    . "button.addEventListener('click', (e) => {e.preventDefault();"
+                    . 'const form = button.closest("dialog").nextElementSibling;'
+                    . "form.action = '{$this->confirmation->getFormAction()}';"
+                    . 'form.submit();});';
+                }
             );
         }
 
+        $content[] = $this->form;
+
+        if ($this->content_after_form !== null) {
+            $content[] = $this->content_after_form;
+        }
+
         return $content;
     }
 

From d0a08cd4847687d0b0d9d852d1aa5f031de4b0bb Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 15 Jan 2026 09:13:10 +0100
Subject: [PATCH 097/141] Questions: More Implementation

---
 .../class.ilObjQuestionsGUI.php               |   8 +-
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  17 +-
 .../PageEditor/class.QstsQuestionPageGUI.php  |  16 +-
 .../PageEditor/class.ilPCAnswerForm.php       |  51 +++-
 .../PageEditor/class.ilPCAnswerFormGUI.php    |  16 +-
 components/ILIAS/Questions/Questions.php      |  12 +-
 .../js/dist/ParticipantViewLongMenu.js        | 115 ++++++++
 .../Questions/src/AnswerForm/Factory.php      |   2 +-
 .../Questions/src/AnswerForm/Migration.php    |  36 +++
 .../Questions/src/AnswerForm/Properties.php   |   4 +-
 .../src/AnswerForm/TypeGenericProperties.php  |  11 +-
 .../src/AnswerForm/Views/Participant.php      |   4 +-
 .../Cloze/Layout/OverviewTable.php            |  12 +-
 .../AnswerFormTypes/Cloze/MigrationCloze.php  |  40 +++
 .../Cloze/MigrationLongMenu.php               |  40 +++
 .../Cloze/MigrationNumeric.php                |  40 +++
 .../src/AnswerFormTypes/Cloze/Persistence.php |  15 +
 .../Cloze/Properties/ClozeText/Text.php       |  13 +-
 .../Cloze/Properties/Factory.php              |   5 +-
 .../Gaps/AnswerOptions/AnswerOption.php       |   2 +-
 .../Gaps/AnswerOptions/AnswerOptions.php      |  27 +-
 .../Cloze/Properties/Gaps/Gap.php             |  14 +-
 .../Cloze/Properties/Gaps/Gaps.php            |  64 +++-
 .../Cloze/Properties/Gaps/LongMenu.php        |  42 ++-
 .../Cloze/Properties/Gaps/Numeric.php         |  19 ++
 .../Cloze/Properties/Gaps/Select.php          |  44 ++-
 .../Cloze/Properties/Gaps/Text.php            |  25 ++
 .../Cloze/Properties/Gaps/Type.php            |   4 +
 .../Cloze/Properties/Properties.php           |  43 ++-
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 106 ++++---
 .../Cloze/Views/Participant.php               |  18 +-
 .../Questions/src/Persistence/CoreTables.php  |  17 ++
 .../ILIAS/Questions/src/Persistence/Query.php |  25 +-
 .../Questions/src/Persistence/Repository.php  |  27 +-
 .../Presentation/Definitions/Environment.php  |  15 +
 .../Definitions/EnvironmentImplementation.php | 118 +++++++-
 .../Questions/src/Presentation/Views/Edit.php | 125 +++++---
 .../src/Question/QuestionImplementation.php   | 164 +++++++---
 .../Questions/src/Question/Views/Edit.php     |  14 +-
 .../src/Question/Views/Participant.php        |  32 +-
 .../ILIAS/Questions/src/Setup/Agent.php       |  55 +++-
 .../src/Setup/OverarchingQuestionTables.php   |  30 +-
 .../src/Setup/QuestionsMigration.php          | 279 ++++++++++++++++++
 43 files changed, 1520 insertions(+), 246 deletions(-)
 create mode 100644 components/ILIAS/Questions/resources/js/dist/ParticipantViewLongMenu.js
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Migration.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationCloze.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationLongMenu.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationNumeric.php
 create mode 100644 components/ILIAS/Questions/src/Setup/QuestionsMigration.php

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
index cb52b7cba00b..a5926b567cc0 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -85,7 +85,9 @@ public function executeCommand(): void
             case strtolower(QstsQuestionPageGUI::class):
                 $this->edit_view->forwardPageCmds(
                     $this->tpl,
-                    $this->buildEditQuestionsBaseUri()
+                    $this->buildEditQuestionsBaseUri(),
+                    $this->obj_id,
+                    $this->ref_id
                 );
                 break;
 
@@ -122,7 +124,9 @@ public function viewQuestionsObject(): void
         $this->tpl->setContent(
             $this->edit_view->view(
                 $this->toolbar,
-                $this->buildEditQuestionsBaseUri()
+                $this->buildEditQuestionsBaseUri(),
+                $this->object->getId(),
+                $this->object->getRefId()
             )->render($this->ui_renderer)
         );
     }
diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index f7c478bdef70..17add5b3afea 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -30,6 +30,7 @@
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\DI\Container as ILIASContainer;
+use Mustache\Engine as MustacheEngine;
 use Pimple\Container as PimpleContainer;
 
 class LocalDIC extends PimpleContainer
@@ -50,6 +51,8 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic = new self();
         $dic[DataFactory::class] = static fn($c): DataFactory => new DataFactory();
         $dic[UuidFactory::class] = static fn($c): UuidFactory => new UuidFactory();
+        $dic[MustacheEngine::class] = static fn($c): MustacheEngine
+                => new MustacheEngine(['escape' => static fn($v) => $v]);
 
         $dic[UnitsRepository::class] = static fn($c): UnitsRepository => new UnitsRepository(
             $DIC['lng'],
@@ -83,10 +86,12 @@ protected static function buildDIC(ILIASContainer $DIC): self
             $DIC['ui.factory'],
             $DIC['ui.renderer'],
             $DIC['global_screen'],
+            $DIC['tpl'],
+            $DIC->contentStyle(),
             $DIC['ilCtrl'],
             $DIC['http'],
+            $DIC['ilTabs'],
             $DIC->uiService(),
-            $c[DataFactory::class],
             $c[UuidFactory::class],
             $c[AnswerFormFactory::class],
             $c[QuestionsRepository::class],
@@ -96,7 +101,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic[Cloze\Properties\ClozeText\Factory::class] = static fn($c): Cloze\Properties\ClozeText\Factory
             => new Cloze\Properties\ClozeText\Factory(
                 $DIC['refinery'],
-                (new \ilMustacheFactory())->getBasicEngine(),
+                $c[MustacheEngine::class],
                 $c[DataFactory::class]->text()
             );
         $dic[Cloze\Properties\Gaps\AnswerOptions\Factory::class] = static fn($c): Cloze\Properties\Gaps\AnswerOptions\Factory
@@ -127,7 +132,8 @@ protected static function buildDIC(ILIASContainer $DIC): self
                     new Cloze\Properties\Gaps\LongMenu(
                         $DIC['refinery'],
                         $DIC['lng'],
-                        $DIC['ui.factory']
+                        $DIC['ui.factory'],
+                        $DIC['tpl']
                     )
                 ]
             );
@@ -151,7 +157,10 @@ protected static function buildDIC(ILIASContainer $DIC): self
                 $c[Cloze\Properties\Gaps\Factory::class]
             );
         $dic[Cloze\Views\Participant::class] = static fn($c): Cloze\Views\Participant
-            => new Cloze\Views\Participant();
+            => new Cloze\Views\Participant(
+                $DIC['tpl'],
+                $c[MustacheEngine::class]
+            );
         $dic[Cloze\Definition::class] = static fn($c): Cloze\Definition => new Cloze\Definition(
             $c[Cloze\Properties\Factory::class],
             $c[Cloze\Persistence::class],
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
index a8fc70bf1189..dd338ed92682 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.QstsQuestionPageGUI.php
@@ -28,17 +28,29 @@
  */
 class QstsQuestionPageGUI extends ilPageObjectGUI
 {
+    private URI $return_uri;
+
     public function __construct(
-        private readonly URI $return_uri,
-        QuestionImplementation $question
+        QuestionImplementation $question,
+        int $obj_id
     ) {
         parent::__construct('qsts', $question->getPageId());
+        $this->obj->setParentId($obj_id);
         $this->obj->setQuestion($question);
         $this->setEnabledPageFocus(false);
     }
 
+    #[\Override]
     public function finishEditing(): void
     {
         $this->ctrl->redirectToURL($this->return_uri->__toString());
     }
+
+    public function withReturnUri(
+        URI $return_uri
+    ): self {
+        $clone = clone $this;
+        $clone->return_uri = $return_uri;
+        return $clone;
+    }
 }
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
index d299680c0d69..0a747ad04580 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
@@ -18,10 +18,13 @@
 
 declare(strict_types=1);
 
+use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
 use ILIAS\Questions\Legacy\LocalDIC;
 use ILIAS\Questions\Persistence\Repository;
-use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Renderer as UIRenderer;
 
 class ilPCAnswerForm extends ilPageContent
 {
@@ -50,29 +53,24 @@ public function modifyPageContentPostXsl(
             return $output;
         }
 
-        /** @var \ILIAS\Questions\Question\QuestionImplementation $question */
+        global $DIC;
+        $ui_factory = $DIC['ui.factory'];
+        $ui_renderer = $DIC['ui.renderer'];
+        $lng = $DIC['lng'];
         $question = $this->pg_obj->getQuestion();
 
         return mb_ereg_replace_callback(
             self::ANSWER_FORM_PLACEHOLDER,
-            fn(array $matches): string => $question
-                ->getAnswerFormPropertiesByIdString($matches[1])?->getTypeGenericProperties()
-                ->getAdditionalText() ?? '',
+            fn(array $matches): string => $this->renderAnswerForm(
+                $ui_factory,
+                $ui_renderer,
+                $lng,
+                $question->getAnswerFormPropertiesByIdString($matches[1])
+            ),
             $output
         );
     }
 
-    #[\Override]
-    public function getCssFiles(
-        string $a_mode
-    ): array {
-        if ($this->getPage()->getPageConfig()->getEnableSelfAssessment()) {
-            return array("./components/ILIAS/TestQuestionPool/resources/js/dist/question_handling.css",
-                "components/ILIAS/TestQuestionPool/templates/default/test_javascript.css");
-        }
-        return array();
-    }
-
     #[\Override]
     public static function afterPageUpdate(
         ilPageObject $page,
@@ -174,4 +172,25 @@ public function getAnswerFormIdStringFromAttribute(): string
         return $this->getChildNode()->attributes
                 ->getNamedItem(self::ANSWER_FORM_ID_ATTRIBUTE)->nodeValue;
     }
+
+    private function renderAnswerForm(
+        UIFactory $ui_factory,
+        UIRenderer $ui_renderer,
+        Language $lng,
+        ?AnswerFormProperties $answer_form_properties,
+    ): string {
+        if ($answer_form_properties === null) {
+            return $lng->txt('broken_answer_form');
+        }
+
+        return $ui_renderer->render(
+            $ui_factory->legacy()->latexContent(
+                $answer_form_properties->getDefinition()->getParticipantView()
+                    ->get(
+                        $answer_form_properties,
+                        null
+                    )
+            )
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
index 0f27f5076102..ebf306f5b42d 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
@@ -18,7 +18,6 @@
 
 declare(strict_types=1);
 
-use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\Legacy\LocalDIC;
 use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Data\Factory as DataFactory;
@@ -32,7 +31,6 @@ class ilPCAnswerFormGUI extends ilPageContentGUI
     private readonly ilTabsGUI $tabs;
     private readonly UIRenderer $ui_renderer;
     private readonly DataFactory $data_factory;
-    private readonly AnswerFormFactory $answer_form_factory;
     private readonly Edit $edit_view;
 
     public function __construct(
@@ -47,10 +45,8 @@ public function __construct(
         $this->data_factory = new DataFactory();
 
         $local_dic = LocalDIC::dic();
-        $this->answer_form_factory = $local_dic[AnswerFormFactory::class];
         $this->edit_view = $local_dic[Edit::class];
 
-
         parent::__construct($pg_obj, $content_obj, $hier_id, $pc_id);
     }
 
@@ -70,6 +66,7 @@ public function insertCmd(): void
                 $this->data_factory->uri(
                     ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'insert')
                 ),
+                $this->pg_obj->getParentId(),
                 $this->pg_obj->getQuestion(),
                 $content_obj
             )->render($this->ui_renderer)
@@ -78,8 +75,6 @@ public function insertCmd(): void
 
     public function editCmd(): void
     {
-        $this->setEditTabs();
-
         /** @var \ILIAS\Questions\Question\QuestionImplementation $question */
         $question = $this->pg_obj->getQuestion();
         $answer_form_properties = $question->getAnswerFormPropertiesByIdString(
@@ -91,11 +86,10 @@ public function editCmd(): void
                 $this->data_factory->uri(
                     ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(self::class, 'edit')
                 ),
+                $this->pg_obj->getParentId(),
                 $question,
                 $answer_form_properties,
-                $this->answer_form_factory->getDefinitionForClass(
-                    $answer_form_properties->getDefinitionClass()
-                )
+                $answer_form_properties->getDefinition()
             )->render($this->ui_renderer)
         );
     }
@@ -107,8 +101,4 @@ private function setInsertTabs(): void
             $this->ctrl->getLinkTargetByClass(\QstsQuestionPageGUI::class, 'edit')
         );
     }
-
-    public function setEditTabs(): void
-    {
-    }
 }
diff --git a/components/ILIAS/Questions/Questions.php b/components/ILIAS/Questions/Questions.php
index 32633b7e0ae1..050ce8cff30e 100644
--- a/components/ILIAS/Questions/Questions.php
+++ b/components/ILIAS/Questions/Questions.php
@@ -21,8 +21,11 @@
 namespace ILIAS;
 
 use ILIAS\Questions\AnswerForm\Definition as AnswerFormDefinition;
+use ILIAS\Questions\AnswerForm\Migration as AnswerFormMigration;
+use ILIAS\Questions\AnswerFormTypes\Cloze\MigrationCloze;
+use ILIAS\Questions\AnswerFormTypes\Cloze\MigrationLongMenu;
+use ILIAS\Questions\AnswerFormTypes\Cloze\MigrationNumeric;
 use ILIAS\Questions\Setup\Agent;
-use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Setup\Agent as AgentInterface;
 
 class Questions implements Component\Component
@@ -40,7 +43,12 @@ public function init(
         $define[] = AnswerFormDefinition::class;
         $contribute[AgentInterface::class] = static fn() =>
             new Agent(
-                $pull[Refinery::class]
+                $seek[AnswerFormMigration::class]
             );
+        $contribute[AnswerFormMigration::class] = static fn() => new MigrationCloze();
+        $contribute[AnswerFormMigration::class] = static fn() => new MigrationLongMenu();
+        $contribute[AnswerFormMigration::class] = static fn() => new MigrationNumeric();
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, 'js/dist/ParticipantViewLongMenu.js');
     }
 }
diff --git a/components/ILIAS/Questions/resources/js/dist/ParticipantViewLongMenu.js b/components/ILIAS/Questions/resources/js/dist/ParticipantViewLongMenu.js
new file mode 100644
index 000000000000..47938f3bcc47
--- /dev/null
+++ b/components/ILIAS/Questions/resources/js/dist/ParticipantViewLongMenu.js
@@ -0,0 +1,115 @@
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+(function () {
+  const longmenu = () => {
+    const init = (input, autocompleteLength, answerOptions) => {
+      if (input.nodeName === 'INPUT') {
+        let longest = answerOptions.reduce((a, b) => {
+          return a.length > b.length ? a : b;
+        });
+        input.setAttribute('size', longest.length);
+        input.addEventListener(
+          'keyup',
+          (e) => { keyHandler(autocompleteLength, answerOptions, e); }
+        );
+      };
+    };
+
+    const keyHandler = (autocompleteLength, answerOptions, e) => {
+      if (e.key === 'Enter' && e.target.nodeName === 'LI') {
+        e.stopImmediatePropagation();
+        e.preventDefault();
+        onSelectHandler(e);
+        return;
+      }
+
+      if (e.key === 'ArrowDown') {
+        e.stopImmediatePropagation();
+        e.preventDefault();
+        if (e.target.nextElementSibling?.nodeName === 'UL') {
+          e.target.nextElementSibling.firstElementChild.focus();
+        }
+
+        if (e.target.nodeName === 'LI' && e.target.nextElementSibling !== null) {
+          e.target.nextElementSibling.focus();
+        }
+        return;
+      }
+
+      if (e.key === 'ArrowUp' && e.target.nodeName === 'LI') {
+        e.stopImmediatePropagation();
+        e.preventDefault();
+        if (e.target.previousElementSibling === null) {
+          e.target.parentElement.previousElementSibling.focus();
+        } else {
+          e.target.previousElementSibling.focus();
+        }
+        return;
+      }
+
+      onChangeHandler(autocompleteLength, answerOptions, e);
+    };
+
+    const onChangeHandler = (autocompleteLength, answerOptions, e) => {
+      if (e.target.nextElementSibling?.nodeName === 'UL') {
+        e.target.nextElementSibling.remove();
+      }
+
+      if (e.key === 'Tab' || e.target.value.length < autocompleteLength) {
+        return;
+      }
+
+      const matchingAnswers = answerOptions.filter((answer) => {
+        return answer.toLowerCase().includes(e.target.value.toLowerCase())
+      });
+
+      if (matchingAnswers.length === 0) {
+        return;
+      }
+
+      let list = document.createElement('ul');
+      matchingAnswers.forEach((answer) => {
+        let listElement = document.createElement('li');
+        listElement.tabIndex = 0;
+        listElement.textContent = answer;
+        list.appendChild(listElement);
+      });
+      list.addEventListener('click', onSelectHandler);
+      list.addEventListener('keyup', onSelectHandler);
+      e.target.parentNode.appendChild(list);
+    };
+
+    const onSelectHandler = (e) => {
+      if (e.type === 'keydown' && e.key !== 'Enter') {
+        return;
+      }
+      e.target.parentNode.previousElementSibling.value = e.target.textContent;
+      e.target.parentNode.previousElementSibling.focus();
+      e.target.parentNode.remove();
+    };
+
+    const public_interface = {
+      init
+    };
+    return public_interface;
+  };
+
+  il = il || {};
+  il.test = il.test || {};
+  il.test.player = il.test.player || {};
+  il.test.player.longmenu = longmenu();
+}());
diff --git a/components/ILIAS/Questions/src/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerForm/Factory.php
index 83bfa1b2ed1f..f47770b066ff 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Factory.php
@@ -110,7 +110,7 @@ public function buildTypeGenericPropertiesFromDatabase(
         return new TypeGenericProperties(
             $this->uuid_factory->fromString($db_values['id']),
             $this->uuid_factory->fromString($db_values['question_id']),
-            $db_values['type'],
+            $this->getDefinitionForClass($db_values['type']),
             $db_values['available_points'],
             $db_values['image_size'],
             $db_values['shuffle_answer_options'] === 1,
diff --git a/components/ILIAS/Questions/src/AnswerForm/Migration.php b/components/ILIAS/Questions/src/AnswerForm/Migration.php
new file mode 100644
index 000000000000..ae72b1be9ef7
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Migration.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm;
+
+use ILIAS\Questions\Persistence\Manipulate;
+
+interface Migration
+{
+    /*
+     * Returns the identifier under which the question type was stored previously
+     * in the database.
+     */
+    public function getOldQuestionIdentifier(): string;
+
+    public function toStorage(
+        Manipulate $manipulate
+    ): Manipulate;
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerForm/Properties.php
index 9b0fee40d282..7f00a69637a8 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Properties.php
@@ -31,12 +31,12 @@
 
 interface Properties extends Storable
 {
-    public function getDefinitionClass(): string;
-
     public function getAnswerFormId(): Uuid;
 
     public function getQuestionId(): Uuid;
 
+    public function getDefinition(): Definition;
+
     public function getTypeGenericProperties(): TypeGenericProperties;
 
     public function getBasicPropertiesForListing(
diff --git a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
index 751f931f2d09..2300fa1a5634 100644
--- a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
@@ -36,7 +36,7 @@ class TypeGenericProperties implements Storable
     public function __construct(
         private readonly Uuid $answer_form_id,
         private readonly Uuid $question_id,
-        private readonly ?string $definition_class = null,
+        private readonly ?Definition $definition = null,
         private ?float $available_points = null,
         private ?int $image_size = null,
         private ?bool $shuffle_answer_options = null,
@@ -55,6 +55,11 @@ public function getQuestionId(): Uuid
         return $this->question_id;
     }
 
+    public function getDefinition(): Definition
+    {
+        return $this->definition;
+    }
+
     public function getAvailablePoints(): ?float
     {
         return $this->available_points;
@@ -83,7 +88,7 @@ public function getAdditionalTextLegacy(): string
     public function toStorage(
         Manipulate $manipulate
     ): Manipulate {
-        if ($this->definition_class === null) {
+        if ($this->definition === null) {
             throw new \UnexpectedValueException(
                 'You cannot save a Answer Form without a Type!'
             );
@@ -122,7 +127,7 @@ private function buildInsertStatement(): Insert
             CoreTables::AnswerForms->getColumns(),
             [
                 new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
-                new Value(\ilDBConstants::T_TEXT, $this->definition_class),
+                new Value(\ilDBConstants::T_TEXT, $this->definition::class),
                 new Value(\ilDBConstants::T_TEXT, $this->question_id->toString()),
                 new Value(\ilDBConstants::T_FLOAT, $this->available_points),
                 new Value(\ilDBConstants::T_INTEGER, $this->image_size),
diff --git a/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php b/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php
index 3d4a18056e5f..4f9811b388b2 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Views/Participant.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\AnswerForm\Views;
 
+use ILIAS\Questions\AnswerForm\Properties;
 use ILIAS\Questions\Response\Response;
 
 interface Participant
@@ -27,6 +28,7 @@ interface Participant
     public function isAsyncPresentationAvailable(): bool;
 
     public function get(
+        Properties $properties,
         ?Response $response
-    ): array;
+    ): string;
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
index 748aa24f3645..01d99c6ebbc6 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
@@ -91,18 +91,18 @@ private function getActions(): array
         return [
             'edit_gaps' => $this->table_factory->action()->standard(
                 $this->lng->txt('edit_gaps'),
-                ...$this->environment->getUrlBuilderWithStepParameter(Edit::STEP_SET_GAP_TYPES)
-                    ->acquireParameter(Edit::PARAMETER_NAMESPACE, Edit::OVERVIEW_TABLE_ROW_ID)
+                $this->environment->getUrlBuilderWithStepParameter(Edit::STEP_JUMP_TO_SET_GAP_TYPES),
+                $this->environment->getTableRowIdToken()
             ),
             'edit_answer_options' => $this->table_factory->action()->standard(
                 $this->lng->txt('edit_answer_options'),
-                ...$this->environment->getUrlBuilderWithStepParameter(Edit::STEP_SET_ANSWER_OPTIONS)
-                    ->acquireParameter(Edit::PARAMETER_NAMESPACE, Edit::OVERVIEW_TABLE_ROW_ID)
+                $this->environment->getUrlBuilderWithStepParameter(Edit::STEP_JUMP_TO_SET_ANSWER_OPTIONS),
+                $this->environment->getTableRowIdToken()
             ),
             'edit_points' => $this->table_factory->action()->standard(
                 $this->lng->txt('edit_available_points'),
-                ...$this->environment->getUrlBuilderWithStepParameter(Edit::STEP_SET_POINTS)
-                    ->acquireParameter(Edit::PARAMETER_NAMESPACE, Edit::OVERVIEW_TABLE_ROW_ID)
+                $this->environment->getUrlBuilderWithStepParameter(Edit::STEP_JUMP_TO_SET_POINTS),
+                $this->environment->getTableRowIdToken()
             )
         ];
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationCloze.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationCloze.php
new file mode 100644
index 000000000000..10d11263beac
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationCloze.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze;
+
+use ILIAS\Questions\AnswerForm\Migration;
+use ILIAS\Questions\Persistence\Manipulate;
+
+class MigrationCloze implements Migration
+{
+    #[\Override]
+    public function getOldQuestionIdentifier(): string
+    {
+        return 'assClozeTest';
+    }
+
+    #[\Override]
+    public function toStorage(
+        Manipulate $manipulate
+    ): Manipulate {
+
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationLongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationLongMenu.php
new file mode 100644
index 000000000000..04e06b6bf85f
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationLongMenu.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze;
+
+use ILIAS\Questions\AnswerForm\Migration;
+use ILIAS\Questions\Persistence\Manipulate;
+
+class MigrationLongMenu implements Migration
+{
+    #[\Override]
+    public function getOldQuestionIdentifier(): string
+    {
+        return 'assLongMenu';
+    }
+
+    #[\Override]
+    public function toStorage(
+        Manipulate $manipulate
+    ): Manipulate {
+
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationNumeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationNumeric.php
new file mode 100644
index 000000000000..4232aa49a60a
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationNumeric.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze;
+
+use ILIAS\Questions\AnswerForm\Migration;
+use ILIAS\Questions\Persistence\Manipulate;
+
+class MigrationNumeric implements Migration
+{
+    #[\Override]
+    public function getOldQuestionIdentifier(): string
+    {
+        return 'assNumeric';
+    }
+
+    #[\Override]
+    public function toStorage(
+        Manipulate $manipulate
+    ): Manipulate {
+
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
index 8f69949b8267..a1e08d1d4dca 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
@@ -26,6 +26,7 @@
 use ILIAS\Questions\Persistence\Join;
 use ILIAS\Questions\Persistence\Column;
 use ILIAS\Questions\Persistence\JoinType;
+use ILIAS\Questions\Persistence\Order;
 use ILIAS\Questions\Persistence\Select;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableNameSpace;
@@ -209,6 +210,13 @@ public function completeQuery(
                 ),
                 JoinType::Left
             )
+        )->withAdditionalOrder(
+            new Order(
+                $this->getIdColumn(
+                    $table_name_builder,
+                    $answer_input_table_definition
+                )
+            )
         )->withAdditionalSelect(
             new Select(
                 $this->getColumns(
@@ -216,6 +224,13 @@ public function completeQuery(
                     $answer_options_table_definition
                 )
             )
+        )->withAdditionalOrder(
+            new Order(
+                new Column(
+                    $answer_options_table_definition->getTable($table_name_builder),
+                    'position'
+                )
+            )
         )->withAdditionalJoin(
             new Join(
                 $answer_form_id_column,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index d9c36a9a09e1..59120c3fa759 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -76,12 +76,21 @@ public function getRawRepresentationForPersistence(): string
         return $this->cloze_text->getRawRepresentation();
     }
 
+    public function getRenderedMarkdownForParticipantPresentation(): string
+    {
+        return $this->refinery->string()->markdown()->toHTML()->transform(
+            $this->cloze_text->getRawRepresentation()
+        );
+    }
+
     public function getRenderedMarkdownForEditingPresentation(
         Gaps $gaps
     ): string {
         return $this->mustache_engine->render(
-            $this->cloze_text->getRawRepresentation(),
-            $gaps->getPlaceholderArrayForPreview()
+            $this->refinery->string()->markdown()->toHTML()->transform(
+                $this->cloze_text->getRawRepresentation()
+            ),
+            $gaps->getPlaceholderArrayForEditFormPanel()
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
index 1af814aa370e..103012a35f75 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
@@ -21,7 +21,6 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties;
 
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
@@ -45,6 +44,7 @@ public function fromData(
             return new Properties(
                 $type_generic_properties->getAnswerFormId(),
                 $type_generic_properties->getQuestionId(),
+                $type_generic_properties->getDefinition(),
                 $this->cloze_text_factory->buildFromTextString(
                     $type_generic_properties->getAdditionalText()
                 ),
@@ -60,7 +60,7 @@ public function fromData(
             'combinations_activated' => $combinations_activated
         ] = $query->retrieveCurrentRecord(
             TableTypes::TypeSpecificAnswerForms->getTable(
-                $query->getTableNameBuilder(Definition::class)
+                $query->getTableNameBuilder($type_generic_properties->getDefinition()::class)
             ),
             $query->getRefinery()->custom()->transformation(
                 fn(array $vs): array => [
@@ -73,6 +73,7 @@ public function fromData(
         return new Properties(
             $type_generic_properties->getAnswerFormId(),
             $type_generic_properties->getQuestionId(),
+            $type_generic_properties->getDefinition(),
             $this->cloze_text_factory->buildFromTextString(
                 $type_generic_properties->getAdditionalText()
             ),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
index 451b33371706..4452b2a7d823 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
@@ -130,7 +130,7 @@ public function buildArrayForHiddenInput(): array
             $values[self::FORM_KEY_UPPER_LIMIT] = (string) $this->getUpperLimit();
         }
 
-        if ($this->getUpperLimit() !== null) {
+        if ($this->getAvailablePoints() !== null) {
             $values[self::FORM_KEY_AVAILABLE_POINTS] = (string) $this->getAvailablePoints();
         }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
index 87fb7d45d67e..8309f2c77eea 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
@@ -29,6 +29,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 
 class AnswerOptions
@@ -61,9 +62,16 @@ public function getAnswerOptionForPositionOrNew(
 
     public function getTagsArrayFromAnswerOptions(): array
     {
-        return array_map(
-            fn(AnswerOption $v): string => $v->getTextValue(),
-            $this->answer_options
+        return array_reduce(
+            $this->answer_options,
+            function (array $c, AnswerOption $v): array {
+                if ($v->getTextValue() === '') {
+                    return $c;
+                }
+                $c[] = $v->getTextValue();
+                return $c;
+            },
+            []
         );
     }
 
@@ -177,6 +185,19 @@ function (AnswerOption $v) use ($refinery, $values_from_form): AnswerOption {
         return $clone;
     }
 
+    public function buildArrayForInput(
+        Transformation $shuffle_transformation
+    ): array {
+        return array_reduce(
+            $shuffle_transformation->transform($this->answer_options),
+            function (array $c, AnswerOption $v): array {
+                $c[$v->getAnswerOptionId()->toString()] = $v->getTextValue();
+                return $c;
+            },
+            []
+        );
+    }
+
     public function buildHiddenInputValue(): string
     {
         return json_encode([
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index 7554191746a0..5a2af5208b82 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -285,24 +285,28 @@ public function buildGapPlaceholderNameWithId(): string
         return self::GAP_PLACEHOLDER_NAME . '_' . $this->getAnswerInputId()->toString();
     }
 
+    public function buildParticipantViewLegacyInput(): string
+    {
+        return $this->type->getParticipantViewLegacyInput($this);
+    }
+
     public function getEditAnswerOptionsSection(
         Language $lng,
         FieldFactory $ff
     ): Section {
-        $type = $this->getType();
         $section = $ff->section(
-            $type->getEditAnswerOptionsInputs($this),
-            "{$this->buildShortenedGapName()} ({$lng->txt("{$type->getIdentifier()}_gap")})"
+            $this->getType()->getEditAnswerOptionsInputs($this),
+            "{$this->buildShortenedGapName()} ({$lng->txt("{$this->getType()->getIdentifier()}_gap")})"
         );
 
-        $edit_section_constraint = $type->getEditAnswerOptionsSectionConstraint();
+        $edit_section_constraint = $this->getType()->getEditAnswerOptionsSectionConstraint();
         if ($edit_section_constraint !== null) {
             $section = $section->withAdditionalTransformation($edit_section_constraint);
         }
 
 
         return $section->withAdditionalTransformation(
-            $type->getBuildGapTransformation($this)
+            $this->getType()->getBuildGapTransformation($this)
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index e7f377cdc0eb..772fa189e2b7 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -38,6 +38,7 @@
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
 use ILIAS\UI\Component\Table\DataRowBuilder;
+use ILIAS\UICore\GlobalTemplate;
 
 class Gaps
 {
@@ -142,12 +143,24 @@ public function getAddedGaps(
         return array_diff_key($this->gaps, $old_gaps->gaps);
     }
 
-    public function getPlaceholderArrayForPreview(): array
+    public function getPlaceholderArrayForParticipantView(): array
     {
         return array_reduce(
             $this->gaps,
             function (array $c, Gap $v): array {
-                $c[$v->buildGapPlaceholderNameWithId($v)] = $v->buildShortenedGapRepresentation($v);
+                $c[$v->buildGapPlaceholderNameWithId($v)] = $v->buildParticipantViewLegacyInput();
+                return $c;
+            },
+            []
+        );
+    }
+
+    public function getPlaceholderArrayForEditFormPanel(): array
+    {
+        return array_reduce(
+            $this->gaps,
+            function (array $c, Gap $v): array {
+                $c[$v->buildGapPlaceholderNameWithId($v)] = $v->buildShortenedGapRepresentation();
                 return $c;
             },
             []
@@ -158,11 +171,14 @@ public function buildGapsTypeInputs(
         Language $lng,
         FieldFactory $ff,
         Refinery $refinery,
-        array $available_gap_types
+        array $available_gap_types,
+        array $selected_gaps
     ): Section {
         return $ff->section(
             array_reduce(
-                $this->getUndefinedGaps(),
+                $selected_gaps !== []
+                    ? $this->filterGapsBySelected($selected_gaps)
+                    : $this->getUndefinedGaps(),
                 function (array $c, Gap $v) use ($ff, $available_gap_types): array {
                     $c[$v->getAnswerInputId()->toString()] = $ff->select(
                         $v->buildShortenedGapName(),
@@ -191,16 +207,15 @@ function (array $c, Gap $v) use ($ff, $available_gap_types): array {
     public function buildAnswerOptionsInputs(
         Language $lng,
         FieldFactory $ff,
-        Refinery $refinery
+        Refinery $refinery,
+        array $selected_gaps
     ): Section {
         return $ff->section(
             array_reduce(
-                $this->gaps,
+                $selected_gaps !== []
+                    ? $this->filterGapsBySelected($selected_gaps)
+                    : $this->getGapsWithIncompleteAnswerOptions(),
                 function (array $c, Gap $v) use ($lng, $ff): array {
-                    if (!$v->getAnswerOptions()->isIncomplete()) {
-                        return $c;
-                    }
-
                     $c[$v->getAnswerInputId()->toString()] = $v->getEditAnswerOptionsSection(
                         $lng,
                         $ff
@@ -224,16 +239,15 @@ function (array $c, Gap $v) use ($lng, $ff): array {
     public function buildPointInputs(
         Language $lng,
         FieldFactory $ff,
-        Refinery $refinery
+        Refinery $refinery,
+        array $selected_gaps
     ): Section {
         return $ff->section(
             array_reduce(
-                $this->gaps,
+                $selected_gaps !== []
+                    ? $this->filterGapsBySelected($selected_gaps)
+                    : $this->getGapsWithIncompleteAnswerOptions(),
                 function (array $c, Gap $v) use ($lng, $ff): array {
-                    if (!$v->getAnswerOptions()->isIncomplete()) {
-                        return $c;
-                    }
-
                     $c[$v->getAnswerInputId()->toString()] = $v->getEditPointsSection(
                         $lng,
                         $ff
@@ -426,9 +440,27 @@ private function buildDeleteForDeletionOfAnswerForm(
         );
     }
 
+    private function getGapsWithIncompleteAnswerOptions(): array
+    {
+        return array_filter(
+            $this->gaps,
+            fn(Gap $v): bool => $v->getAnswerOptions()->isIncomplete()
+        );
+    }
+
     private function extractIdFromTagName(
         string $tag_name
     ): string {
         return mb_substr($tag_name, mb_strlen(Gap::GAP_PLACEHOLDER_NAME) + 1);
     }
+
+    private function filterGapsBySelected(
+        array $selected_gaps
+    ): array {
+        return array_filter(
+            $this->gaps,
+            fn(string $k): bool => in_array($k, $selected_gaps),
+            ARRAY_FILTER_USE_KEY
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
index 6ddb6cc03b53..e2d3ee9e2852 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
@@ -28,6 +28,7 @@
 use ILIAS\Refinery\Constraint;
 use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UICore\GlobalTemplate;
 
 class LongMenu extends Type
 {
@@ -37,7 +38,8 @@ class LongMenu extends Type
     public function __construct(
         Refinery $refinery,
         private readonly Language $lng,
-        private readonly UIFactory $ui_factory
+        private readonly UIFactory $ui_factory,
+        private readonly GlobalTemplate $global_tpl
     ) {
         parent::__construct($refinery);
     }
@@ -48,6 +50,36 @@ public function getIdentifier(): string
         return 'long_menu';
     }
 
+    #[\Override]
+    public function getParticipantViewLegacyInput(
+        Gap $gap
+    ): string {
+        $answer_input_id = $gap->getAnswerInputId()->toString();
+        $gaptemplate = new \ilTemplate(
+            'tpl.il_as_qpl_longmenu_question_text_gap.html',
+            true,
+            true,
+            'components/ILIAS/TestQuestionPool'
+        );
+
+        $gaptemplate->setVariable(
+            'KEY',
+            $answer_input_id
+        );
+
+        $this->global_tpl->addOnLoadCode('il.test.player.longmenu.init('
+            . "document.querySelector('input[name=\"answer[{$answer_input_id}]\"]'), "
+            . "{$gap->getMinAutocomplete()}, "
+            . json_encode(
+                array_values(
+                    $gap->getAnswerOptions()->buildArrayForInput(
+                        $this->refinery->random()->dontShuffle()
+                    )
+                )
+            ) . ')');
+        return $gaptemplate->get();
+    }
+
     #[\Override]
     public function getEditAnswerOptionsInputs(
         Gap $gap
@@ -73,9 +105,11 @@ public function getEditAnswerOptionsInputs(
             )
             ->withRequired(true)
             ->withValue(
-                array_map(
-                    fn(AnswerOption $v): string => $v->getTextValue(),
-                    $gap->getAnswerOptions()->getAnswerOptionsAwardingPoints()
+                array_values(
+                    array_map(
+                        fn(AnswerOption $v): string => $v->getTextValue(),
+                        $gap->getAnswerOptions()->getAnswerOptionsAwardingPoints()
+                    )
                 )
             )
         ];
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
index 8bfacea654e8..33349d9f33c8 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
@@ -47,6 +47,25 @@ public function getIdentifier(): string
         return 'numeric';
     }
 
+    #[\Override]
+    public function getParticipantViewLegacyInput(
+        Gap $gap
+    ): string {
+        $gaptemplate = new \ilTemplate(
+            'tpl.il_as_qpl_cloze_question_gap_numeric.html',
+            true,
+            true,
+            'components/ILIAS/TestQuestionPool'
+        );
+
+        $gaptemplate->setVariable(
+            'GAP_COUNTER',
+            $gap->getAnswerInputId()->toString()
+        );
+
+        return $gaptemplate->get();
+    }
+
     #[\Override]
     public function getEditAnswerOptionsInputs(
         Gap $gap
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
index 9ab7af64e505..6a1afbbf7671 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
@@ -25,6 +25,7 @@
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
+use ILIAS\Refinery\Random\Seed\GivenSeed;
 use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Factory as UIFactory;
 
@@ -46,6 +47,47 @@ public function getIdentifier(): string
         return 'select';
     }
 
+    #[\Override]
+    public function getParticipantViewLegacyInput(
+        Gap $gap
+    ): string {
+        $gaptemplate = new \ilTemplate(
+            'tpl.il_as_qpl_cloze_question_gap_select.html',
+            true,
+            true,
+            'components/ILIAS/TestQuestionPool'
+        );
+
+        $shuffler = $gap->getShuffleAnswerOptions()
+            ? $this->refinery->random()->shuffleArray(new GivenSeed(4))
+            : $this->refinery->random()->dontShuffle();
+
+        foreach ($gap->getAnswerOptions()->buildArrayForInput($shuffler) as $key => $answer_option) {
+            $gaptemplate->setCurrentBlock('select_gap_option');
+            $gaptemplate->setVariable(
+                'SELECT_GAP_VALUE',
+                $key
+            );
+            $gaptemplate->setVariable(
+                'SELECT_GAP_TEXT',
+                \ilLegacyFormElementsUtil::prepareFormOutput($answer_option)
+            );
+            $gaptemplate->parseCurrentBlock();
+        }
+
+        $gaptemplate->setVariable(
+            'PLEASE_SELECT',
+            $this->lng->txt('please_select')
+        );
+
+        $gaptemplate->setVariable(
+            'GAP_COUNTER',
+            $gap->getAnswerInputId()->toString()
+        );
+
+        return $gaptemplate->get();
+    }
+
     #[\Override]
     public function getEditAnswerOptionsInputs(
         Gap $gap
@@ -104,7 +146,7 @@ public function getBuildGapTransformation(
                 $gap->getAnswerOptions()->withAnswerOptionsFromTags(
                     $vs['answer_options']
                 )
-            )
+            )->withShuffleAnswerOptions($vs['shuffle_answer_options'])
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
index 55621e7a17bc..5fcf987685ac 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
@@ -47,6 +47,31 @@ public function getIdentifier(): string
         return 'text';
     }
 
+    #[\Override]
+    public function getParticipantViewLegacyInput(
+        Gap $gap
+    ): string {
+        $gaptemplate = new \ilTemplate(
+            'tpl.il_as_qpl_cloze_question_gap_text.html',
+            true,
+            true,
+            'components/ILIAS/TestQuestionPool'
+        );
+
+        $gap_size = $gap->getMaxChars();
+        if ($gap_size > 0) {
+            $gaptemplate->setCurrentBlock('size_and_maxlength');
+            $gaptemplate->setVariable('TEXT_GAP_SIZE', $gap_size);
+            $gaptemplate->parseCurrentBlock();
+        }
+        $gaptemplate->setVariable(
+            'GAP_COUNTER',
+            $gap->getAnswerInputId()->toString()
+        );
+
+        return $gaptemplate->get();
+    }
+
     #[\Override]
     public function getEditAnswerOptionsInputs(
         Gap $gap
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
index 2e4121a62406..becbef79ccf9 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
@@ -34,6 +34,10 @@ public function __construct(
 
     abstract public function getIdentifier(): string;
 
+    abstract public function getParticipantViewLegacyInput(
+        Gap $gap
+    ): string;
+
     abstract public function getEditAnswerOptionsInputs(
         Gap $gap
     ): array;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index 96993bffbc56..7db9cb5a3cdc 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -65,6 +65,7 @@ class Properties implements PropertiesInterface
     public function __construct(
         private readonly Uuid $answer_form_id,
         private readonly Uuid $question_id,
+        private readonly Definition $definition,
         private Text $cloze_text,
         private readonly string $legacy_cloze_text,
         private Gaps $gaps,
@@ -73,12 +74,6 @@ public function __construct(
     ) {
     }
 
-    #[\Override]
-    public function getDefinitionClass(): string
-    {
-        return Definition::class;
-    }
-
     #[\Override]
     public function getAnswerFormId(): Uuid
     {
@@ -91,13 +86,19 @@ public function getQuestionId(): Uuid
         return $this->question_id;
     }
 
+    #[\Override]
+    public function getDefinition(): Definition
+    {
+        return $this->definition;
+    }
+
     #[\Override]
     public function getTypeGenericProperties(): TypeGenericProperties
     {
         return new TypeGenericProperties(
             $this->answer_form_id,
             $this->question_id,
-            Definition::class,
+            $this->definition,
             null,
             null,
             null,
@@ -124,6 +125,13 @@ public function getLegacyClozeText(): string
         return $this->legacy_cloze_text;
     }
 
+    public function getClozeTextForPresentation(): string
+    {
+        return $this->cloze_text === null
+            ? $this->legacy_cloze_text
+            : $this->cloze_text->getRenderedMarkdownForParticipantPresentation();
+    }
+
     public function getScoringOfIdenticalResponses(): ScoringIdentical
     {
         return $this->scoring_identical;
@@ -231,7 +239,8 @@ public function buildCarryInputs(
     ): Group {
         return $ff->group(
             [
-                self::FORM_KEY_ID => $ff->hidden()->withValue($this->answer_form_id->toString()),
+                self::FORM_KEY_ID => $ff->hidden()->withValue($this->answer_form_id->toString())
+                    ->withDedicatedName(self::FORM_KEY_ID),
                 self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getCarryInputs($ff)
                     ->withDedicatedName(self::FORM_KEY_CLOZE_TEXT),
                 self::FORM_KEY_GAPS_TO_EDIT => $this->gaps->getCarryInputs($ff)
@@ -303,8 +312,13 @@ public function withValuesFromCarry(
     public function toStorage(
         Manipulate $manipulate
     ): Manipulate {
-        $persistence = $manipulate->getPersistenceForDefinitionClass(Definition::class);
-        $table_name_builder = $manipulate->getTableNameBuilder(Definition::class);
+        $persistence = $manipulate->getPersistenceForDefinitionClass(
+            $this->definition::class
+        );
+
+        $table_name_builder = $manipulate->getTableNameBuilder(
+            $this->definition::class
+        );
 
         $answer_form_statement = $manipulate->getManipulationType() === ManipulationType::Create
             ? $this->buildInsertAnswerFormStatement(
@@ -328,8 +342,13 @@ public function toStorage(
     public function toDelete(
         Manipulate $manipulate
     ): Manipulate {
-        $persistence = $manipulate->getPersistenceForDefinitionClass(Definition::class);
-        $table_name_builder = $manipulate->getTableNameBuilder(Definition::class);
+        $persistence = $manipulate->getPersistenceForDefinitionClass(
+            $this->definition::class
+        );
+
+        $table_name_builder = $manipulate->getTableNameBuilder(
+            $this->definition::class
+        );
 
         return $this->gaps->toDelete(
             $manipulate->withAdditionalStatement(
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index aa8bc12bcb6f..64eb908e2555 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -41,14 +41,14 @@ class Edit implements EditViewInterface
 {
     private const string STEP_EDIT_BASIC_PROPERTIES = 'ebp';
     private const string STEP_CONFIRMED_GAP_REMOVAL = 'cgr';
-    public const string STEP_SET_GAP_TYPES = 'sgt';
-    public const string STEP_SET_ANSWER_OPTIONS = 'sao';
-    public const string STEP_SET_POINTS = 'sp';
+    private const string STEP_SET_GAP_TYPES = 'sgt';
+    public const string STEP_JUMP_TO_SET_GAP_TYPES = 'jsgt';
+    private const string STEP_SET_ANSWER_OPTIONS = 'sao';
+    public const string STEP_JUMP_TO_SET_ANSWER_OPTIONS = 'jsao';
+    private const string STEP_SET_POINTS = 'sp';
+    public const string STEP_JUMP_TO_SET_POINTS = 'jsp';
     private const string STEP_SAVE = 's';
 
-    public const array PARAMETER_NAMESPACE = ['c'];
-    public const string OVERVIEW_TABLE_ROW_ID = 'g';
-
     public function __construct(
         private readonly Language $lng,
         private readonly UIFactory $ui_factory,
@@ -64,9 +64,11 @@ public function __construct(
     public function create(
         Environment $environment
     ): EditForm|Properties {
-        return match($environment->getStep()) {
+        $step = $environment->getStep();
+
+        return match($step) {
             '' => $this->buildBasicEditingForm($environment),
-            default => $this->callIntermediateStep($environment)
+            default => $this->callIntermediateStep($environment, $step)
         };
     }
 
@@ -74,14 +76,21 @@ public function create(
     public function edit(
         Environment $environment
     ): EditOverview|EditForm|Properties {
-        return match ($environment->getStep()) {
-            '' => $environment->getPresentationFactory()->getEditOverview(
+        $step = $environment->getStep();
+
+        if ($step === '') {
+            return $environment->getPresentationFactory()->getEditOverview(
                 $environment,
                 $environment->getUrlBuilderWithStepParameter(self::STEP_EDIT_BASIC_PROPERTIES)
                     ->buildURI()
-            ),
+            );
+        }
+
+        $environment->setEditAnswerFormBackTarget();
+
+        return match ($step) {
             self::STEP_EDIT_BASIC_PROPERTIES => $this->buildBasicEditingForm($environment),
-            default => $this->callIntermediateStep($environment)
+            default => $this->callIntermediateStep($environment, $step)
         };
     }
 
@@ -93,39 +102,49 @@ public function other(
     }
 
     private function callIntermediateStep(
-        Environment $environment
+        Environment $environment,
+        string $step
     ): EditForm|Properties {
-        $environment_with_properties = $environment->getAnswerFormProperties()->withValuesFromCarry(
-            $this->refinery,
-            $this->cloze_text_factory,
-            $this->gap_factory,
-            $environment->getPresentationFactory()->getCarrySectionData(
-                $this->http->wrapper()->post(),
-                $this->refinery
-            )
-        );
+        $initialized_environment = $environment->withPreservedTableRowIdsParameter();
 
-        return match ($environment->getStep()) {
+        if ($step !== self::STEP_JUMP_TO_SET_ANSWER_OPTIONS
+            && $step !== self::STEP_JUMP_TO_SET_ANSWER_OPTIONS
+            && $step !== self::STEP_JUMP_TO_SET_POINTS) {
+            $initialized_environment = $initialized_environment->withAnswerFormProperties(
+                $environment->getAnswerFormProperties()->withValuesFromCarry(
+                    $this->refinery,
+                    $this->cloze_text_factory,
+                    $this->gap_factory,
+                    $environment->getPresentationFactory()->getCarrySectionData(
+                        $this->http->wrapper()->post(),
+                        $this->refinery
+                    )
+                )
+            );
+        }
+
+        return match ($step) {
             self::STEP_SET_GAP_TYPES,
             self::STEP_CONFIRMED_GAP_REMOVAL => $this->processBasicEditingForm(
-                $environment->withAnswerFormProperties(
-                    $environment_with_properties
-                )
+                $initialized_environment
+            ),
+            self::STEP_JUMP_TO_SET_GAP_TYPES => $this->buildGapTypesForm(
+                $initialized_environment
             ),
             self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm(
-                $environment->withAnswerFormProperties(
-                    $environment_with_properties
-                )
+                $initialized_environment
+            ),
+            self::STEP_JUMP_TO_SET_ANSWER_OPTIONS => $this->buildAnswerOptionsForm(
+                $initialized_environment
             ),
             self::STEP_SET_POINTS => $this->processAnswerOptionsForm(
-                $environment->withAnswerFormProperties(
-                    $environment_with_properties
-                )
+                $initialized_environment
+            ),
+            self::STEP_JUMP_TO_SET_POINTS => $this->buildAssignPointsForm(
+                $initialized_environment
             ),
             self::STEP_SAVE => $this->processAssignPointsForm(
-                $environment->withAnswerFormProperties(
-                    $environment_with_properties
-                )
+                $initialized_environment
             )
         };
     }
@@ -193,7 +212,8 @@ private function buildGapTypesForm(
                 $this->lng,
                 $ff,
                 $this->refinery,
-                $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng)
+                $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng),
+                $environment->getTableRowIds()
             ),
             false,
             $properties->withClozeText($properties->getClozeText())
@@ -227,7 +247,12 @@ private function buildAnswerOptionsForm(
         $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
             $environment->getUrlBuilderWithStepParameter(self::STEP_SET_POINTS),
-            $properties->getGaps()->buildAnswerOptionsInputs($this->lng, $ff, $this->refinery),
+            $properties->getGaps()->buildAnswerOptionsInputs(
+                $this->lng,
+                $ff,
+                $this->refinery,
+                $environment->getTableRowIds()
+            ),
             false,
             $properties->buildCarryInputs($ff)
         )->withContentBeforeForm(
@@ -259,7 +284,12 @@ private function buildAssignPointsForm(
         $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
             $environment->getUrlBuilderWithStepParameter(self::STEP_SAVE),
-            $properties->getGaps()->buildPointInputs($this->lng, $ff, $this->refinery),
+            $properties->getGaps()->buildPointInputs(
+                $this->lng,
+                $ff,
+                $this->refinery,
+                $environment->getTableRowIds()
+            ),
             true,
             $properties->buildCarryInputs($ff)
         )->withContentBeforeForm(
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
index 361c8523884f..77579cd67a73 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Participant.php
@@ -20,11 +20,20 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
 
+use ILIAS\Questions\AnswerForm\Properties;
 use ILIAS\Questions\AnswerForm\Views\Participant as ParticipantViewInterface;
 use ILIAS\Questions\Response\Response;
+use ILIAS\UICore\GlobalTemplate;
+use Mustache\Engine as MustacheEngine;
 
 class Participant implements ParticipantViewInterface
 {
+    public function __construct(
+        private readonly GlobalTemplate $global_tpl,
+        private readonly MustacheEngine $mustache_engine
+    ) {
+    }
+
     #[\Override]
     public function isAsyncPresentationAvailable(): bool
     {
@@ -33,8 +42,13 @@ public function isAsyncPresentationAvailable(): bool
 
     #[\Override]
     public function get(
+        Properties $properties,
         ?Response $response
-    ): array {
-
+    ): string {
+        $this->global_tpl->addJavaScript('assets/js/ParticipantViewLongMenu.js');
+        return $this->mustache_engine->render(
+            $properties->getClozeTextForPresentation(),
+            $properties->getGaps()->getPlaceholderArrayForParticipantView()
+        );
     }
 }
diff --git a/components/ILIAS/Questions/src/Persistence/CoreTables.php b/components/ILIAS/Questions/src/Persistence/CoreTables.php
index 8c3f4f1bd5a1..81cb668be3c5 100644
--- a/components/ILIAS/Questions/src/Persistence/CoreTables.php
+++ b/components/ILIAS/Questions/src/Persistence/CoreTables.php
@@ -22,6 +22,14 @@
 
 enum CoreTables: string
 {
+    public const string LINKING_TABLE_ID_COLUMN = 'question_id';
+    private const string LINKING_TABLE_FOREIGN_KEY_COLUMN = 'obj_id';
+    private const array LINKING_TABLE_COLUMNS = [
+        'question_id',
+        'obj_id',
+        'position'
+    ];
+
     private const string QUESTION_TABLE_ID_COLUMN = 'id';
     private const array QUESTION_TABLE_COLUMNS = [
         'id',
@@ -64,6 +72,7 @@ public function getColumns(
     ): array {
         $table = $this->getTable();
         $column_identifiers = match($this) {
+            self::Linking => self::LINKING_TABLE_COLUMNS,
             self::Questions => self::QUESTION_TABLE_COLUMNS,
             self::AnswerForms => self::ANSWER_FORM_TABLE_COLUMNS
         };
@@ -81,6 +90,10 @@ public function getColumns(
     public function getIdColumn(): Column
     {
         return match($this) {
+            self::Linking => new Column(
+                $this->getTable(),
+                self::LINKING_TABLE_ID_COLUMN
+            ),
             self::Questions => new Column(
                 $this->getTable(),
                 self::QUESTION_TABLE_ID_COLUMN
@@ -95,6 +108,10 @@ public function getIdColumn(): Column
     public function getForeignKeyColumn(): ?Column
     {
         return match($this) {
+            self::Linking => new Column(
+                $this->getTable(),
+                self::LINKING_TABLE_FOREIGN_KEY_COLUMN
+            ),
             self::AnswerForms => new Column(
                 $this->getTable(),
                 self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
diff --git a/components/ILIAS/Questions/src/Persistence/Query.php b/components/ILIAS/Questions/src/Persistence/Query.php
index 5c28eb794215..f03a1ca646bd 100644
--- a/components/ILIAS/Questions/src/Persistence/Query.php
+++ b/components/ILIAS/Questions/src/Persistence/Query.php
@@ -43,11 +43,15 @@ public function __construct(
         private readonly AnswerFormFactory $answer_form_factory,
         private readonly Refinery $refinery
     ) {
-
+        $questions_linking_table_definition = CoreTables::Linking;
         $questions_table_definition = CoreTables::Questions;
         $answer_form_table_definition = CoreTables::AnswerForms;
         $questions_id_column = $questions_table_definition->getIdColumn();
 
+        $this->select[] = new Select(
+            $questions_linking_table_definition->getColumns()
+        );
+
         $this->select[] = new Select(
             $questions_table_definition->getColumns()
         );
@@ -56,6 +60,12 @@ public function __construct(
             $answer_form_table_definition->getColumns()
         );
 
+        $this->joins[] = new Join(
+            $questions_id_column,
+            $questions_table_definition->getIdColumn(),
+            JoinType::Inner
+        );
+
         $this->joins[] = new Join(
             $questions_id_column,
             $answer_form_table_definition->getForeignKeyColumn(),
@@ -180,13 +190,24 @@ private function toSql(): \ilDBStatement
                     static fn(array $c, Select $v): array => [...$c, ...$v->toColumnsArray()],
                     []
                 )
-            ) . ' FROM ' . CoreTables::Questions->value
+            ) . ' FROM ' . CoreTables::Linking->value
             . array_reduce(
                 $this->joins,
                 static fn(string $c, Join $v): string => $c . PHP_EOL . $v->toSql(),
                 ''
             ) . PHP_EOL
             . $this->buildWhereString()
+            . 'ORDER BY ' . implode(
+                ', ',
+                array_reduce(
+                    $this->order,
+                    static function (array $c, Order $v): array {
+                        $c[] = $v->toSql();
+                        return $c;
+                    },
+                    []
+                )
+            ) . PHP_EOL
             . ($this->limit !== null ? "LIMIT = {$this->limit}" : ''),
             $this->binding_types,
             $this->binding_values
diff --git a/components/ILIAS/Questions/src/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
index 58fcf6f17b07..998fc739d62d 100644
--- a/components/ILIAS/Questions/src/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -38,10 +38,12 @@ public function __construct(
     ) {
     }
 
-    public function getNew(): QuestionImplementation
-    {
+    public function getNew(
+        int $parent_obj_id
+    ): QuestionImplementation {
         return new QuestionImplementation(
-            $this->buildAvailableUuid()
+            $this->buildAvailableUuid(),
+            $parent_obj_id
         );
     }
 
@@ -118,7 +120,7 @@ public function create(
         $this->store(
             array_map(
                 fn(QuestionImplementation $v): QuestionImplementation => $v
-                    ->withPageId($this->buildQuestionPage()),
+                    ->withPageId($this->buildQuestionPage($v->getParentObjId())),
                 $questions
             ),
             new Manipulate(
@@ -157,6 +159,10 @@ public function delete(
                 ManipulationType::Delete
             )
         )->run();
+
+        foreach ($questions as $question) {
+            (new \QstsQuestionPage($question->getPageId()))->delete();
+        }
     }
 
     /**
@@ -186,11 +192,18 @@ private function retrieveQuestionFromQuery(
         Query $query,
         array $answer_forms
     ): QuestionImplementation {
+        $linking_info = $query->retrieveCurrentRecord(
+            CoreTables::Linking->getTable(),
+            $this->refinery->identity()
+        );
+
         return $query->retrieveCurrentRecord(
             CoreTables::Questions->getTable(),
             $this->refinery->custom()->transformation(
                 fn(array $vs): QuestionImplementation => new QuestionImplementation(
                     $this->uuid_factory->fromString($vs[0]['id']),
+                    $linking_info[0]['obj_id'],
+                    $linking_info[0]['position'],
                     $vs[0]['page_id'],
                     $vs[0]['title'],
                     $vs[0]['author'],
@@ -273,10 +286,12 @@ private function checkAvailabilityOfId(
         )->cnt === 0;
     }
 
-    private function buildQuestionPage(): int
-    {
+    private function buildQuestionPage(
+        int $parent_obj_id
+    ): int {
         $page = new \QstsQuestionPage();
         $page->setId($this->getNextAvailableQuestionPageId());
+        $page->setParentId($parent_obj_id);
         $page->createFromXML();
         return $page->getId();
     }
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php b/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
index 47a22825935d..9c112f518e33 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
@@ -23,9 +23,18 @@
 use ILIAS\Questions\AnswerForm\Properties;
 use ILIAS\Questions\Presentation\Layout\Factory;
 use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
 
 interface Environment
 {
+    public function setEditAnswerFormBackTarget(): void;
+
+    public function addEditAnswerFormSubTab(
+        string $id,
+        string $text,
+        string $step
+    ): void;
+
     public function getPresentationFactory(): Factory;
 
     public function getUrlBuilder(): URLBuilder;
@@ -34,6 +43,10 @@ public function getUrlBuilderWithStepParameter(
         string $step
     ): URLBuilder;
 
+    public function getTableRowIdToken(): URLBuilderToken;
+
+    public function getTableRowIds(): array;
+
     public function getStep(): string;
 
     public function withDefaultStep(): self;
@@ -45,4 +58,6 @@ public function getAnswerFormProperties(): ?Properties;
     public function withAnswerFormProperties(
         Properties $properties
     ): self;
+
+    public function withPreservedTableRowIdsParameter(): self;
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
index c197e52faca3..cc5adc752c91 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
@@ -26,6 +26,7 @@
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\HTTP\Services as HTTPServices;
+use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
 use ILIAS\UI\URLBuilder;
@@ -39,9 +40,12 @@ class EnvironmentImplementation implements Environment
     private const string TOKEN_STRING_QUESTION_ID = 'q';
     private const string TOKEN_STRING_QUESTION_IDS = 'qs';
     private const string TOKEN_TYPE_HASH = 't';
+    private const string TOKEN_TABLE_ROW_ID = 'r';
 
     private const string INTERRUPTIVE_ITEMS_KEY = 'interruptive_items';
 
+    private const string TAB_ID_ANSWER_FORM = 'answer_form';
+
     private ?Properties $properties = null;
 
     private bool $default_step = false;
@@ -52,19 +56,48 @@ class EnvironmentImplementation implements Environment
     private readonly URLBuilderToken $question_id_token;
     private readonly URLBuilderToken $question_ids_token;
     private readonly URLBuilderToken $type_hash_token;
+    private readonly URLBuilderToken $table_row_token;
+
+    private ?array $table_row_ids = null;
 
     public function __construct(
         private readonly \ilCtrl $ctrl,
         private readonly HTTPServices $http,
         private readonly Refinery $refinery,
+        private readonly Language $lng,
+        private readonly \ilTabsGUI $tabs_gui,
         private readonly UuidFactory $uuid_factory,
         private readonly Factory $presentation_factory,
         private readonly Editability $editability,
-        URI $base_uri
+        URI $base_uri,
+        private readonly int $obj_id
     ) {
         $this->acquireURLBuilderAndParameters($base_uri);
     }
 
+    #[\Override]
+    public function setEditAnswerFormBackTarget(): void
+    {
+        $this->tabs_gui->clearTargets();
+        $this->tabs_gui->setBackTarget(
+            $this->lng->txt('cancel'),
+            $this->withDefaultStep()->getUrlBuilder()->buildURI()->__toString()
+        );
+    }
+
+    #[\Override]
+    public function addEditAnswerFormSubTab(
+        string $id,
+        string $text,
+        string $step
+    ): void {
+        $this->tabs_gui->addSubTab(
+            $id,
+            $text,
+            $this->getUrlBuilderWithStepParameter($step)->buildURI()->__toString()
+        );
+    }
+
     #[\Override]
     public function getPresentationFactory(): Factory
     {
@@ -121,6 +154,52 @@ public function withAnswerFormProperties(
         return $clone;
     }
 
+    #[\Override]
+    public function getTableRowIdToken(): URLBuilderToken
+    {
+        return $this->table_row_token;
+    }
+
+    /**
+     * @return list<string>
+     */
+    #[\Override]
+    public function getTableRowIds(): array
+    {
+        if ($this->table_row_ids !== null) {
+            return $this->table_row_ids;
+        }
+
+        return $this->table_row_ids = $this->http->wrapper()->query()->retrieve(
+            $this->table_row_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->kindlyTo()->listOf(
+                    $this->refinery->custom()->transformation(
+                        fn($v): string => $v !== ''
+                            ? $this->refinery->kindlyTo()->string()->transform($v)
+                            : throw new \UnexpectedValueException()
+                    )
+                ),
+                $this->refinery->always([])
+            ])
+        );
+    }
+
+    #[\Override]
+    public function withPreservedTableRowIdsParameter(): self
+    {
+        $clone = clone $this;
+        $clone->table_row_ids = $clone->getTableRowIds();
+        $clone->url_builder = $this->url_builder
+            ->withParameter($this->table_row_token, $clone->table_row_ids);
+        return $clone;
+    }
+
+    public function getObjId(): int
+    {
+        return $this->obj_id;
+    }
+
     public function getQuestionIdsToken(): URLBuilderToken
     {
         return $this->question_ids_token;
@@ -209,6 +288,37 @@ public function getTypeClassHast(): string
         return $this->retrieveStringValueForToken($this->type_hash_token);
     }
 
+    public function setEditAnswerFormTabs(
+        string $cmd_feedback,
+        string $cmd_content_for_repetition
+    ): void {
+        $this->tabs_gui->addTab(
+            self::TAB_ID_ANSWER_FORM,
+            $this->lng->txt('answer_form'),
+            $this->withDefaultStep()->getUrlBuilder()->buildURI()->__toString()
+        );
+
+        $this->tabs_gui->addTab(
+            $cmd_feedback,
+            $this->lng->txt('feedback'),
+            $this->withActionParameter($cmd_feedback)
+                ->getUrlBuilder()
+                ->buildURI()
+                ->__toString()
+        );
+
+        $this->tabs_gui->addTab(
+            $cmd_content_for_repetition,
+            $this->lng->txt('suggested_solution'),
+            $this->withActionParameter($cmd_content_for_repetition)
+                ->getUrlBuilder()
+                ->buildURI()
+                ->__toString()
+        );
+
+        $this->tabs_gui->activateTab(self::TAB_ID_ANSWER_FORM);
+    }
+
     public function setParametersForQuestionCmds(): void
     {
         $this->ctrl->setParameterByClass(
@@ -227,7 +337,8 @@ private function acquireURLBuilderAndParameters(
             $this->step_token,
             $this->question_id_token,
             $this->question_ids_token,
-            $this->type_hash_token
+            $this->type_hash_token,
+            $this->table_row_token
         ] = (new URLBuilder($base_uri))
             ->acquireParameters(
                 self::QUERY_PARAMETER_NAME_SPACE,
@@ -235,7 +346,8 @@ private function acquireURLBuilderAndParameters(
                 self::TOKEN_STRING_STEP,
                 self::TOKEN_STRING_QUESTION_ID,
                 self::TOKEN_STRING_QUESTION_IDS,
-                self::TOKEN_TYPE_HASH
+                self::TOKEN_TYPE_HASH,
+                self::TOKEN_TABLE_ROW_ID
             );
     }
 
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 5aacdf92d1d6..f4c1bb110701 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -35,9 +35,9 @@
 use ILIAS\Questions\AnswerForm\Views\Edit as AnswerFormEditView;
 use ILIAS\Questions\Persistence\Repository;
 use ILIAS\Questions\Question\QuestionImplementation;
-use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\URI;
 use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\UICore\GlobalTemplate;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\HTTP\Services as HTTP;
@@ -46,6 +46,7 @@
 use ILIAS\UI\Component\Item\Standard as StandardItem;
 use ILIAS\UI\Component\Item\Group as ItemGroup;
 use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
+use ILIAS\Style\Content\Service as ContentStyle;
 use ILIAS\GlobalScreen\Services as GlobalScreen;
 
 class Edit
@@ -55,6 +56,8 @@ class Edit
     public const string CMD_DELETE_QUESTION = 'delete';
     private const string CMD_CREATE_ANSWER_FORM = 'create_af';
     private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
+    private const string CMD_EDIT_FEEDBACK = 'edit_f';
+    private const string CMD_EDIT_CONTENT_FOR_REPETITION = 'edit_cfr';
 
     private array $required_capabilities = [];
     private Editability $editability = Editability::Full;
@@ -67,10 +70,12 @@ public function __construct(
         private readonly UIFactory $ui_factory,
         private readonly UIRenderer $ui_renderer,
         private readonly GlobalScreen $global_screen,
+        private readonly GlobalTemplate $global_tpl,
+        private readonly ContentStyle $content_style,
         private readonly \ilCtrl $ctrl,
         private readonly HTTP $http,
+        private readonly \ilTabsGUI $tabs_gui,
         private readonly \ilUIService $ui_services,
-        private readonly DataFactory $data_factory,
         private readonly UuidFactory $uuid_factory,
         private readonly AnswerFormFactory $answer_form_factory,
         private readonly Repository $questions_repository,
@@ -105,9 +110,20 @@ public function withOrderingEnabled(
 
     public function view(
         \ilToolbarGUI $toolbar,
-        URI $base_uri
+        URI $base_uri,
+        int $obj_id,
+        int $ref_id
     ): Async|QuestionsTable|EditForm {
-        $environment = $this->buildEnvironment($base_uri);
+        $this->content_style->gui()->addCss(
+            $this->global_tpl,
+            $ref_id
+        );
+
+        $environment = $this->buildEnvironment(
+            $base_uri,
+            $obj_id
+        );
+
         return match($environment->getAction()) {
             self::CMD_CREATE_QUESTION => $this->createQuestion($environment),
             self::CMD_EDIT_QUESTION => $this->editQuestion($environment),
@@ -119,20 +135,34 @@ public function view(
     public function forwardPageCmds(
         \ilGlobalTemplateInterface $tpl,
         URI $base_uri,
+        int $obj_id,
+        int $ref_id
     ): void {
-        $environment = $this->buildEnvironment($base_uri);
+        $environment = $this->buildEnvironment(
+            $base_uri,
+            $obj_id
+        );
         $this->initializeEditMode($environment);
         $environment->setParametersForQuestionCmds();
 
+        $this->content_style->gui()->addCss(
+            $tpl,
+            $ref_id
+        );
+
         $tpl->setContent(
             $this->ctrl->forwardCommand(
                 new \QstsQuestionPageGUI(
+                    $this->questions_repository->getForQuestionId(
+                        $environment->getQuestionId()
+                    ),
+                    $obj_id
+                )->withReturnURI(
                     $environment
-                        ->withActionParameter(self::CMD_EDIT_QUESTION)
-                        ->withQuestionIdParameter($environment->getQuestionId())
-                        ->getUrlBuilder()
-                        ->buildURI(),
-                    $this->questions_repository->getForQuestionId($environment->getQuestionId())
+                            ->withActionParameter(self::CMD_EDIT_QUESTION)
+                            ->withQuestionIdParameter($environment->getQuestionId())
+                            ->getUrlBuilder()
+                            ->buildURI()
                 )
             )
         );
@@ -140,12 +170,15 @@ public function forwardPageCmds(
 
     public function createAnswerForm(
         URI $base_uri,
+        int $obj_id,
         QuestionImplementation $question,
         \ilPCAnswerForm $content_object
     ): EditForm {
-        $environment = $this->buildEnvironment($base_uri)
-            ->withActionParameter(self::CMD_CREATE_ANSWER_FORM)
-            ->withQuestionIdParameter($question->getId());
+        $environment = $this->buildEnvironment(
+            $base_uri,
+            $obj_id
+        )->withActionParameter(self::CMD_CREATE_ANSWER_FORM)
+        ->withQuestionIdParameter($question->getId());
 
         $answer_form_type_class_hash = $environment->getTypeClassHast();
 
@@ -181,14 +214,22 @@ public function createAnswerForm(
 
     public function editAnswerForm(
         URI $base_uri,
+        int $obj_id,
         QuestionImplementation $question,
         AnswerFormProperties $answer_form_properties,
         Definition $type
     ): Async|EditForm|EditOverview {
-        $environment = $this->buildEnvironment($base_uri)
-            ->withAnswerFormProperties($answer_form_properties)
-            ->withActionParameter(self::CMD_EDIT_ANSWER_FORM)
-            ->withQuestionIdParameter($question->getId());
+        $environment = $this->buildEnvironment(
+            $base_uri,
+            $obj_id
+        )->withAnswerFormProperties($answer_form_properties)
+        ->withActionParameter(self::CMD_EDIT_ANSWER_FORM)
+        ->withQuestionIdParameter($question->getId());
+
+        $environment->setEditAnswerFormTabs(
+            self::CMD_EDIT_FEEDBACK,
+            self::CMD_EDIT_CONTENT_FOR_REPETITION
+        );
 
         $edit = $type->getEditView()->edit($environment);
 
@@ -208,14 +249,15 @@ private function createQuestion(
     ): EditForm {
         $this->initializeEditMode($environment);
 
-        $create = $this->questions_repository->getNew()->getEditView(
+        $create = $this->questions_repository->getNew(
+            $environment->getObjId()
+        )->getEditView(
             $this->lng,
             $this->current_user,
             $this->ui_factory,
             $this->refinery,
             $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
+            $this->ctrl
         )->create(
             $environment->withActionParameter(self::CMD_CREATE_QUESTION)
         );
@@ -243,19 +285,21 @@ private function editQuestion(
         $this->initializeEditMode($environment);
 
         $question_id = $environment->getQuestionId();
+        $question = $this->questions_repository->getForQuestionId($question_id);
+        $environment_with_question_parameter = $environment
+            ->withQuestionIdParameter($question_id);
 
-        $edit = $this->questions_repository->getForQuestionId($question_id)->getEditView(
+        $edit = $question->getEditView(
             $this->lng,
             $this->current_user,
             $this->ui_factory,
             $this->refinery,
             $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
+            $this->ctrl
         )->edit(
-            $environment
-                ->withActionParameter(self::CMD_EDIT_QUESTION)
-                ->withQuestionIdParameter($question_id)
+            $environment_with_question_parameter
+                ->withActionParameter(self::CMD_EDIT_QUESTION),
+            $question->getParticipantView()
         );
 
         if ($edit instanceof EditForm) {
@@ -264,10 +308,9 @@ private function editQuestion(
 
         $this->questions_repository->update([$edit]);
         return $this->buildEditStartView(
-            $environment
+            $environment_with_question_parameter
                 ->withDefaultStep()
-                ->withActionParameter(self::CMD_EDIT_QUESTION)
-                ->withQuestionIdParameter($question_id),
+                ->withActionParameter(self::CMD_EDIT_QUESTION),
             $edit
         );
     }
@@ -384,14 +427,6 @@ private function forwardCreateAnswerFormCmd(
         $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
     }
 
-    private function forwardEditAnswerFormCmd(
-        EnvironmentImplementation $environment,
-        QuestionImplementation $question,
-        AnswerFormEditView $answer_form_edit_view
-    ): EditForm|EditOverview|Async|null {
-
-    }
-
     private function initializeEditMode(
         EnvironmentImplementation $environment
     ): void {
@@ -462,9 +497,11 @@ private function buildEditStartView(
             $this->ui_factory,
             $this->refinery,
             $this->http->request(),
-            $this->ctrl,
-            $this->data_factory
-        )->edit($environment);
+            $this->ctrl
+        )->edit(
+            $environment,
+            $question->getParticipantView()
+        );
     }
 
     private function buildCreateAnswerForm(
@@ -525,16 +562,20 @@ private function checkCapabilities(
     }
 
     public function buildEnvironment(
-        URI $base_uri
+        URI $base_uri,
+        int $obj_id
     ): EnvironmentImplementation {
         return new EnvironmentImplementation(
             $this->ctrl,
             $this->http,
             $this->refinery,
+            $this->lng,
+            $this->tabs_gui,
             $this->uuid_factory,
             $this->definitions_factory,
             $this->editability,
-            $base_uri
+            $base_uri,
+            $obj_id
         );
     }
 }
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index 9eaa46ab5679..42233dbe742b 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -31,7 +31,6 @@
 use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
-use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
@@ -44,6 +43,7 @@
 
 class QuestionImplementation implements Question
 {
+    private bool $linking_information_updated = false;
     private bool $self_updated = false;
     private array $updated_answer_forms = [];
     private array $deleted_answer_forms = [];
@@ -55,6 +55,8 @@ class QuestionImplementation implements Question
      */
     public function __construct(
         private readonly Uuid $id,
+        private int $parent_obj_id,
+        private ?int $position = null,
         private ?int $page_id = null,
         private string $title = '',
         private string $author = '',
@@ -82,6 +84,29 @@ public function getId(): ?Uuid
         return $this->id;
     }
 
+    public function getParentObjId(): int
+    {
+        return $this->parent_obj_id;
+    }
+
+    public function withParentObjId(
+        int $parent_obj_id
+    ): self {
+        $clone = clone $this;
+        $clone->parent_obj_id = $parent_obj_id;
+        $clone->linking_information_updated = true;
+        return $clone;
+    }
+
+    public function withPosition(
+        int $position
+    ): self {
+        $clone = clone $this;
+        $clone->position = $position;
+        $clone->linking_information_updated = true;
+        return $clone;
+    }
+
     public function getPageId(): ?int
     {
         return $this->page_id;
@@ -224,17 +249,24 @@ public function getEditView(
         UIFactory $ui_factory,
         Refinery $refinery,
         RequestInterface $request,
-        \ilCtrl $ctrl,
-        DataFactory $data_factory
+        \ilCtrl $ctrl
     ): Views\Edit {
-        return new Views\Edit($lng, $current_user, $ui_factory, $refinery, $request, $ctrl, $data_factory, $this);
+        return new Views\Edit(
+            $lng,
+            $current_user,
+            $ui_factory,
+            $refinery,
+            $request,
+            $ctrl,
+            $this
+        );
     }
 
+    #[\Override]
     public function getParticipantView(): Views\Participant
     {
         return new Views\Participant(
-            new \QstsQuestionPageGUI($this),
-            $this->answer_forms
+            $this
         );
     }
 
@@ -294,9 +326,12 @@ private function addInsertStatementsToManipulation(
         Manipulate $manipulate
     ): Manipulate {
         if ($this->created === null) {
-            $manipulate = $manipulate->withAdditionalStatement(
-                $this->buildInsertQuestionStatement()
-            );
+            $manipulate = $manipulate
+                ->withAdditionalStatement(
+                    $this->buildInsertLinkingStatement()
+                )->withAdditionalStatement(
+                    $this->buildInsertQuestionStatement()
+                );
         }
 
         if ($this->updated_answer_forms !== []) {
@@ -319,6 +354,13 @@ private function addInsertStatementsToManipulation(
     private function addUpdateStatementsToManipulation(
         Manipulate $manipulate
     ): Manipulate {
+        if ($this->linking_information_updated) {
+            $manipulate = $manipulate
+                ->withAdditionalStatement(
+                    $this->buildUpdateLinkingStatement()
+                );
+        }
+
         if ($this->self_updated) {
             $manipulate = $manipulate->withAdditionalStatement(
                 $this->buildUpdateQuestionStatement()
@@ -338,41 +380,6 @@ private function addUpdateStatementsToManipulation(
         );
     }
 
-    private function buildInsertQuestionStatement(): Insert
-    {
-        return new Insert(
-            CoreTables::Questions->getColumns(),
-            [
-                new Value(\ilDBConstants::T_TEXT, $this->id->toString()),
-                new Value(\ilDBConstants::T_INTEGER, $this->page_id),
-                new Value(\ilDBConstants::T_TEXT, $this->title),
-                new Value(\ilDBConstants::T_TEXT, $this->author),
-                new Value(\ilDBConstants::T_TEXT, $this->lifecycle->value),
-                new Value(\ilDBConstants::T_TEXT, $this->remarks),
-                new Value(\ilDBConstants::T_TEXT, $this->original_id?->toString()),
-                new Value(\ilDBConstants::T_INTEGER, time()),
-                new Value(\ilDBConstants::T_INTEGER, time())
-            ]
-        );
-    }
-
-    private function buildDeleteQuestionStatement(): Delete
-    {
-        $table_definition = CoreTables::Questions;
-        return new Delete(
-            $table_definition->getTable(),
-            [
-                new Where(
-                    $table_definition->getIdColumn(),
-                    new Value(
-                        \ilDBConstants::T_TEXT,
-                        $this->id->toString()
-                    )
-                )
-            ]
-        );
-    }
-
     private function addAnswerFormStatementsToManipulate(
         Manipulate $manipulate,
         array $answer_forms
@@ -399,6 +406,58 @@ private function addDeleteAnswerFormsStatementsToManipulate(
         );
     }
 
+
+
+    private function buildInsertLinkingStatement(): Insert
+    {
+        return new Insert(
+            CoreTables::Linking->getColumns(),
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->id->toString()),
+                new Value(\ilDBConstants::T_INTEGER, $this->parent_obj_id),
+                new Value(\ilDBConstants::T_INTEGER, $this->position)
+            ]
+        );
+    }
+
+    private function buildInsertQuestionStatement(): Insert
+    {
+        return new Insert(
+            CoreTables::Questions->getColumns(),
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->id->toString()),
+                new Value(\ilDBConstants::T_INTEGER, $this->page_id),
+                new Value(\ilDBConstants::T_TEXT, $this->title),
+                new Value(\ilDBConstants::T_TEXT, $this->author),
+                new Value(\ilDBConstants::T_TEXT, $this->lifecycle->value),
+                new Value(\ilDBConstants::T_TEXT, $this->remarks),
+                new Value(\ilDBConstants::T_TEXT, $this->original_id?->toString()),
+                new Value(\ilDBConstants::T_INTEGER, time()),
+                new Value(\ilDBConstants::T_INTEGER, time())
+            ]
+        );
+    }
+
+    private function buildUpdateLinkingStatement(): Update
+    {
+        $linking_table_definition = CoreTables::Linking;
+        return new Update(
+            $linking_table_definition->getColumns(
+                [CoreTables::LINKING_TABLE_ID_COLUMN]
+            ),
+            [
+                new Value(\ilDBConstants::T_INTEGER, $this->parent_obj_id),
+                new Value(\ilDBConstants::T_INTEGER, $this->position)
+            ],
+            [
+                new Where(
+                    $linking_table_definition->getIdColumn(),
+                    new Value(\ilDBConstants::T_TEXT, $this->id->toString())
+                )
+            ]
+        );
+    }
+
     private function buildUpdateQuestionStatement(): Update
     {
         $questions_table_definition = CoreTables::Questions;
@@ -424,4 +483,21 @@ private function buildUpdateQuestionStatement(): Update
             ]
         );
     }
+
+    private function buildDeleteQuestionStatement(): Delete
+    {
+        $table_definition = CoreTables::Questions;
+        return new Delete(
+            $table_definition->getTable(),
+            [
+                new Where(
+                    $table_definition->getIdColumn(),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        $this->id->toString()
+                    )
+                )
+            ]
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index db8eb546da50..5a21f551dbc4 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -25,7 +25,6 @@
 use ILIAS\Questions\Question\Question;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
-use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
@@ -45,7 +44,6 @@ public function __construct(
         private readonly Refinery $refinery,
         private readonly RequestInterface $request,
         private readonly \ilCtrl $ctrl,
-        private readonly DataFactory $data_factory,
         private readonly QuestionImplementation $question
     ) {
 
@@ -61,12 +59,13 @@ public function create(
     }
 
     public function edit(
-        EnvironmentImplementation $environment
+        EnvironmentImplementation $environment,
+        Participant $participant_view
     ): EditForm|Question {
         return match ($environment->getStep()) {
             self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm($environment),
             default => $this->buildBasicPropertiesForm($environment)->withContentAfterForm(
-                $this->buildPreviewPanel($environment)
+                $this->buildPreviewPanel($environment, $participant_view)
             )
         };
     }
@@ -148,12 +147,15 @@ function (array $vs): QuestionImplementation {
     }
 
     private function buildPreviewPanel(
-        EnvironmentImplementation $environment
+        EnvironmentImplementation $environment,
+        Participant $participant_view
     ): StandardPanel {
         $environment->setParametersForQuestionCmds();
         return $this->ui_factory->panel()->standard(
             $this->lng->txt('preview'),
-            $this->ui_factory->legacy()->content($this->question->getTitle())
+            $this->ui_factory->legacy()->content(
+                $participant_view->get($environment->getObjId())
+            )
         )->withActions(
             $this->ui_factory->dropdown()->standard([
                 $this->ui_factory->link()->standard(
diff --git a/components/ILIAS/Questions/src/Question/Views/Participant.php b/components/ILIAS/Questions/src/Question/Views/Participant.php
index a200938bcdbb..775aff19fd8e 100644
--- a/components/ILIAS/Questions/src/Question/Views/Participant.php
+++ b/components/ILIAS/Questions/src/Question/Views/Participant.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\Question\Views;
 
-use ILIAS\Questions\Question\Question;
+use ILIAS\Questions\Question\QuestionImplementation;
 
 class Participant
 {
@@ -30,7 +30,7 @@ class Participant
     private bool $show_correct_solution = false;
 
     public function __construct(
-        private readonly Question $question
+        private readonly QuestionImplementation $question
     ) {
     }
 
@@ -82,4 +82,32 @@ public function withShowCorrectSolution(
         $clone->show_correct_solution = $show_correct_solution;
         return $clone;
     }
+
+    public function get(
+        int $obj_id
+    ): string {
+        $tpl = new \ilTemplate(
+            'tpl.qpl_question_preview.html',
+            true,
+            true,
+            'components/ILIAS/TestQuestionPool'
+        );
+
+        $tpl->setVariable(
+            'PREVIEW_FORMACTION',
+            ''
+        );
+
+        $question_page = new \QstsQuestionPageGUI(
+            $this->question,
+            $obj_id
+        );
+        $question_page->setPresentationTitle($this->question->getTitle());
+
+        $tpl->setVariable(
+            'QUESTION_OUTPUT',
+            $question_page->presentation()
+        );
+        return $tpl->get();
+    }
 }
diff --git a/components/ILIAS/Questions/src/Setup/Agent.php b/components/ILIAS/Questions/src/Setup/Agent.php
index 8c4c934bad95..a8708db82f2e 100644
--- a/components/ILIAS/Questions/src/Setup/Agent.php
+++ b/components/ILIAS/Questions/src/Setup/Agent.php
@@ -22,14 +22,34 @@
 
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableNameSpaceCore;
-use ILIAS\Setup\Agent\NullAgent;
+use ILIAS\Refinery\Transformation;
+use ILIAS\Setup\Agent as SetupAgent;
+use ILIAS\Setup\Agent\HasNoNamedObjective;
 use ILIAS\Setup\Objective;
 use ILIAS\Setup\ObjectiveCollection;
+use ILIAS\Setup\Objective\NullObjective;
 use ILIAS\Setup\Metrics\Storage;
 use ILIAS\Setup\Config;
 
-class Agent extends NullAgent
+class Agent implements SetupAgent
 {
+    use HasNoNamedObjective;
+
+    public function __construct(
+        private readonly array $answer_form_migrations
+    ) {
+    }
+
+    public function hasConfig(): bool
+    {
+        return false;
+    }
+
+    public function getArrayToConfigTransformation(): Transformation
+    {
+        throw new LogicException(self::class . ' has no Config.');
+    }
+
     #[\Override]
     public function getUpdateObjective(
         ?Config $config = null
@@ -75,4 +95,35 @@ public function getStatusObjective(
             )
         );
     }
+
+    #[\Override]
+    public function getMigrations(): array
+    {
+        return [
+            new QuestionsMigration(
+                $this->answer_form_migrations
+            )
+        ];
+    }
+
+    #[\Override]
+    public function getBuildObjective(): Objective
+    {
+        return new NullObjective();
+    }
+
+    #[\Override]
+    public function getInstallObjective(
+        ?Config $config = null
+    ): Objective {
+        return new NullObjective();
+    }
+
+
+    #[\Override]
+    public function getNamedObjectives(
+        ?Config $config = null
+    ): array {
+        return new NullObjective();
+    }
 }
diff --git a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
index facc1bbfd274..b128a071aa04 100644
--- a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
@@ -192,7 +192,7 @@ public function step_4(): void
                 'position' => [
                     'type' => \ilDBConstants::T_INTEGER,
                     'length' => 2,
-                    'notnull' => true
+                    'notnull' => false
                 ]
             ]);
         }
@@ -205,4 +205,32 @@ public function step_4(): void
             $this->db->addIndex($table_name, ['obj_id'], 'o');
         }
     }
+
+    public function step_5(): void
+    {
+        if (!$this->db->tableExists(QuestionsMigration::MIGRATIONS_TABLE)) {
+            $this->db->createTable(QuestionsMigration::MIGRATIONS_TABLE, [
+                'old_question_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'new_question_id' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 4,
+                    'notnull' => true
+                ]
+            ]);
+        }
+
+        if (!$this->db->primaryExistsByFields(
+            QuestionsMigration::MIGRATIONS_TABLE,
+            ['old_question_id']
+        )) {
+            $this->db->addPrimaryKey(
+                QuestionsMigration::MIGRATIONS_TABLE,
+                ['old_question_id']
+            );
+        }
+    }
 }
diff --git a/components/ILIAS/Questions/src/Setup/QuestionsMigration.php b/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
new file mode 100644
index 000000000000..9ffadd2ff32d
--- /dev/null
+++ b/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
@@ -0,0 +1,279 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Setup;
+
+use ILIAS\Questions\AnswerForm\Migration as AnswerFormMigration;
+use ILIAS\Questions\Question\Definitions\Lifecycle;
+use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Setup;
+use ILIAS\Setup\CLI\IOWrapper;
+use ILIAS\Setup\Environment;
+use ILIAS\Setup\Migration;
+use ILIAS\DI\Container;
+
+class QuestionsMigration implements Migration
+{
+    private const string QUESTIONS_TABLE = 'qpl_questions';
+    private const string TEST_QUESTIONS_SEQUENCE_TABLE = 'tst_test_question';
+    public const string MIGRATIONS_TABLE = 'qsts_migrations';
+
+    private \ilDBInterface $db;
+    private IOWrapper $io;
+    private UuidFactory $uuid_factory;
+
+    private bool $ilias_is_initialized = false;
+    private ?array $question_to_learning_module_mapping = null;
+    private ?array $allready_migrated_questions = null;
+
+    public function __construct(
+        private readonly array $answer_form_migrations
+    ) {
+    }
+
+    #[\Override]
+    public function getLabel(): string
+    {
+        return 'Migrate questions to Questions Component.';
+    }
+
+    #[\Override]
+    public function getDefaultAmountOfStepsPerRun(): int
+    {
+        return 100;
+    }
+
+    #[\Override]
+    public function getPreconditions(Environment $environment): array
+    {
+        return [new \ilDatabaseInitializedObjective()];
+    }
+
+    #[\Override]
+    public function prepare(Environment $environment): void
+    {
+        $this->db = $environment->getResource(Setup\Environment::RESOURCE_DATABASE);
+        $this->io = $environment->getResource(Setup\Environment::RESOURCE_ADMIN_INTERACTION);
+        $this->uuid_factory = new UuidFactory();
+    }
+
+    #[\Override]
+    public function step(
+        Environment $environment
+    ): void {
+        /**
+         * sk, 2026-01-14: Sadly this is necessary to clone the question pages
+         * without duplicating a humongous amount of code. It is mighty
+         * depressing, but the structure of `COPage` is yay stupid.
+         */
+        if (!$this->ilias_is_initialized) {
+            \ilContext::init(\ilContext::CONTEXT_CRON);
+            entry_point('ILIAS Legacy Initialisation Adapter');
+            $this->ilias_is_initialized = true;
+        }
+
+        $db_values = $this->fetchValidRecord();
+
+        if ($db_values->obj_fi === 0) {
+            $question->obj_fi = $this->getObjIdFromMapping($db_values->question_id);
+        }
+
+        if ($db_values->obj_fi === null) {
+            $this->io->error(
+                "The question with the id {$db_values->question_id} could not be "
+               . "migrated as it doesn't belong to any object."
+            );
+            return;
+        }
+
+        $question = new QuestionImplementation(
+            $this->uuid_factory->uuid4(),
+            $db_values->obj_fi,
+            $db_values->sequence,
+            $this->buildQuestionPage($db_values),
+            $db_values->title,
+            $db_values->author,
+            Lifecycle::tryFrom($db_values->lifecycle),
+            $db_values->description,
+            $db_values->original_id,
+            $db_values->created,
+            time()
+        );
+    }
+
+    #[\Override]
+    public function getRemainingAmountOfSteps(): int
+    {
+        return $this->db->fetchObject(
+            $this->db->query(
+                'SELECT COUNT(question_id) cnt FROM ' . self::QUESTIONS_TABLE . ' q' . PHP_EOL
+                . 'JOIN qpl_qst_type t ON q.question_type_fi = t.question_type_id' . PHP_EOL
+                . 'LEFT JOIN ' . self::MIGRATIONS_TABLE . ' m ON q.question_id = m.old_question_id' . PHP_EOL
+                . 'WHERE t.type_tag IN ('
+                . implode(
+                    ', ',
+                    array_map(
+                        fn(AnswerFormMigration $v): string => "'{$v->getOldQuestionIdentifier()}'",
+                        $this->answer_form_migrations
+                    )
+                ) . ')' . PHP_EOL
+                . 'AND q.complete = 1' . PHP_EOL
+                . 'AND m.old_question_id IS NULL'
+            )
+        )->cnt;
+    }
+
+    private function fetchValidRecord(): array
+    {
+        $query_string = 'SELECT q.*, t.sequence FROM ' . self::QUESTIONS_TABLE . ' q' . PHP_EOL
+            . 'JOIN qpl_qst_type t ON q.question_type_fi = t.question_type_id' . PHP_EOL
+            . 'LEFT JOIN ' . self::MIGRATIONS_TABLE . ' m ON q.question_id = m.old_question_id' . PHP_EOL
+            . 'LEFT JOIN ' . self::TEST_QUESTIONS_SEQUENCE_TABLE . ' t ON q.question_id = t.question_fi'
+            . 'WHERE t.type_tag IN ('
+            . implode(
+                ', ',
+                array_map(
+                    fn(AnswerFormMigration $v): string => "'{$v->getOldQuestionIdentifier()}'",
+                    $this->answer_form_migrations
+                )
+            ) . ')' . PHP_EOL
+            . 'AND q.complete = 1' . PHP_EOL
+            . 'AND m.old_question_id IS NULL'
+            . 'LIMIT 1';
+
+        do {
+            $db_values = $this->db->fetchObject(
+                $this->db->query($query_string)
+            );
+        } while (!$this->areDbValuesValid($db_values));
+
+        $db_values->original_id = $this->getNewQuestionIdForOld($db_values->original_id);
+        return $db_values;
+    }
+
+    private function areDbValuesValid(
+        array $db_values
+    ): bool {
+        if ($db_values->original_id === null) {
+            return true;
+        }
+
+        if ($this->allready_migrated_questions === null) {
+            $this->allready_migrated_questions = $this->loadAlreadyMigratedQuestions();
+        }
+
+        if (isset($this->allready_migrated_questions[$db_values->original_id])) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function getNewQuestionIdForOld(
+        ?int $question_id
+    ): ?uuid {
+        if ($question_id === null) {
+            return null;
+        }
+
+        if ($this->allready_migrated_questions === null) {
+            $this->allready_migrated_questions = $this->loadAlreadyMigratedQuestions();
+        }
+
+        if (!isset($this->allready_migrated_questions[$question_id])) {
+            return null;
+        }
+
+        return $this->uuid_factory->fromString(
+            $this->allready_migrated_questions[$question_id]
+        );
+    }
+
+    private function loadAlreadyMigratedQuestions(): array
+    {
+
+        $query = $this->db->query(
+            'SELECT * FROM ' . self::MIGRATIONS_TABLE
+        );
+
+        $questions = [];
+        while (($row = $this->db->fetchObject($query)) !== null) {
+            $questions[$row->old_question_id] = $row->new_question_id;
+        }
+        return $questions;
+    }
+
+    private function getObjIdFromMapping(
+        int $question_id
+    ): ?int {
+        if ($this->question_to_learning_module_mapping === null) {
+            $this->question_to_learning_module_mapping = $this->loadQuestionsToLearningModuleMapping();
+        }
+
+        $this->question_to_learning_module_mapping[$question_id] ?? null;
+    }
+
+    private function loadQuestionsToLearningModuleMapping(): array
+    {
+
+        $query = $this->db->query(
+            'SELECT question_id, obj_id FROM page_question pq' . PHP_EOL
+            . 'JOIN page_object po ON pq.page_id = po.page_id' . PHP_EOL
+                . 'AND pq.page_parent_type = po.parent_type' . PHP_EOL
+            . 'JOIN object_data o ON po.parent_id = o.obj_id' . PHP_EOL
+            . 'WHERE page_parent_type = "lm"'
+        );
+
+        $mapping = [];
+        while (($row = $this->db->fetchObject($query)) !== null) {
+            $mapping[$row->question_id] = $row->obj_id;
+        }
+        return $mapping;
+    }
+
+    private function buildQuestionPage(
+
+    ): int {
+        $new_id = $this->getNextAvailableQuestionPageId();
+        $page = new \ilAssQuestionPage();
+        $page->copy(
+            $new_id,
+            'qsts',
+        );
+        return $new_id;
+    }
+
+    private function getNextAvailableQuestionPageId(): int
+    {
+
+        $last_id = $this->db->fetchObject(
+            $this->db->query(
+                'SELECT MAX(page_id) AS last FROM ' . CoreTables::PageEditor->value
+                    . ' WHERE parent_type = "qsts"'
+            )
+        )->last;
+        if ($last_id === null) {
+            return 1;
+        }
+
+        return $last_id + 1;
+    }
+}

From 981fc508e5c5072c60074bfaa57529da29b43eaa Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 15 Jan 2026 09:13:38 +0100
Subject: [PATCH 098/141] Test: Fix Links to Units

---
 .../Test/classes/class.ilObjTestFolderGUI.php | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/components/ILIAS/Test/classes/class.ilObjTestFolderGUI.php b/components/ILIAS/Test/classes/class.ilObjTestFolderGUI.php
index ccdb44413a7b..a57d70ae78bc 100755
--- a/components/ILIAS/Test/classes/class.ilObjTestFolderGUI.php
+++ b/components/ILIAS/Test/classes/class.ilObjTestFolderGUI.php
@@ -22,13 +22,15 @@
 use ILIAS\Test\RequestDataCollector;
 use ILIAS\Test\Logging\TestLogViewer;
 use ILIAS\Test\Logging\LogTable;
+use ILIAS\Questions\Units\GlobalConfigurationGUI;
+use ILIAS\Questions\Units\Repository as UnitsRepository;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\Component\Input\Container\Form\Form;
 
 /**
  * @author Helmut Schottmüller <hschottm@gmx.de>
- * @ilCtrl_Calls ilObjTestFolderGUI: ilPermissionGUI, ilGlobalUnitConfigurationGUI
+ * @ilCtrl_Calls ilObjTestFolderGUI: ilPermissionGUI, ILIAS\Questions\Units\GlobalConfigurationGUI
  */
 class ilObjTestFolderGUI extends ilObjectGUI
 {
@@ -36,6 +38,8 @@ class ilObjTestFolderGUI extends ilObjectGUI
 
     private RequestDataCollector $testrequest;
     private TestLogViewer $log_viewer;
+    private ilDBInterface $db;
+    private ilHelpGUI $help;
 
     private DataFactory $data_factory;
 
@@ -47,6 +51,8 @@ public function __construct(
     ) {
         global $DIC;
         $rbacsystem = $DIC['rbacsystem'];
+        $this->db = $DIC['ilDB'];
+        $this->help = $DIC['ilHelp'];
         $this->data_factory = new DataFactory();
 
         $local_dic = TestDIC::dic();
@@ -82,15 +88,25 @@ public function executeCommand(): void
                 $perm_gui = new \ilPermissionGUI($this);
                 $this->ctrl->forwardCommand($perm_gui);
                 break;
-            case 'ilglobalunitconfigurationgui':
+            case strtolower(GlobalConfigurationGUI::class):
                 if (!$this->rbac_system->checkAccess('read', $this->getTestFolder()->getRefId())) {
                     $this->ilias->raiseError($this->lng->txt('permission_denied'), $this->ilias->error_obj->WARNING);
                 }
 
                 $this->tabs_gui->setTabActive('units');
 
-                $gui = new \ilGlobalUnitConfigurationGUI(
-                    new \ilUnitConfigurationRepository(0)
+                $gui = new GlobalConfigurationGUI(
+                    new UnitsRepository(
+                        $this->lng,
+                        $this->db
+                    ),
+                    $this->lng,
+                    $this->ctrl,
+                    $this->rbac_system,
+                    $this->tpl,
+                    $this->toolbar,
+                    $this->tabs_gui,
+                    $this->help
                 );
                 $this->ctrl->forwardCommand($gui);
                 break;
@@ -292,7 +308,7 @@ protected function getTabs(): void
 
             $this->tabs_gui->addTarget(
                 'units',
-                $this->ctrl->getLinkTargetByClass('ilGlobalUnitConfigurationGUI', ''),
+                $this->ctrl->getLinkTargetByClass(GlobalConfigurationGUI::class, ''),
                 '',
                 'ilglobalunitconfigurationgui'
             );

From 873ef42de1c517a8413aebd9c2174f801f4b9ec6 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Tue, 20 Jan 2026 17:55:55 +0100
Subject: [PATCH 099/141] Questions: Implement Basic Migration

---
 .../class.ilObjQuestionsGUI.php               |   2 +-
 .../Legacy/PageEditor/QstsQuestionPage.php    |  20 +
 .../PageEditor/class.ilPCAnswerForm.php       |   2 +-
 components/ILIAS/Questions/Questions.php      |  29 +-
 .../Questions/src/AnswerForm/Factory.php      |   6 +-
 .../AnswerForm/{ => Migration}/Migration.php  |  14 +-
 .../AnswerForm/Migration/MigrationInsert.php  | 177 +++++++++
 .../Questions/src/AnswerForm/Persistence.php  |   2 +-
 .../Questions/src/AnswerForm/Properties.php   |   2 +-
 .../src/AnswerForm/TypeGenericProperties.php  |  25 +-
 .../Cloze/Layout/CombinationsOverview.php     |  82 ++++
 .../AnswerFormTypes/Cloze/Layout/Factory.php  | 106 ++++++
 .../Migration/BasicMigrationFunctions.php     | 153 ++++++++
 .../Cloze/Migration/MigrationCloze.php        | 163 ++++++++
 .../Cloze/Migration/MigrationLongMenu.php     | 178 +++++++++
 .../Cloze/Migration/MigrationNumeric.php      | 122 ++++++
 .../AnswerFormTypes/Cloze/MigrationCloze.php  |  40 --
 .../Cloze/MigrationLongMenu.php               |  40 --
 .../Cloze/MigrationNumeric.php                |  40 --
 .../src/AnswerFormTypes/Cloze/Persistence.php |   2 +-
 .../Combinations/EditCombinations.php         | 352 ++++++++++++++++++
 .../Cloze/Properties/Combinations/Factory.php | 108 ++++++
 .../Cloze/Properties/Factory.php              |  30 +-
 .../Gaps/AnswerOptions/AnswerOption.php       |   6 +-
 .../Cloze/Properties/Gaps/Factory.php         |   2 +-
 .../Cloze/Properties/Gaps/Gap.php             |   9 +-
 .../Cloze/Properties/Gaps/Gaps.php            |   1 -
 .../Cloze/Properties/Gaps/Text.php            |   2 +-
 .../Cloze/Properties/Properties.php           |   9 +-
 .../Definitions/TextMatchingOptions.php       |   8 +-
 .../Questions/src/Persistence/CoreTables.php  |  50 ++-
 .../Questions/src/Persistence/Manipulate.php  |   2 +-
 .../ILIAS/Questions/src/Persistence/Query.php |   2 +-
 .../Questions/src/Persistence/Repository.php  |  39 +-
 .../src/Presentation/Layout/Renderable.php    | 158 ++++++++
 .../src/Question/QuestionImplementation.php   |  41 +-
 .../src/Setup/ClozeQuestionTables.php         |   4 +-
 .../src/Setup/OverarchingQuestionTables.php   |  21 +-
 .../src/Setup/QuestionsMigration.php          | 229 ++++++++----
 .../classes/class.ilAssQuestionPage.php       |  28 +-
 40 files changed, 2019 insertions(+), 287 deletions(-)
 rename components/ILIAS/Questions/src/AnswerForm/{ => Migration}/Migration.php (70%)
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/Factory.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
 delete mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationCloze.php
 delete mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationLongMenu.php
 delete mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationNumeric.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/EditCombinations.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
 rename components/ILIAS/Questions/src/{Question => }/Definitions/TextMatchingOptions.php (88%)
 create mode 100644 components/ILIAS/Questions/src/Presentation/Layout/Renderable.php

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
index a5926b567cc0..42d810d1497c 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -122,7 +122,7 @@ public function viewQuestionsObject(): void
         $this->tabs_gui->activateTab('questions');
 
         $this->tpl->setContent(
-            $this->edit_view->view(
+            $this->edit_view->show(
                 $this->toolbar,
                 $this->buildEditQuestionsBaseUri(),
                 $this->object->getId(),
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
index 9e23acb982f2..09d5a51e28e5 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
@@ -40,4 +40,24 @@ public function setQuestion(
     ): void {
         $this->question = $question;
     }
+
+    public function migrateQuestionElementToAnswerForm(): void
+    {
+        global $DIC;
+        $dom_util = $DIC->copage()->internal()->domain()->domUtil();
+
+        $answer_forms = $this->question->getAnswerForms();
+
+        $answer_form_node = new ilPCAnswerForm($this);
+        $answer_form_node->createPageContentNode();
+        $answer_form_node->writePCId($this->generatePCId());
+        $answer_form_node->create(
+            array_shift($answer_forms)->getAnswerFormId()
+        );
+
+        $dom_util->path($this->getDomDoc(), '//Question')
+            ->item(0)->parentNode->replaceWith($answer_form_node->getDomNode());
+
+        $this->update();
+    }
 }
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
index 0a747ad04580..9d19474ebeea 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerForm.php
@@ -78,7 +78,7 @@ public static function afterPageUpdate(
         string $xml,
         bool $creation
     ): void {
-        if ($page::class !== QstsQuestionPage::class) {
+        if ($page::class !== QstsQuestionPage::class || $creation) {
             return;
         }
 
diff --git a/components/ILIAS/Questions/Questions.php b/components/ILIAS/Questions/Questions.php
index 050ce8cff30e..66a3852d69c8 100644
--- a/components/ILIAS/Questions/Questions.php
+++ b/components/ILIAS/Questions/Questions.php
@@ -21,10 +21,12 @@
 namespace ILIAS;
 
 use ILIAS\Questions\AnswerForm\Definition as AnswerFormDefinition;
-use ILIAS\Questions\AnswerForm\Migration as AnswerFormMigration;
-use ILIAS\Questions\AnswerFormTypes\Cloze\MigrationCloze;
-use ILIAS\Questions\AnswerFormTypes\Cloze\MigrationLongMenu;
-use ILIAS\Questions\AnswerFormTypes\Cloze\MigrationNumeric;
+use ILIAS\Questions\AnswerForm\Migration\Migration as AnswerFormMigration;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Migration\MigrationCloze;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Migration\MigrationLongMenu;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Migration\MigrationNumeric;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\Persistence\TableNameSpaceCore;
 use ILIAS\Questions\Setup\Agent;
 use ILIAS\Setup\Agent as AgentInterface;
 
@@ -45,10 +47,23 @@ public function init(
             new Agent(
                 $seek[AnswerFormMigration::class]
             );
-        $contribute[AnswerFormMigration::class] = static fn() => new MigrationCloze();
-        $contribute[AnswerFormMigration::class] = static fn() => new MigrationLongMenu();
-        $contribute[AnswerFormMigration::class] = static fn() => new MigrationNumeric();
+        $contribute[AnswerFormMigration::class] = static fn() => new MigrationCloze(
+            $internal[Persistence::class],
+            $internal[\EvalMath::class]
+        );
+        $contribute[AnswerFormMigration::class] = static fn() => new MigrationLongMenu(
+            $internal[Persistence::class]
+        );
+        $contribute[AnswerFormMigration::class] = static fn() => new MigrationNumeric(
+            $internal[Persistence::class],
+            $internal[\EvalMath::class]
+        );
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\ComponentJS($this, 'js/dist/ParticipantViewLongMenu.js');
+
+        $internal[Persistence::class] = static fn() => new Persistence(
+            new TableNameSpaceCore('cloze')
+        );
+        $internal[\EvalMath::class] = static fn() => new \EvalMath();
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerForm/Factory.php
index f47770b066ff..5836840dbca5 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Factory.php
@@ -96,11 +96,13 @@ public function buildTypeDefinitionFromSelectValue(
     }
 
     public function getDefaultTypeGenericProperties(
-        Uuid $question_id
+        Uuid $question_id,
+        Definition $type
     ): TypeGenericProperties {
         return new TypeGenericProperties(
             $this->uuid_factory->uuid4(),
-            $question_id
+            $question_id,
+            $type
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerForm/Migration.php b/components/ILIAS/Questions/src/AnswerForm/Migration/Migration.php
similarity index 70%
rename from components/ILIAS/Questions/src/AnswerForm/Migration.php
rename to components/ILIAS/Questions/src/AnswerForm/Migration/Migration.php
index ae72b1be9ef7..590824fb049c 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Migration.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Migration/Migration.php
@@ -18,9 +18,9 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerForm;
+namespace ILIAS\Questions\AnswerForm\Migration;
 
-use ILIAS\Questions\Persistence\Manipulate;
+use ILIAS\Questions\Persistence\TableNameSpace;
 
 interface Migration
 {
@@ -30,7 +30,11 @@ interface Migration
      */
     public function getOldQuestionIdentifier(): string;
 
-    public function toStorage(
-        Manipulate $manipulate
-    ): Manipulate;
+    public function getDefinitionClass(): string;
+
+    public function getTableNameSpace(): TableNameSpace;
+
+    public function buildInsertStatement(
+        MigrationInsert $migration_insert
+    ): MigrationInsert;
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php b/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
new file mode 100644
index 000000000000..9c02ad13fc98
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
@@ -0,0 +1,177 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm\Migration;
+
+use ILIAS\Questions\Persistence\CoreTables;
+use ILIAS\Questions\Persistence\Insert;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\Value;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Setup\CLI\IOWrapper;
+
+class MigrationInsert
+{
+    private ?float $available_points = null;
+    private ?int $image_size = null;
+    private ?bool $shuffle_answer_options = null;
+    private string $additional_text = '';
+    private ?string $additional_text_legacy = null;
+
+    public function __construct(
+        private readonly \ilDBInterface $db,
+        private readonly IOWrapper $io,
+        private readonly UuidFactory $uuid_factory,
+        private readonly TableNameBuilder $table_name_builder,
+        private array $inserts,
+        private readonly int $old_question_id,
+        private readonly Uuid $new_question_id,
+        private readonly Uuid $answer_form_id,
+        private readonly string $definition_class
+    ) {
+    }
+
+    public function getDb(): \ilDBInterface
+    {
+        return $this->db;
+    }
+
+    public function getIO(): IOWrapper
+    {
+        return $this->io;
+    }
+
+    public function getUuid(): Uuid
+    {
+        return $this->uuid_factory->uuid4();
+    }
+
+    public function getTableNameBuilder(): TableNameBuilder
+    {
+        return $this->table_name_builder;
+    }
+
+    public function getOldQuestionId(): int
+    {
+        return $this->old_question_id;
+    }
+
+    public function getAnswerFormId(): Uuid
+    {
+        return $this->answer_form_id;
+    }
+
+    public function withAvailablePoints(
+        float $available_points
+    ): self {
+        $clone = clone $this;
+        $clone->available_points = $available_points;
+        return $clone;
+    }
+
+    public function withImageSize(
+        int $image_size
+    ): self {
+        $clone = clone $this;
+        $clone->image_size = $image_size;
+        return $clone;
+    }
+
+    public function withShuffleAnswerOptions(
+        bool $shuffle_answer_options
+    ): self {
+        $clone = clone $this;
+        $clone->shuffle_answer_options = $shuffle_answer_options;
+        return $clone;
+    }
+
+    public function withAdditionalText(
+        string $additional_text
+    ): self {
+        $clone = clone $this;
+        $clone->additional_text = $additional_text;
+        return $clone;
+    }
+
+    public function withAdditionalTextLegacy(
+        string $additional_text_legacy
+    ): self {
+        $clone = clone $this;
+        $clone->additional_text_legacy = $additional_text_legacy;
+        return $clone;
+    }
+
+    public function withAdditionalInsert(
+        Insert $insert
+    ): self {
+        $clone = clone $this;
+        $clone->inserts[] = $insert;
+        return $clone;
+    }
+
+    public function run(): void
+    {
+        $this->inserts[] = $this->buildCoreAnswerFormInsertStatement();
+        $atom_query = $this->db->buildAtomQuery();
+
+        $manipulates = [];
+        $locked_tables = [];
+        foreach ($this->inserts as $statement) {
+            $table_to_lock = $statement->getTableToLock();
+            if (!in_array($table_to_lock, $locked_tables)) {
+                $atom_query->addTableLock($table_to_lock);
+                $locked_tables[] = $table_to_lock;
+            }
+            $manipulates[] = $statement->toManipulateString($this->db);
+        }
+        $atom_query->addQueryCallable(
+            function (\ilDBInterface $db) use ($manipulates): void {
+                foreach ($manipulates as $manipulate) {
+                    $db->manipulate($manipulate);
+                }
+            }
+        );
+        $atom_query->run();
+    }
+
+    private function buildCoreAnswerFormInsertStatement(): Insert
+    {
+        return new Insert(
+            CoreTables::AnswerForms->getColumns(),
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
+                new Value(\ilDBConstants::T_TEXT, $this->definition_class),
+                new Value(\ilDBConstants::T_TEXT, $this->new_question_id->toString()),
+                new Value(\ilDBConstants::T_FLOAT, $this->available_points),
+                new Value(\ilDBConstants::T_INTEGER, $this->image_size),
+                new Value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->shuffle_answer_options === null
+                        ? null
+                        : ($this->shuffle_answer_options ? 1 : 0)
+                ),
+                new Value(\ilDBConstants::T_TEXT, $this->additional_text),
+                new Value(\ilDBConstants::T_TEXT, $this->additional_text_legacy)
+
+            ]
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Persistence.php b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
index c12d6eccaded..da1a89a9da46 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
@@ -28,7 +28,7 @@
 
 interface Persistence
 {
-    public function getPublicNameSpace(): TableNameSpace;
+    public function getTableNameSpace(): TableNameSpace;
 
     public function getColumns(
         TableNameBuilder $table_name_builder,
diff --git a/components/ILIAS/Questions/src/AnswerForm/Properties.php b/components/ILIAS/Questions/src/AnswerForm/Properties.php
index 7f00a69637a8..16c5b5c5a19d 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Properties.php
@@ -35,7 +35,7 @@ public function getAnswerFormId(): Uuid;
 
     public function getQuestionId(): Uuid;
 
-    public function getDefinition(): Definition;
+    public function getDefinition(): ?Definition;
 
     public function getTypeGenericProperties(): TypeGenericProperties;
 
diff --git a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
index 2300fa1a5634..9f924b9b78d3 100644
--- a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
@@ -37,11 +37,11 @@ public function __construct(
         private readonly Uuid $answer_form_id,
         private readonly Uuid $question_id,
         private readonly ?Definition $definition = null,
-        private ?float $available_points = null,
-        private ?int $image_size = null,
-        private ?bool $shuffle_answer_options = null,
-        private string $additional_text = '',
-        private string $additional_text_legacy = ''
+        private readonly ?float $available_points = null,
+        private readonly ?int $image_size = null,
+        private readonly ?bool $shuffle_answer_options = null,
+        private readonly string $additional_text = '',
+        private readonly string $additional_text_legacy = ''
     ) {
     }
 
@@ -55,7 +55,7 @@ public function getQuestionId(): Uuid
         return $this->question_id;
     }
 
-    public function getDefinition(): Definition
+    public function getDefinition(): ?Definition
     {
         return $this->definition;
     }
@@ -131,7 +131,7 @@ private function buildInsertStatement(): Insert
                 new Value(\ilDBConstants::T_TEXT, $this->question_id->toString()),
                 new Value(\ilDBConstants::T_FLOAT, $this->available_points),
                 new Value(\ilDBConstants::T_INTEGER, $this->image_size),
-                new Value(\ilDBConstants::T_INTEGER, $this->shuffle_answer_options ? 1 : 0),
+                new Value(\ilDBConstants::T_INTEGER, $this->getShuffleAnswerOptionsForStorage()),
                 new Value(\ilDBConstants::T_TEXT, $this->additional_text),
                 new Value(\ilDBConstants::T_TEXT, $this->additional_text_legacy)
 
@@ -152,7 +152,7 @@ private function buildUpdateStatement(): Update
             [
                 new Value(\ilDBConstants::T_FLOAT, $this->available_points),
                 new Value(\ilDBConstants::T_INTEGER, $this->image_size),
-                new Value(\ilDBConstants::T_INTEGER, $this->shuffle_answer_options ? 1 : 0),
+                new Value(\ilDBConstants::T_INTEGER, $this->getShuffleAnswerOptionsForStorage()),
                 new Value(\ilDBConstants::T_TEXT, $this->additional_text)
 
             ],
@@ -167,4 +167,13 @@ private function buildUpdateStatement(): Update
             ]
         );
     }
+
+    private function getShuffleAnswerOptionsForStorage(): ?int
+    {
+        if ($this->shuffle_answer_options === null) {
+            return null;
+        }
+
+        return $this->shuffle_answer_options ? 1 : 0;
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
new file mode 100644
index 000000000000..440884a95599
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation\Layout;
+
+use ILIAS\Questions\Presentation\Definitions\Editability;
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Data\URI;
+use ILIAS\Language\Language;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\UI\Renderer as UIRenderer;
+use Psr\Http\Message\ServerRequestInterface;
+
+class EditOverview
+{
+    public function __construct(
+        private readonly UIFactory $ui_factory,
+        private readonly Language $lng,
+        private readonly ServerRequestInterface $request,
+        private readonly Environment $environment,
+        private readonly URI $uri_to_edit_basic_answer_form_properties
+    ) {
+    }
+
+    public function render(
+        UIRenderer $ui_renderer
+    ): string {
+        return $ui_renderer->render($this->buildContent());
+    }
+
+    private function buildContent(): array
+    {
+        return [
+            $this->buildBasicAnswerFormPanel(),
+            $this->environment->getAnswerFormProperties()->getOverviewTable(
+                $this->ui_factory->table(),
+                $this->lng,
+                $this->request,
+                $this->environment
+            )
+        ];
+    }
+
+    private function buildBasicAnswerFormPanel(): StandardPanel
+    {
+        $content = [
+            $this->ui_factory->listing()->descriptive(
+                $this->environment->getAnswerFormProperties()->getBasicPropertiesForListing($this->lng)
+            )
+        ];
+
+        if ($this->environment->getEditability() === Editability::Full) {
+            $content[] = $this->ui_factory->button()->standard(
+                $this->lng->txt('edit_basic_answer_form_properties'),
+                $this->uri_to_edit_basic_answer_form_properties->__toString()
+            );
+        }
+
+        return $this->ui_factory->panel()->standard(
+            $this->lng->txt('basic_answer_form_properites'),
+            $content
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/Factory.php
new file mode 100644
index 000000000000..a2bc23fbc70d
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/Factory.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation\Layout;
+
+use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Questions\Presentation\Definitions\Leaf;
+use ILIAS\Data\URI;
+use ILIAS\HTTP\Services as HttpService;
+use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\MessageBox\MessageBox;
+use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
+use ILIAS\UI\Component\Modal\RoundTrip as RoundTripModal;
+
+class Factory
+{
+    public function __construct(
+        private readonly UIFactory $ui_factory,
+        private readonly HttpService $http,
+        private readonly Language $lng
+    ) {
+    }
+
+    public function getEditOverview(
+        Environment $environment,
+        URI $uri_to_edit_basic_answer_form_properties
+    ): EditOverview {
+        return new EditOverview(
+            $this->ui_factory,
+            $this->lng,
+            $this->http->request(),
+            $environment,
+            $uri_to_edit_basic_answer_form_properties
+        );
+    }
+
+    public function getEditForm(
+        URLBuilder $url_builder,
+        Section $main_section_inputs,
+        bool $is_final_step,
+        ?Group $carry_inputs = null
+    ): EditForm {
+        return new EditForm(
+            $this->ui_factory->input()->container()->form(),
+            $this->lng,
+            $url_builder,
+            $main_section_inputs,
+            $is_final_step,
+            $carry_inputs
+        );
+    }
+
+    public function getAsync(
+        InterruptiveModal|RoundTripModal|MessageBox $content
+    ): Async {
+        return new Async(
+            $this->http,
+            $content
+        );
+    }
+
+    public function getCarrySectionData(
+        ArrayBasedRequestWrapper $post_wrapper,
+        Refinery $refinery
+    ): CarryWrapper {
+        return new CarryWrapper(
+            array_reduce(
+                $post_wrapper->keys(),
+                function (array $c, string $v) use ($post_wrapper, $refinery): array {
+                    $value = new Leaf(
+                        $post_wrapper->retrieve($v, $refinery->identity())
+                    );
+                    foreach (array_reverse(explode('/', $v)) as $path_element) {
+                        $value = [$path_element => $value];
+                    }
+                    return array_merge_recursive($c, $value);
+                },
+                []
+            )['form'][EditForm::CARRY_SECTION_NAME] ?? []
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
new file mode 100644
index 000000000000..c5b9d830b705
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Migration;
+
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
+use ILIAS\Questions\Persistence\Insert;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Value;
+use ILIAS\Questions\Definitions\TextMatchingOptions;
+use ILIAS\Data\UUID\Uuid;
+
+trait BasicMigrationFunctions
+{
+    private function buildGapInsertStatement(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder,
+        Uuid $answer_input_id,
+        Uuid $answer_form_id,
+        int $position,
+        string $gap_type,
+        ?int $max_chars,
+        ?float $step_size,
+        ?TextMatchingOptions $matching_options,
+        ?int $min_autocomplete,
+        ?int $shuffle
+    ): Insert {
+        return new Insert(
+            $persistence->getColumns(
+                $table_name_builder,
+                TableTypes::AnswerInputs
+            ),
+            [
+                new Value(\ilDBConstants::T_TEXT, $answer_input_id->toString()),
+                new Value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
+                new Value(\ilDBConstants::T_INTEGER, $position),
+                new Value(\ilDBConstants::T_TEXT, $gap_type),
+                new Value(\ilDBConstants::T_INTEGER, $max_chars),
+                new Value(\ilDBConstants::T_FLOAT, $step_size),
+                new Value(\ilDBConstants::T_INTEGER, $matching_options?->value),
+                new Value(\ilDBConstants::T_INTEGER, $min_autocomplete),
+                new Value(\ilDBConstants::T_INTEGER, $shuffle)
+            ]
+        );
+    }
+
+    private function buildAnswerOptionInsertStatement(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder,
+        Uuid $answer_option_id,
+        Uuid $answer_input_id,
+        int $position,
+        string $text_value,
+        float $points,
+        ?float $lower_limit,
+        ?float $upper_limit
+    ): Insert {
+
+        return new Insert(
+            $persistence->getColumns(
+                $table_name_builder,
+                TableTypes::AnswerOptions
+            ),
+            [
+                new Value(\ilDBConstants::T_TEXT, $answer_option_id->toString()),
+                new Value(\ilDBConstants::T_TEXT, $answer_input_id->toString()),
+                new Value(\ilDBConstants::T_INTEGER, $position),
+                new Value(\ilDBConstants::T_TEXT, $text_value),
+                new Value(\ilDBConstants::T_FLOAT, $points),
+                new Value(\ilDBConstants::T_FLOAT, $lower_limit),
+                new Value(
+                    \ilDBConstants::T_FLOAT,
+                    $lower_limit !== $upper_limit
+                        ? $upper_limit
+                        : null
+                )
+            ]
+        );
+    }
+
+    private function buildAnswerFormInsertStatement(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder,
+        Uuid $answer_form_id,
+        ScoringIdentical $scoring_identical,
+        int $combinations_enabled
+    ): Insert {
+        return new Insert(
+            $persistence->getColumns(
+                $table_name_builder,
+                TableTypes::TypeSpecificAnswerForms
+            ),
+            [
+                new Value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
+                new Value(\ilDBConstants::T_TEXT, $scoring_identical->value),
+                new Value(\ilDBConstants::T_INTEGER, $combinations_enabled)
+            ]
+        );
+    }
+
+    private function buildScoringIdenticalFromOld(
+        int $scoring_identical
+    ): ScoringIdentical {
+        if ($scoring_identical === '1') {
+            return ScoringIdentical::ScoreAll;
+        }
+
+        return ScoringIdentical::OnlyScoreDistinct;
+    }
+
+    private function replaceGapsAndSantizeLegacyClozeText(
+        string $gap_replace_regex,
+        string $text,
+        array $gaps_mapping
+    ): string {
+        ksort($gaps_mapping);
+
+        return mb_ereg_replace_callback(
+            $gap_replace_regex,
+            function (array $matches) use (&$gaps_mapping): string {
+                return '{{' . Gap::GAP_PLACEHOLDER_NAME . '_' . array_shift($gaps_mapping) . '}}';
+            },
+            $text
+        );
+    }
+
+    private function limitToFloat(
+        \EvalMath $math,
+        string $limit
+    ): float {
+        return (float) $math->e($limit);
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
new file mode 100644
index 000000000000..6c5adb72b8f9
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Migration;
+
+use ILIAS\Questions\AnswerForm\Migration\Migration;
+use ILIAS\Questions\AnswerForm\Migration\MigrationInsert;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\Definitions\TextMatchingOptions;
+use ILIAS\Questions\Persistence\TableNameSpace;
+
+class MigrationCloze implements Migration
+{
+    use BasicMigrationFunctions;
+
+    public function __construct(
+        private readonly Persistence $persistence,
+        private readonly \EvalMath $math
+    ) {
+    }
+
+    #[\Override]
+    public function getOldQuestionIdentifier(): string
+    {
+        return 'assClozeTest';
+    }
+
+    #[\Override]
+    public function getDefinitionClass(): string
+    {
+        return Definition::class;
+    }
+
+    #[\Override]
+    public function getTableNameSpace(): TableNameSpace
+    {
+        return $this->persistence->getTableNameSpace();
+    }
+
+    #[\Override]
+    public function buildInsertStatement(
+        MigrationInsert $migration_insert
+    ): MigrationInsert {
+        $answer_input_mapping = [];
+        foreach ($this->fetchDBValues(
+            $migration_insert->getDb(),
+            $migration_insert->getOldQuestionId()
+        ) as $db_row) {
+            $answer_form_id = $migration_insert->getAnswerFormId();
+            if (!isset($answer_input_mapping[$db_row->gap_id])) {
+                $answer_input_mapping[$db_row->gap_id] = $migration_insert->getUuid();
+                $migration_insert = $migration_insert->withAdditionalInsert(
+                    $this->buildGapInsertStatement(
+                        $this->persistence,
+                        $migration_insert->getTableNameBuilder(),
+                        $answer_input_mapping[$db_row->gap_id],
+                        $answer_form_id,
+                        $db_row->gap_id,
+                        $this->buildNewGapTypeIdentifierFromOld((int) $db_row->cloze_type),
+                        null,
+                        null,
+                        $this->buildNewTextRatingFromOld($db_row->textgap_rating),
+                        null,
+                        $db_row->shuffle === '1' ? 1 : 0
+                    )
+                );
+            }
+
+            $migration_insert = $migration_insert->withAdditionalInsert(
+                $this->buildAnswerOptionInsertStatement(
+                    $this->persistence,
+                    $migration_insert->getTableNameBuilder(),
+                    $migration_insert->getUuid(),
+                    $answer_input_mapping[$db_row->gap_id],
+                    $db_row->aorder,
+                    $db_row->answertext,
+                    $db_row->points,
+                    $this->limitToFloat($this->math, $db_row->lowerlimit),
+                    $this->limitToFloat($this->math, $db_row->upperlimit)
+                )
+            );
+        }
+
+        return $migration_insert
+            ->withAdditionalInsert(
+                $this->buildAnswerFormInsertStatement(
+                    $this->persistence,
+                    $migration_insert->getTableNameBuilder(),
+                    $answer_form_id,
+                    $this->buildScoringIdenticalFromOld((int) $db_row->identical_scoring),
+                    $db_row->combinations_enabled
+                )
+            )->withAdditionalTextLegacy(
+                $this->replaceGapsAndSantizeLegacyClozeText(
+                    '\[gap\].+?\[\/gap\]',
+                    $db_row->cloze_text,
+                    $answer_input_mapping
+                )
+            );
+    }
+
+    private function fetchDBValues(
+        \ilDBInterface $db,
+        int $old_question_id
+    ): \Generator {
+        $query = $db->query(
+            'SELECT *, EXISTS (' . PHP_EOL
+                . 'SELECT gap_fi FROM qpl_a_cloze_combi_res' . PHP_EOL
+                . 'WHERE question_fi = a.question_fi' . PHP_EOL
+            . ') combinations_enabled' . PHP_EOL
+            . 'FROM qpl_qst_cloze q' . PHP_EOL
+            . 'JOIN qpl_a_cloze a ON q.question_fi = a.question_fi' . PHP_EOL
+            . "WHERE q.question_fi = {$db->quote($old_question_id)}" . PHP_EOL
+            . 'ORDER BY a.gap_id, a.aorder'
+        );
+
+        while (($row = $db->fetchObject($query)) !== null) {
+            yield $row;
+        }
+    }
+
+    private function buildNewGapTypeIdentifierFromOld(
+        int $old_gap_type
+    ): string {
+        return match($old_gap_type) {
+            \assClozeGap::TYPE_TEXT => 'text',
+            \assClozeGap::TYPE_SELECT => 'select',
+            \assClozeGap::TYPE_NUMERIC => 'numeric'
+        };
+    }
+
+    private function buildNewTextRatingFromOld(
+        string $old_text_rating
+    ): TextMatchingOptions {
+        return match($old_text_rating) {
+            \assClozeGap::TEXTGAP_RATING_CASEINSENSITIVE => TextMatchingOptions::CaseInsensitive,
+            \assClozeGap::TEXTGAP_RATING_CASESENSITIVE => TextMatchingOptions::CaseSensitive,
+            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN1 => TextMatchingOptions::Levenstein1,
+            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN2 => TextMatchingOptions::Levenstein2,
+            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN3 => TextMatchingOptions::Levenstein3,
+            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN4 => TextMatchingOptions::Levenstein4,
+            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN5 => TextMatchingOptions::Levenstein5
+        };
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
new file mode 100644
index 000000000000..59b622f36ed3
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Migration;
+
+use ILIAS\Questions\AnswerForm\Migration\Migration;
+use ILIAS\Questions\AnswerForm\Migration\MigrationInsert;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\Persistence\TableNameSpace;
+
+class MigrationLongMenu implements Migration
+{
+    use BasicMigrationFunctions;
+
+    public function __construct(
+        private readonly Persistence $persistence
+    ) {
+    }
+
+    #[\Override]
+    public function getOldQuestionIdentifier(): string
+    {
+        return 'assLongMenu';
+    }
+
+    #[\Override]
+    public function getDefinitionClass(): string
+    {
+        return Definition::class;
+    }
+
+    #[\Override]
+    public function getTableNameSpace(): TableNameSpace
+    {
+        return $this->persistence->getTableNameSpace();
+    }
+
+    #[\Override]
+    public function buildInsertStatement(
+        MigrationInsert $migration_insert
+    ): MigrationInsert {
+        $answer_input_mapping = [];
+
+        foreach ($this->fetchDBValues(
+            $migration_insert->getDb(),
+            $migration_insert->getOldQuestionId()
+        ) as $db_row) {
+            $answer_form_id = $migration_insert->getAnswerFormId();
+            if (!isset($answer_input_mapping[$db_row->gap_number])) {
+                $answer_input_mapping[$db_row->gap_number] = $migration_insert->getUuid();
+
+                $migration_insert = $migration_insert->withAdditionalInsert(
+                    $this->buildGapInsertStatement(
+                        $this->persistence,
+                        $migration_insert->getTableNameBuilder(),
+                        $answer_input_mapping[$db_row->gap_number],
+                        $answer_form_id,
+                        $db_row->gap_number,
+                        $this->buildNewGapTypeIdentifierFromOld($db_row->type),
+                        null,
+                        null,
+                        null,
+                        $db_row->min_autocomplete,
+                        $db_row->shuffle_answers === '1' ? 1 : 0
+                    )
+                );
+
+                $answers = array_map(
+                    fn(string $v) => [
+                        'answer_input_id' => $migration_insert->getUuid(),
+                        'text' => trim($v),
+                        'points' => 0.0
+                    ],
+                    $this->loadAnswersFromFile(
+                        $migration_insert->getOldQuestionId(),
+                        $db_row->gap_number
+                    )
+                );
+            }
+
+            if ($answers[$db_row->position]['text'] === trim($db_row->answer_text)) {
+                $answers[$db_row->position]['points'] = $db_row->points;
+            }
+        }
+
+        foreach ($answers as $position => $answer) {
+            $migration_insert = $migration_insert->withAdditionalInsert(
+                $this->buildAnswerOptionInsertStatement(
+                    $this->persistence,
+                    $migration_insert->getTableNameBuilder(),
+                    $answer['answer_input_id'],
+                    $answer_input_mapping[$db_row->gap_number],
+                    $position,
+                    $answer['text'],
+                    $answer['points'],
+                    null,
+                    null
+                )
+            );
+        }
+
+        return $migration_insert
+            ->withAdditionalInsert(
+                $this->buildAnswerFormInsertStatement(
+                    $this->persistence,
+                    $migration_insert->getTableNameBuilder(),
+                    $answer_form_id,
+                    $this->buildScoringIdenticalFromOld($db_row->identical_scoring),
+                    0
+                )
+            )->withAdditionalTextLegacy(
+                $this->replaceGapsAndSantizeLegacyClozeText(
+                    '\[Longmenu \d+\]',
+                    $db_row->cloze_text,
+                    $answer_input_mapping
+                )
+            );
+    }
+
+    private function fetchDBValues(
+        \ilDBInterface $db,
+        int $old_question_id
+    ): \Generator {
+        $query = $db->query(
+            'SELECT * FROM qpl_qst_lome q' . PHP_EOL
+            . 'JOIN qpl_a_lome a ON q.question_fi = a.question_fi' . PHP_EOL
+            . "WHERE q.question_fi = {$db->quote($old_question_id)}" . PHP_EOL
+            . 'ORDER BY a.gap_number, a.position'
+        );
+
+        while (($row = $db->fetchObject($query)) !== null) {
+            yield $row;
+        }
+    }
+
+    private function loadAnswersFromFile(
+        int $old_question_id,
+        int $gap_id
+    ): array {
+        $file = ilFileUtils::getDataDir() . "/assessment/longMenuQuestion/{$old_question_id}/{$gap_id}.txt";
+
+        if (!file_exists($file)) {
+            return [];
+        }
+
+        return exlode(
+            "\n",
+            file_get_contents($file)
+        );
+    }
+
+    private function buildNewGapTypeIdentifierFromOld(
+        int $old_gap_type
+    ): string {
+        return match($old_gap_type) {
+            \assLongMenu::ANSWER_TYPE_TEXT_VAL => 'long_menu',
+            \assLongMenu::ANSWER_TYPE_SELECT_VAL => 'select'
+        };
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
new file mode 100644
index 000000000000..ad9825006ed1
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Migration;
+
+use ILIAS\Questions\AnswerForm\Migration\Migration;
+use ILIAS\Questions\AnswerForm\Migration\MigrationInsert;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
+use ILIAS\Questions\Persistence\TableNameSpace;
+
+class MigrationNumeric implements Migration
+{
+    use BasicMigrationFunctions;
+
+    public function __construct(
+        private readonly Persistence $persistence,
+        private readonly \EvalMath $math
+    ) {
+        $this->math->suppress_errors = true;
+    }
+
+    #[\Override]
+    public function getOldQuestionIdentifier(): string
+    {
+        return 'assNumeric';
+    }
+
+    #[\Override]
+    public function getDefinitionClass(): string
+    {
+        return Definition::class;
+    }
+
+    #[\Override]
+    public function getTableNameSpace(): TableNameSpace
+    {
+        return $this->persistence->getTableNameSpace();
+    }
+
+    #[\Override]
+    public function buildInsertStatement(
+        MigrationInsert $migration_insert
+    ): MigrationInsert {
+        $db_row = $this->fetchDBValues(
+            $migration_insert->getDb(),
+            $migration_insert->getOldQuestionId()
+        )->current();
+
+        $answer_form_id = $migration_insert->getAnswerFormId();
+        $gap_id = $migration_insert->getUuid();
+        return $migration_insert->withAdditionalInsert(
+            $this->buildGapInsertStatement(
+                $this->persistence,
+                $migration_insert->getTableNameBuilder(),
+                $gap_id,
+                $answer_form_id,
+                0,
+                'numeric',
+                null,
+                0.0001,
+                null,
+                null,
+                null
+            )
+        )->withAdditionalInsert(
+            $this->buildAnswerOptionInsertStatement(
+                $this->persistence,
+                $migration_insert->getTableNameBuilder(),
+                $migration_insert->getUuid(),
+                $gap_id,
+                0,
+                '',
+                $db_row->points,
+                $this->limitToFloat($this->math, $db_row->lowerlimit),
+                $this->limitToFloat($this->math, $db_row->upperlimit)
+            )
+        )->withAdditionalInsert(
+            $this->buildAnswerFormInsertStatement(
+                $this->persistence,
+                $migration_insert->getTableNameBuilder(),
+                $answer_form_id,
+                ScoringIdentical::ScoreAll,
+                0
+            )
+        )->withAdditionalTextLegacy(
+            '{{' . Gap::GAP_PLACEHOLDER_NAME . '_' . array_shift($gap_id->toString()) . '}}'
+        );
+    }
+
+    private function fetchDBValues(
+        \ilDBInterface $db,
+        int $old_question_id
+    ): \Generator {
+        $query = $db->query(
+            'SELECT points, lowerlimit, upperlimit FROM qpl_num_range' . PHP_EOL
+            . "WHERE q.question_fi = {$db->quote($old_question_id)}"
+        );
+
+        while (($row = $db->fetchObject($query)) !== null) {
+            yield $row;
+        }
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationCloze.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationCloze.php
deleted file mode 100644
index 10d11263beac..000000000000
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationCloze.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\AnswerFormTypes\Cloze;
-
-use ILIAS\Questions\AnswerForm\Migration;
-use ILIAS\Questions\Persistence\Manipulate;
-
-class MigrationCloze implements Migration
-{
-    #[\Override]
-    public function getOldQuestionIdentifier(): string
-    {
-        return 'assClozeTest';
-    }
-
-    #[\Override]
-    public function toStorage(
-        Manipulate $manipulate
-    ): Manipulate {
-
-    }
-}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationLongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationLongMenu.php
deleted file mode 100644
index 04e06b6bf85f..000000000000
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationLongMenu.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\AnswerFormTypes\Cloze;
-
-use ILIAS\Questions\AnswerForm\Migration;
-use ILIAS\Questions\Persistence\Manipulate;
-
-class MigrationLongMenu implements Migration
-{
-    #[\Override]
-    public function getOldQuestionIdentifier(): string
-    {
-        return 'assLongMenu';
-    }
-
-    #[\Override]
-    public function toStorage(
-        Manipulate $manipulate
-    ): Manipulate {
-
-    }
-}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationNumeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationNumeric.php
deleted file mode 100644
index 4232aa49a60a..000000000000
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/MigrationNumeric.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\AnswerFormTypes\Cloze;
-
-use ILIAS\Questions\AnswerForm\Migration;
-use ILIAS\Questions\Persistence\Manipulate;
-
-class MigrationNumeric implements Migration
-{
-    #[\Override]
-    public function getOldQuestionIdentifier(): string
-    {
-        return 'assNumeric';
-    }
-
-    #[\Override]
-    public function toStorage(
-        Manipulate $manipulate
-    ): Manipulate {
-
-    }
-}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
index a1e08d1d4dca..6d835d8bce23 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
@@ -83,7 +83,7 @@ public function __construct(
     }
 
     #[\Override]
-    public function getPublicNameSpace(): TableNameSpace
+    public function getTableNameSpace(): TableNameSpace
     {
         return $this->table_namespace;
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/EditCombinations.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/EditCombinations.php
new file mode 100644
index 000000000000..64eb908e2555
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/EditCombinations.php
@@ -0,0 +1,352 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
+
+use ILIAS\Questions\AnswerForm\Views\Edit as EditViewInterface;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Factory as PropertiesFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Questions\Presentation\Layout\EditForm;
+use ILIAS\Questions\Presentation\Layout\EditOverview;
+use ILIAS\HTTP\Services as HTTPServices;
+use ILIAS\Language\Language;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
+use ILIAS\UI\Component\Modal\InterruptiveItem\Standard as InterruptiveItem;
+use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\Refinery\Factory as Refinery;
+
+class Edit implements EditViewInterface
+{
+    private const string STEP_EDIT_BASIC_PROPERTIES = 'ebp';
+    private const string STEP_CONFIRMED_GAP_REMOVAL = 'cgr';
+    private const string STEP_SET_GAP_TYPES = 'sgt';
+    public const string STEP_JUMP_TO_SET_GAP_TYPES = 'jsgt';
+    private const string STEP_SET_ANSWER_OPTIONS = 'sao';
+    public const string STEP_JUMP_TO_SET_ANSWER_OPTIONS = 'jsao';
+    private const string STEP_SET_POINTS = 'sp';
+    public const string STEP_JUMP_TO_SET_POINTS = 'jsp';
+    private const string STEP_SAVE = 's';
+
+    public function __construct(
+        private readonly Language $lng,
+        private readonly UIFactory $ui_factory,
+        private readonly Refinery $refinery,
+        private readonly HTTPServices $http,
+        private readonly PropertiesFactory $properties_factory,
+        private readonly ClozeTextFactory $cloze_text_factory,
+        private readonly GapFactory $gap_factory
+    ) {
+    }
+
+    #[\Override]
+    public function create(
+        Environment $environment
+    ): EditForm|Properties {
+        $step = $environment->getStep();
+
+        return match($step) {
+            '' => $this->buildBasicEditingForm($environment),
+            default => $this->callIntermediateStep($environment, $step)
+        };
+    }
+
+    #[\Override]
+    public function edit(
+        Environment $environment
+    ): EditOverview|EditForm|Properties {
+        $step = $environment->getStep();
+
+        if ($step === '') {
+            return $environment->getPresentationFactory()->getEditOverview(
+                $environment,
+                $environment->getUrlBuilderWithStepParameter(self::STEP_EDIT_BASIC_PROPERTIES)
+                    ->buildURI()
+            );
+        }
+
+        $environment->setEditAnswerFormBackTarget();
+
+        return match ($step) {
+            self::STEP_EDIT_BASIC_PROPERTIES => $this->buildBasicEditingForm($environment),
+            default => $this->callIntermediateStep($environment, $step)
+        };
+    }
+
+    #[\Override]
+    public function other(
+        Environment $environment
+    ): EditForm|Properties {
+
+    }
+
+    private function callIntermediateStep(
+        Environment $environment,
+        string $step
+    ): EditForm|Properties {
+        $initialized_environment = $environment->withPreservedTableRowIdsParameter();
+
+        if ($step !== self::STEP_JUMP_TO_SET_ANSWER_OPTIONS
+            && $step !== self::STEP_JUMP_TO_SET_ANSWER_OPTIONS
+            && $step !== self::STEP_JUMP_TO_SET_POINTS) {
+            $initialized_environment = $initialized_environment->withAnswerFormProperties(
+                $environment->getAnswerFormProperties()->withValuesFromCarry(
+                    $this->refinery,
+                    $this->cloze_text_factory,
+                    $this->gap_factory,
+                    $environment->getPresentationFactory()->getCarrySectionData(
+                        $this->http->wrapper()->post(),
+                        $this->refinery
+                    )
+                )
+            );
+        }
+
+        return match ($step) {
+            self::STEP_SET_GAP_TYPES,
+            self::STEP_CONFIRMED_GAP_REMOVAL => $this->processBasicEditingForm(
+                $initialized_environment
+            ),
+            self::STEP_JUMP_TO_SET_GAP_TYPES => $this->buildGapTypesForm(
+                $initialized_environment
+            ),
+            self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm(
+                $initialized_environment
+            ),
+            self::STEP_JUMP_TO_SET_ANSWER_OPTIONS => $this->buildAnswerOptionsForm(
+                $initialized_environment
+            ),
+            self::STEP_SET_POINTS => $this->processAnswerOptionsForm(
+                $initialized_environment
+            ),
+            self::STEP_JUMP_TO_SET_POINTS => $this->buildAssignPointsForm(
+                $initialized_environment
+            ),
+            self::STEP_SAVE => $this->processAssignPointsForm(
+                $initialized_environment
+            )
+        };
+    }
+
+    private function buildBasicEditingForm(
+        Environment $environment
+    ): EditForm {
+        return $environment->getPresentationFactory()->getEditForm(
+            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_GAP_TYPES),
+            $environment->getAnswerFormProperties()->buildBasicEditingInputs(
+                $this->lng,
+                $this->ui_factory->input()->field(),
+                $this->refinery,
+                $this->properties_factory,
+                $this->cloze_text_factory
+            ),
+            false
+        );
+    }
+
+    private function processBasicEditingForm(
+        Environment $environment
+    ): EditForm|Properties {
+        $form = $this->buildBasicEditingForm(
+            $environment
+        )->withRequest($this->http->request());
+
+        $data = $form->getData();
+        if ($data === null) {
+            return $form;
+        }
+
+        $new_gaps = $data->getGaps();
+        $old_gaps = $environment->getAnswerFormProperties()->getGaps();
+
+        if ($environment->getStep() !== self::STEP_CONFIRMED_GAP_REMOVAL) {
+            $removed_gaps = $new_gaps->getRemovedGaps($old_gaps);
+            if ($removed_gaps !== []) {
+                return $form->withConfirmation(
+                    $this->buildRemovedGapsConfirmation(
+                        $environment,
+                        $removed_gaps
+                    )
+                );
+            }
+        }
+
+        if ($new_gaps->getAddedGaps($old_gaps) === []) {
+            return $data;
+        }
+
+        return $this->buildGapTypesForm(
+            $environment->withAnswerFormProperties($data)
+        );
+    }
+
+    private function buildGapTypesForm(
+        Environment $environment
+    ): EditForm {
+        $properties = $environment->getAnswerFormProperties();
+        $ff = $this->ui_factory->input()->field();
+        return $environment->getPresentationFactory()->getEditForm(
+            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_ANSWER_OPTIONS),
+            $properties->getGaps()->buildGapsTypeInputs(
+                $this->lng,
+                $ff,
+                $this->refinery,
+                $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng),
+                $environment->getTableRowIds()
+            ),
+            false,
+            $properties->withClozeText($properties->getClozeText())
+                ->buildCarryInputs($ff)
+        )->withContentBeforeForm(
+            $this->buildClozeTextPanel($properties)
+        );
+    }
+
+    private function processGapTypesForm(
+        Environment $environment
+    ): EditForm {
+        $form = $this->buildGapTypesForm(
+            $environment
+        )->withRequest($this->http->request());
+
+        $data = $form->getData();
+        return $data === null
+            ? $form
+            : $this->buildAnswerOptionsForm(
+                $environment->withAnswerFormProperties(
+                    $environment->getAnswerFormProperties()->withGaps($data)
+                )
+            );
+    }
+
+    private function buildAnswerOptionsForm(
+        Environment $environment
+    ): EditForm {
+        $properties = $environment->getAnswerFormProperties();
+        $ff = $this->ui_factory->input()->field();
+        return $environment->getPresentationFactory()->getEditForm(
+            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_POINTS),
+            $properties->getGaps()->buildAnswerOptionsInputs(
+                $this->lng,
+                $ff,
+                $this->refinery,
+                $environment->getTableRowIds()
+            ),
+            false,
+            $properties->buildCarryInputs($ff)
+        )->withContentBeforeForm(
+            $this->buildClozeTextPanel($properties)
+        );
+    }
+
+    private function processAnswerOptionsForm(
+        Environment $environment
+    ): EditForm {
+        $form = $this->buildAnswerOptionsForm(
+            $environment
+        )->withRequest($this->http->request());
+
+        $data = $form->getData();
+        return $data === null
+            ? $form
+            : $this->buildAssignPointsForm(
+                $environment->withAnswerFormProperties(
+                    $environment->getAnswerFormProperties()->withGaps($data)
+                )
+            );
+    }
+
+    private function buildAssignPointsForm(
+        Environment $environment
+    ): EditForm {
+        $properties = $environment->getAnswerFormProperties();
+        $ff = $this->ui_factory->input()->field();
+        return $environment->getPresentationFactory()->getEditForm(
+            $environment->getUrlBuilderWithStepParameter(self::STEP_SAVE),
+            $properties->getGaps()->buildPointInputs(
+                $this->lng,
+                $ff,
+                $this->refinery,
+                $environment->getTableRowIds()
+            ),
+            true,
+            $properties->buildCarryInputs($ff)
+        )->withContentBeforeForm(
+            $this->buildClozeTextPanel($properties)
+        );
+    }
+
+    private function processAssignPointsForm(
+        Environment $environment
+    ): EditForm|Properties {
+        $form = $this->buildAssignPointsForm(
+            $environment
+        )->withRequest($this->http->request());
+
+        $properties = $environment->getAnswerFormProperties();
+        $data = $form->getData();
+        return $data === null
+            ? $form->withContentBeforeForm(
+                $this->buildClozeTextPanel($properties)
+            ) : $properties->withGaps($data);
+    }
+
+    private function buildClozeTextPanel(
+        Properties $properties
+    ): StandardPanel {
+        return $this->ui_factory->panel()->standard(
+            $this->lng->txt('cloze_text'),
+            $this->ui_factory->legacy()->content(
+                $properties->getClozeText()->getRenderedMarkdownForEditingPresentation(
+                    $properties->getGaps()
+                )
+            )
+        );
+    }
+
+    /**
+     * @param array<\ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap> $removed_gaps
+     */
+    private function buildRemovedGapsConfirmation(
+        Environment $environment,
+        array $removed_gaps
+    ): InterruptiveModal {
+        return $this->ui_factory->modal()->interruptive(
+            $this->lng->txt('confirm'),
+            $this->lng->txt('confirm_remove_gaps'),
+            $environment->getUrlBuilderWithStepParameter(
+                self::STEP_CONFIRMED_GAP_REMOVAL
+            )->buildURI()->__toString()
+        )->withAffectedItems(
+            array_map(
+                fn(Gap $v): InterruptiveItem => $this->ui_factory->modal()
+                    ->interruptiveItem()->standard(
+                        $v->getAnswerInputId()->toString(),
+                        $v->buildShortenedGapName()
+                    ),
+                $removed_gaps
+            )
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
new file mode 100644
index 000000000000..103012a35f75
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties;
+
+use ILIAS\Questions\AnswerForm\TypeGenericProperties;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
+use ILIAS\Questions\Persistence\Query;
+use ILIAS\Questions\Persistence\TableTypes;
+
+class Factory
+{
+    public function __construct(
+        private readonly ClozeTextFactory $cloze_text_factory,
+        private readonly GapsFactory $gaps_factory
+    ) {
+    }
+
+    public function fromData(
+        TypeGenericProperties $type_generic_properties,
+        ?Query $query
+    ): Properties {
+        if ($query === null) {
+            return new Properties(
+                $type_generic_properties->getAnswerFormId(),
+                $type_generic_properties->getQuestionId(),
+                $type_generic_properties->getDefinition(),
+                $this->cloze_text_factory->buildFromTextString(
+                    $type_generic_properties->getAdditionalText()
+                ),
+                $type_generic_properties->getAdditionalTextLegacy(),
+                $this->gaps_factory->getEmptyGapsObject(
+                    $type_generic_properties->getAnswerFormId()
+                )
+            );
+        }
+
+        [
+            'scoring_identical_responses' => $scoring_identical_responses,
+            'combinations_activated' => $combinations_activated
+        ] = $query->retrieveCurrentRecord(
+            TableTypes::TypeSpecificAnswerForms->getTable(
+                $query->getTableNameBuilder($type_generic_properties->getDefinition()::class)
+            ),
+            $query->getRefinery()->custom()->transformation(
+                fn(array $vs): array => [
+                    'scoring_identical_responses' => ScoringIdentical::tryFrom($vs[0]['scoring_identical_responses']),
+                    'combinations_activated' => $vs[0]['combinations_activated'] === 1
+                ]
+            )
+        );
+
+        return new Properties(
+            $type_generic_properties->getAnswerFormId(),
+            $type_generic_properties->getQuestionId(),
+            $type_generic_properties->getDefinition(),
+            $this->cloze_text_factory->buildFromTextString(
+                $type_generic_properties->getAdditionalText()
+            ),
+            $type_generic_properties->getAdditionalTextLegacy(),
+            $this->gaps_factory->fromDatabase(
+                $type_generic_properties->getAnswerFormId(),
+                $query
+            ),
+            $scoring_identical_responses,
+            $combinations_activated
+        );
+    }
+
+    public function fromForm(
+        Properties $properties,
+        ClozeText $cloze_text,
+        ScoringIdentical $scoring_of_identical_responses,
+        bool $combinations_enabled
+    ): Properties {
+        $updated_gaps = $cloze_text->updateGapsFromMarkdown(
+            $properties->getAnswerFormId(),
+            $properties->getGaps()
+        );
+
+        return $properties
+            ->withClozeText(
+                $cloze_text->withIdsOfNewGapsInClozeText($updated_gaps->getUndefinedGaps())
+            )->withGaps($updated_gaps)
+            ->withScoringOfIdenticalResponses($scoring_of_identical_responses)
+            ->withCombinationsEnabled($combinations_enabled);
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
index 103012a35f75..9df088c63851 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
@@ -57,16 +57,22 @@ public function fromData(
 
         [
             'scoring_identical_responses' => $scoring_identical_responses,
-            'combinations_activated' => $combinations_activated
+            'combinations_enabled' => $combinations_enabled
         ] = $query->retrieveCurrentRecord(
             TableTypes::TypeSpecificAnswerForms->getTable(
                 $query->getTableNameBuilder($type_generic_properties->getDefinition()::class)
             ),
             $query->getRefinery()->custom()->transformation(
-                fn(array $vs): array => [
-                    'scoring_identical_responses' => ScoringIdentical::tryFrom($vs[0]['scoring_identical_responses']),
-                    'combinations_activated' => $vs[0]['combinations_activated'] === 1
-                ]
+                function (array $vs) use ($type_generic_properties): array {
+                    $values = $this->retrieveFirstMatchingRowFromDBRecords(
+                        $type_generic_properties->getAnswerFormId()->toString(),
+                        $vs
+                    );
+                    return [
+                        'scoring_identical_responses' => ScoringIdentical::tryFrom($values['scoring_identical_responses']),
+                        'combinations_enabled' => $values['combinations_enabled'] === 1
+                    ];
+                }
             )
         );
 
@@ -83,7 +89,7 @@ public function fromData(
                 $query
             ),
             $scoring_identical_responses,
-            $combinations_activated
+            $combinations_enabled
         );
     }
 
@@ -105,4 +111,16 @@ public function fromForm(
             ->withScoringOfIdenticalResponses($scoring_of_identical_responses)
             ->withCombinationsEnabled($combinations_enabled);
     }
+
+    private function retrieveFirstMatchingRowFromDBRecords(
+        string $answer_form_id,
+        array $vs
+    ): ?array {
+        foreach ($vs as $row) {
+            if ($row['answer_form_id'] === $answer_form_id) {
+                return $row;
+            }
+        }
+        return null;
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
index 4452b2a7d823..ff0000cdc243 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
@@ -40,7 +40,7 @@ public function __construct(
         private string $text_value = '',
         private ?float $lower_limit = null,
         private ?float $upper_limit = null,
-        private ?float $available_points = null
+        private float $available_points = 0.0
     ) {
     }
 
@@ -101,13 +101,13 @@ public function withUpperLimit(
         return $clone;
     }
 
-    public function getAvailablePoints(): ?float
+    public function getAvailablePoints(): float
     {
         return $this->available_points;
     }
 
     public function withAvailablePoints(
-        ?float $available_points
+        float $available_points
     ): self {
         $clone = clone $this;
         $clone->available_points = $available_points;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index cce432c55096..2dcfeae21079 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -24,7 +24,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\Factory as AnswerOptionsFactory;
 use ILIAS\Questions\Persistence\Query;
 use ILIAS\Questions\Persistence\TableTypes;
-use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
+use ILIAS\Questions\Definitions\TextMatchingOptions;
 use ILIAS\Language\Language;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Data\UUID\Factory as UuidFactory;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index 5a2af5208b82..b8ab11b85caa 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -22,12 +22,12 @@
 
 use ILIAS\Questions\AnswerForm\Persistence;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
+use ILIAS\Questions\Definitions\TextMatchingOptions;
 use ILIAS\Questions\Persistence\Replace;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
 use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
-use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -370,7 +370,12 @@ private function buildValuesForGapReplace(): array
             new Value(\ilDBConstants::T_FLOAT, $this->step_size),
             new Value(\ilDBConstants::T_INTEGER, $this->text_matching_method?->value),
             new Value(\ilDBConstants::T_INTEGER, $this->min_autocomplete),
-            new Value(\ilDBConstants::T_INTEGER, $this->shuffle_answer_options ? 1 : 0)
+            new Value(
+                \ilDBConstants::T_INTEGER,
+                $this->shuffle_answer_options === null
+                    ? null
+                    : ($this->shuffle_answer_options ? 1 : 0)
+            )
 
         ];
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 772fa189e2b7..8aa75827cdf8 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -38,7 +38,6 @@
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
 use ILIAS\UI\Component\Table\DataRowBuilder;
-use ILIAS\UICore\GlobalTemplate;
 
 class Gaps
 {
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
index 5fcf987685ac..7ef1fc75d296 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
@@ -22,7 +22,7 @@
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
-use ILIAS\Questions\Question\Definitions\TextMatchingOptions;
+use ILIAS\Questions\Definitions\TextMatchingOptions;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Constraint;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index 7db9cb5a3cdc..caefc207870f 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -87,7 +87,7 @@ public function getQuestionId(): Uuid
     }
 
     #[\Override]
-    public function getDefinition(): Definition
+    public function getDefinition(): ?Definition
     {
         return $this->definition;
     }
@@ -127,7 +127,7 @@ public function getLegacyClozeText(): string
 
     public function getClozeTextForPresentation(): string
     {
-        return $this->cloze_text === null
+        return $this->cloze_text->getRawRepresentationForPersistence() === ''
             ? $this->legacy_cloze_text
             : $this->cloze_text->getRenderedMarkdownForParticipantPresentation();
     }
@@ -179,7 +179,10 @@ public function getBasicPropertiesForListing(
             $lng->txt('cloze_text') => $this->cloze_text
                 ->getRenderedMarkdownForEditingPresentation($this->gaps),
             $lng->txt('score_identical') => $this->scoring_identical
-                ->getTranslatedOptionName($lng)
+                ->getTranslatedOptionName($lng),
+            $lng->txt('gap_combinations') => $this->combinations_enabled
+                ? $lng->txt('enabled')
+                : $lng->txt('disabled')
         ];
     }
 
diff --git a/components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php b/components/ILIAS/Questions/src/Definitions/TextMatchingOptions.php
similarity index 88%
rename from components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php
rename to components/ILIAS/Questions/src/Definitions/TextMatchingOptions.php
index f3debbb9aca0..c4c76919e765 100644
--- a/components/ILIAS/Questions/src/Question/Definitions/TextMatchingOptions.php
+++ b/components/ILIAS/Questions/src/Definitions/TextMatchingOptions.php
@@ -18,14 +18,14 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Question\Definitions;
+namespace ILIAS\Questions\Definitions;
 
 use ILIAS\Language\Language;
 
 enum TextMatchingOptions: string
 {
-    case CaseInsensitive = 'cloze_textgap_case_insensitive';
-    case CaseSensitive = 'cloze_textgap_case_sensitive';
+    case CaseInsensitive = 'case_insensitive';
+    case CaseSensitive = 'case_sensitive';
     case Levenstein1 = '1';
     case Levenstein2 = '2';
     case Levenstein3 = '3';
@@ -36,7 +36,7 @@ public function getLabel(
         Language $lng
     ): string {
         return match ($this) {
-            self::CaseInsensitive, self::CaseSensitive => $lng->txt($this->value),
+            self::CaseInsensitive, self::CaseSensitive => $lng->txt("cloze_textgap_{$this->value}"),
             default => sprintf($lng->txt('cloze_textgap_levenshtein_of'), $this->value)
         };
     }
diff --git a/components/ILIAS/Questions/src/Persistence/CoreTables.php b/components/ILIAS/Questions/src/Persistence/CoreTables.php
index 81cb668be3c5..d06a76b8a4b5 100644
--- a/components/ILIAS/Questions/src/Persistence/CoreTables.php
+++ b/components/ILIAS/Questions/src/Persistence/CoreTables.php
@@ -22,14 +22,6 @@
 
 enum CoreTables: string
 {
-    public const string LINKING_TABLE_ID_COLUMN = 'question_id';
-    private const string LINKING_TABLE_FOREIGN_KEY_COLUMN = 'obj_id';
-    private const array LINKING_TABLE_COLUMNS = [
-        'question_id',
-        'obj_id',
-        'position'
-    ];
-
     private const string QUESTION_TABLE_ID_COLUMN = 'id';
     private const array QUESTION_TABLE_COLUMNS = [
         'id',
@@ -56,11 +48,26 @@ enum CoreTables: string
         'additional_text_legacy'
     ];
 
+    public const string LINKING_TABLE_ID_COLUMN = 'question_id';
+    private const string LINKING_TABLE_FOREIGN_KEY_COLUMN = 'obj_id';
+    private const array LINKING_TABLE_COLUMNS = [
+        'question_id',
+        'obj_id',
+        'position'
+    ];
+
+    public const string MIGRATIONS_TABLE_ID_COLUMN = 'new_question_id';
+    private const string MIGRATIONS_TABLE_FOREIGN_KEY_COLUMN = 'old_question_id';
+    private const array MIGRATIONS_TABLE_COLUMNS = [
+        'old_question_id',
+        'new_question_id'
+    ];
+
     case Questions = 'qsts_questions';
     case AnswerForms = 'qsts_answer_forms';
     case Responses = 'qsts_responses';
     case Linking = 'qsts_linking';
-    case PageEditor = 'page_object';
+    case MigrationsTable = 'qsts_migrations';
 
     public function getTable(): Table
     {
@@ -72,9 +79,10 @@ public function getColumns(
     ): array {
         $table = $this->getTable();
         $column_identifiers = match($this) {
-            self::Linking => self::LINKING_TABLE_COLUMNS,
             self::Questions => self::QUESTION_TABLE_COLUMNS,
-            self::AnswerForms => self::ANSWER_FORM_TABLE_COLUMNS
+            self::AnswerForms => self::ANSWER_FORM_TABLE_COLUMNS,
+            self::Linking => self::LINKING_TABLE_COLUMNS,
+            self::MigrationsTable => self::MIGRATIONS_TABLE_COLUMNS
         };
         return array_map(
             fn(string $v): Column => new Column($table, $v),
@@ -90,10 +98,6 @@ public function getColumns(
     public function getIdColumn(): Column
     {
         return match($this) {
-            self::Linking => new Column(
-                $this->getTable(),
-                self::LINKING_TABLE_ID_COLUMN
-            ),
             self::Questions => new Column(
                 $this->getTable(),
                 self::QUESTION_TABLE_ID_COLUMN
@@ -101,6 +105,14 @@ public function getIdColumn(): Column
             self::AnswerForms => new Column(
                 $this->getTable(),
                 self::ANSWER_FORM_TABLE_ID_COLUMN
+            ),
+            self::Linking => new Column(
+                $this->getTable(),
+                self::LINKING_TABLE_ID_COLUMN
+            ),
+            self::MigrationsTable => new Column(
+                $this->getTable(),
+                self::MIGRATIONS_TABLE_ID_COLUMN
             )
         };
     }
@@ -108,13 +120,17 @@ public function getIdColumn(): Column
     public function getForeignKeyColumn(): ?Column
     {
         return match($this) {
+            self::AnswerForms => new Column(
+                $this->getTable(),
+                self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
+            ),
             self::Linking => new Column(
                 $this->getTable(),
                 self::LINKING_TABLE_FOREIGN_KEY_COLUMN
             ),
-            self::AnswerForms => new Column(
+            self::MigrationsTable => new Column(
                 $this->getTable(),
-                self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
+                self::MIGRATIONS_TABLE_FOREIGN_KEY_COLUMN
             ),
             default => null
         };
diff --git a/components/ILIAS/Questions/src/Persistence/Manipulate.php b/components/ILIAS/Questions/src/Persistence/Manipulate.php
index 6a9388d11183..baaf5340e61b 100644
--- a/components/ILIAS/Questions/src/Persistence/Manipulate.php
+++ b/components/ILIAS/Questions/src/Persistence/Manipulate.php
@@ -54,7 +54,7 @@ public function getTableNameBuilder(
             $this->answer_form_factory
                 ->getDefinitionForClass($definition_class)
                 ->getPersistence()
-                ->getPublicNameSpace()
+                ->getTableNameSpace()
         );
     }
 
diff --git a/components/ILIAS/Questions/src/Persistence/Query.php b/components/ILIAS/Questions/src/Persistence/Query.php
index f03a1ca646bd..54dc4463ee86 100644
--- a/components/ILIAS/Questions/src/Persistence/Query.php
+++ b/components/ILIAS/Questions/src/Persistence/Query.php
@@ -96,7 +96,7 @@ public function getTableNameBuilder(
             $this->answer_form_factory
                 ->getDefinitionForClass($definition_class)
                 ->getPersistence()
-                ->getPublicNameSpace()
+                ->getTableNameSpace()
         );
     }
 
diff --git a/components/ILIAS/Questions/src/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
index 998fc739d62d..1b9f1f8a2bd0 100644
--- a/components/ILIAS/Questions/src/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -24,6 +24,7 @@
 use ILIAS\Questions\AnswerForm\Definition as AnswerFormDefinition;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Questions\Setup\QuestionsMigration;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Refinery\Factory as Refinery;
@@ -197,7 +198,7 @@ private function retrieveQuestionFromQuery(
             $this->refinery->identity()
         );
 
-        return $query->retrieveCurrentRecord(
+        $question = $query->retrieveCurrentRecord(
             CoreTables::Questions->getTable(),
             $this->refinery->custom()->transformation(
                 fn(array $vs): QuestionImplementation => new QuestionImplementation(
@@ -218,6 +219,12 @@ private function retrieveQuestionFromQuery(
                 )
             )
         );
+
+        if ($question->getPageId() !== 0) {
+            return $question;
+        }
+
+        return $this->migrateQuestionPage($question);
     }
 
     private function retrieveAnswerFormsFromQuery(
@@ -301,8 +308,8 @@ private function getNextAvailableQuestionPageId(): int
 
         $last_id = $this->db->fetchObject(
             $this->db->query(
-                'SELECT MAX(page_id) AS last FROM ' . CoreTables::PageEditor->value
-                    . ' WHERE parent_type = "qsts"'
+                'SELECT MAX(page_id) AS last FROM page_object '
+                . 'WHERE parent_type = "qsts"'
             )
         )->last;
         if ($last_id === null) {
@@ -311,4 +318,30 @@ private function getNextAvailableQuestionPageId(): int
 
         return $last_id + 1;
     }
+
+    private function migrateQuestionPage(
+        QuestionImplementation $question
+    ): QuestionImplementation {
+        $old_page_id = $this->db->fetchObject(
+            $this->db->query(
+                'SELECT old_question_id FROM ' . CoreTables::MigrationsTable->value . PHP_EOL
+                . "WHERE new_question_id = {$this->db->quote($question->getId(), \ilDBConstants::T_TEXT)}"
+            )
+        )->old_question_id;
+
+        $new_page_id = $this->getNextAvailableQuestionPageId();
+        $old_qsts_page = new \ilAssQuestionPage($old_page_id);
+        $old_qsts_page->copyToAnswerForm($new_page_id, $question);
+
+        $new_qsts_page = new \QstsQuestionPage($new_page_id);
+        $new_qsts_page->setQuestion($question);
+        $new_qsts_page->buildDom();
+        $new_qsts_page->migrateQuestionElementToAnswerForm();
+
+        $new_question = $question->withPageId($new_page_id);
+
+        $this->update([$new_question]);
+
+        return $new_question;
+    }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Renderable.php b/components/ILIAS/Questions/src/Presentation/Layout/Renderable.php
new file mode 100644
index 000000000000..cad255b94886
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Renderable.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation\Layout;
+
+use ILIAS\Language\Language;
+use ILIAS\UI\Component\Input\Container\Form\Factory as FormFactory;
+use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
+use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
+use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\UI\URLBuilder;
+use ILIAS\UI\Renderer as UIRenderer;
+use Psr\Http\Message\ServerRequestInterface;
+
+class EditForm
+{
+    private const string MAIN_SECTION_NAME = 'form';
+    public const string CARRY_SECTION_NAME = 'carry';
+
+    private StandardForm $form;
+
+    private ?StandardPanel $content_before_form = null;
+    private ?StandardPanel $content_after_form = null;
+    private ?InterruptiveModal $confirmation = null;
+
+    public function __construct(
+        private readonly FormFactory $form_factory,
+        private readonly Language $lng,
+        private readonly URLBuilder $url_builder,
+        private readonly Section $main_section_inputs,
+        private readonly bool $is_final_step,
+        private readonly ?Group $carry_inputs
+    ) {
+        $this->form = $this->buildForm();
+    }
+
+    public function withContentBeforeForm(
+        StandardPanel $content
+    ): self {
+        $clone = clone $this;
+        $clone->content_before_form = $content;
+        return $clone;
+    }
+
+    public function withContentAfterForm(
+        StandardPanel $content
+    ): self {
+        $clone = clone $this;
+        $clone->content_after_form = $content;
+        return $clone;
+    }
+
+    public function withConfirmation(
+        InterruptiveModal $confirmation_modal
+    ): self {
+        $clone = clone $this;
+        $clone->confirmation = $confirmation_modal;
+        return $clone;
+    }
+
+    public function render(
+        UIRenderer $ui_renderer
+    ): string {
+        return $ui_renderer->render($this->buildContent());
+    }
+
+    public function withRequest(
+        ServerRequestInterface $request
+    ): self {
+        $clone = clone $this;
+        $clone->form = $clone->form->withRequest($request);
+        return $clone;
+    }
+
+    public function getData(): mixed
+    {
+        $data = $this->form->getData();
+        return $data[self::MAIN_SECTION_NAME] ?? null;
+    }
+
+    private function buildContent(): array
+    {
+        $content = [];
+
+        if ($this->content_before_form !== null) {
+            $content[] = $this->content_before_form;
+        }
+
+        if ($this->confirmation !== null) {
+            $content[] = $this->confirmation->withOnLoad(
+                $this->confirmation->getShowSignal()
+            )->withAdditionalOnLoadCode(
+                function ($id) {
+                    return "var button = {$id}.querySelector('input[type=\"submit\"]'); "
+                    . "button.addEventListener('click', (e) => {e.preventDefault();"
+                    . 'const form = button.closest("dialog").nextElementSibling;'
+                    . "form.action = '{$this->confirmation->getFormAction()}';"
+                    . 'form.submit();});';
+                }
+            );
+        }
+
+        $content[] = $this->form;
+
+        if ($this->content_after_form !== null) {
+            $content[] = $this->content_after_form;
+        }
+
+        return $content;
+    }
+
+    private function buildForm(): StandardForm
+    {
+        $form = $this->form_factory->standard(
+            $this->url_builder->buildURI()->__toString(),
+            $this->buildFormInputs()
+        );
+
+        if ($this->is_final_step) {
+            return $form->withSubmitLabel($this->lng->txt('save'));
+        }
+
+        return $form->withSubmitLabel($this->lng->txt('next'));
+    }
+
+    private function buildFormInputs(): array
+    {
+        $form_inputs = [
+            self::MAIN_SECTION_NAME => $this->main_section_inputs
+        ];
+
+        if ($this->carry_inputs !== null) {
+            $form_inputs[self::CARRY_SECTION_NAME] = $this->carry_inputs
+                ->withDedicatedName(self::CARRY_SECTION_NAME);
+        }
+
+        return $form_inputs;
+    }
+}
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index 42233dbe742b..5eba94dd88b1 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -22,6 +22,7 @@
 
 use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
 use ILIAS\Questions\Persistence\CoreTables;
+use ILIAS\Questions\Persistence\Column;
 use ILIAS\Questions\Persistence\Delete;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\Update;
@@ -45,6 +46,7 @@ class QuestionImplementation implements Question
 {
     private bool $linking_information_updated = false;
     private bool $self_updated = false;
+    private bool $page_id_updated = false;
     private array $updated_answer_forms = [];
     private array $deleted_answer_forms = [];
 
@@ -117,7 +119,7 @@ public function withPageId(
     ): self {
         $clone = clone $this;
         $clone->page_id = $page_id;
-        $clone->self_updated = true;
+        $clone->page_id_updated = true;
         return $clone;
     }
 
@@ -367,6 +369,12 @@ private function addUpdateStatementsToManipulation(
             );
         }
 
+        if ($this->page_id) {
+            $manipulate = $manipulate->withAdditionalStatement(
+                $this->buildUpdatePageIdStatement()
+            );
+        }
+
         if ($this->deleted_answer_forms !== []) {
             $manipulate = $this->addDeleteAnswerFormsStatementsToManipulate(
                 $manipulate,
@@ -500,4 +508,35 @@ private function buildDeleteQuestionStatement(): Delete
             ]
         );
     }
+
+    /**
+     * skergomard, 2026-01-26: This we only need while the migrations exist, after
+     * this a question MUST never change the page assigned to it after its creation!
+     */
+    private function buildUpdatePageIdStatement(): Update
+    {
+        $questions_table_definition = CoreTables::Questions;
+        return new Update(
+            [
+                new Column(
+                    $questions_table_definition->getTable(),
+                    'page_id'
+                ),
+                new Column(
+                    $questions_table_definition->getTable(),
+                    'last_update'
+                )
+            ],
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->page_id),
+                new Value(\ilDBConstants::T_INTEGER, time())
+            ],
+            [
+                new Where(
+                    $questions_table_definition->getIdColumn(),
+                    new Value(\ilDBConstants::T_TEXT, $this->id->toString())
+                )
+            ]
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
index 91a85ec837f4..f9079f62090f 100644
--- a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
@@ -54,7 +54,7 @@ public function step_1(): void
                     'length' => 32,
                     'notnull' => true
                 ],
-                'combinations_activated' => [
+                'combinations_enabled' => [
                     'type' => \ilDBConstants::T_INTEGER,
                     'length' => 1,
                     'notnull' => true
@@ -163,7 +163,7 @@ public function step_3(): void
                 ],
                 'points' => [
                     'type' => \ilDBConstants::T_FLOAT,
-                    'notnull' => false
+                    'notnull' => true
                 ]
             ]);
         }
diff --git a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
index b128a071aa04..8f045de511d0 100644
--- a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
@@ -20,6 +20,8 @@
 
 namespace ILIAS\Questions\Setup;
 
+use ILIAS\Questions\Persistence\CoreTables;
+
 class OverarchingQuestionTables implements \ilDatabaseUpdateSteps
 {
     protected \ilDBInterface $db;
@@ -33,7 +35,7 @@ public function prepare(
 
     public function step_1(): void
     {
-        $table_name = 'qsts_questions';
+        $table_name = CoreTables::Questions->value;
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
                 'id' => [
@@ -91,7 +93,7 @@ public function step_1(): void
 
     public function step_2(): void
     {
-        $table_name = 'qsts_answer_forms';
+        $table_name = CoreTables::AnswerForms->value;
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
                 'id' => [
@@ -121,7 +123,7 @@ public function step_2(): void
                 'shuffle_answer_options' => [
                     'type' => \ilDBConstants::T_INTEGER,
                     'length' => 1,
-                    'notnull' => true
+                    'notnull' => false
                 ],
                 'additional_text' => [
                     'type' => \ilDBConstants::T_CLOB,
@@ -145,7 +147,7 @@ public function step_2(): void
 
     public function step_3(): void
     {
-        $table_name = 'qsts_responses';
+        $table_name = CoreTables::Responses->value;
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
                 'id' => [
@@ -176,7 +178,7 @@ public function step_3(): void
 
     public function step_4(): void
     {
-        $table_name = 'qsts_linking';
+        $table_name = CoreTables::Linking->value;
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
                 'question_id' => [
@@ -208,8 +210,9 @@ public function step_4(): void
 
     public function step_5(): void
     {
-        if (!$this->db->tableExists(QuestionsMigration::MIGRATIONS_TABLE)) {
-            $this->db->createTable(QuestionsMigration::MIGRATIONS_TABLE, [
+        $table_name = CoreTables::MigrationsTable->value;
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
                 'old_question_id' => [
                     'type' => \ilDBConstants::T_TEXT,
                     'length' => 64,
@@ -224,11 +227,11 @@ public function step_5(): void
         }
 
         if (!$this->db->primaryExistsByFields(
-            QuestionsMigration::MIGRATIONS_TABLE,
+            $table_name,
             ['old_question_id']
         )) {
             $this->db->addPrimaryKey(
-                QuestionsMigration::MIGRATIONS_TABLE,
+                $table_name,
                 ['old_question_id']
             );
         }
diff --git a/components/ILIAS/Questions/src/Setup/QuestionsMigration.php b/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
index 9ffadd2ff32d..a07550d2838b 100644
--- a/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
+++ b/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
@@ -20,33 +20,46 @@
 
 namespace ILIAS\Questions\Setup;
 
-use ILIAS\Questions\AnswerForm\Migration as AnswerFormMigration;
+use ILIAS\Questions\AnswerForm\Migration\Migration as AnswerFormMigration;
+use ILIAS\Questions\AnswerForm\Migration\MigrationInsert as AnswerFormMigrationInsert;
+use ILIAS\Questions\Persistence\CoreTables;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
-use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Questions\Persistence\Insert;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\Value;
 use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
 use ILIAS\Setup;
 use ILIAS\Setup\CLI\IOWrapper;
 use ILIAS\Setup\Environment;
 use ILIAS\Setup\Migration;
-use ILIAS\DI\Container;
 
 class QuestionsMigration implements Migration
 {
-    private const string QUESTIONS_TABLE = 'qpl_questions';
+    private const string OLD_QUESTIONS_TABLE = 'qpl_questions';
     private const string TEST_QUESTIONS_SEQUENCE_TABLE = 'tst_test_question';
-    public const string MIGRATIONS_TABLE = 'qsts_migrations';
 
     private \ilDBInterface $db;
     private IOWrapper $io;
     private UuidFactory $uuid_factory;
+    private readonly array $answer_form_migrations;
 
     private bool $ilias_is_initialized = false;
     private ?array $question_to_learning_module_mapping = null;
     private ?array $allready_migrated_questions = null;
+    private ?array $allready_migrated_questions_in_qpls = null;
 
     public function __construct(
-        private readonly array $answer_form_migrations
+        array $answer_form_migrations
     ) {
+        $this->answer_form_migrations = array_reduce(
+            $answer_form_migrations,
+            function (array $c, AnswerFormMigration $v): array {
+                $c[$v->getOldQuestionIdentifier()] = $v;
+                return $c;
+            },
+            []
+        );
     }
 
     #[\Override]
@@ -93,7 +106,7 @@ public function step(
         $db_values = $this->fetchValidRecord();
 
         if ($db_values->obj_fi === 0) {
-            $question->obj_fi = $this->getObjIdFromMapping($db_values->question_id);
+            $db_values->obj_fi = $this->getObjIdFromLearningModulMapping($db_values->question_id);
         }
 
         if ($db_values->obj_fi === null) {
@@ -104,19 +117,40 @@ public function step(
             return;
         }
 
-        $question = new QuestionImplementation(
-            $this->uuid_factory->uuid4(),
-            $db_values->obj_fi,
-            $db_values->sequence,
-            $this->buildQuestionPage($db_values),
-            $db_values->title,
-            $db_values->author,
-            Lifecycle::tryFrom($db_values->lifecycle),
-            $db_values->description,
-            $db_values->original_id,
-            $db_values->created,
-            time()
-        );
+        /** @var \ILIAS\Questions\AnswerForm\Migration\Migration $answer_form_migration */
+        $answer_form_migration = $this->answer_form_migrations[$db_values->type_tag];
+
+        $new_question_id = $this->uuid_factory->uuid4();
+
+        $answer_form_migration->buildInsertStatement(
+            $this->buildMigrationInsert(
+                $answer_form_migration,
+                [
+                    $this->buildInsertLinkingStatement(
+                        $new_question_id,
+                        $db_values->obj_fi,
+                        $db_values->sequence
+                    ),
+                    $this->buildInsertQuestionStatement(
+                        $new_question_id,
+                        $db_values->title,
+                        $db_values->author,
+                        Lifecycle::tryFrom($db_values->lifecycle),
+                        $db_values->description,
+                        $db_values->original_id,
+                        $db_values->created
+                    ),
+                    $this->buildInsertMigrationStatement(
+                        $db_values->question_id,
+                        $new_question_id
+                    )
+                ],
+                $new_question_id,
+                $db_values
+            )
+        )->run();
+
+        $this->io->inform($new_question_id->toString());
     }
 
     #[\Override]
@@ -124,9 +158,9 @@ public function getRemainingAmountOfSteps(): int
     {
         return $this->db->fetchObject(
             $this->db->query(
-                'SELECT COUNT(question_id) cnt FROM ' . self::QUESTIONS_TABLE . ' q' . PHP_EOL
+                'SELECT COUNT(question_id) cnt FROM ' . self::OLD_QUESTIONS_TABLE . ' q' . PHP_EOL
                 . 'JOIN qpl_qst_type t ON q.question_type_fi = t.question_type_id' . PHP_EOL
-                . 'LEFT JOIN ' . self::MIGRATIONS_TABLE . ' m ON q.question_id = m.old_question_id' . PHP_EOL
+                . 'LEFT JOIN ' . CoreTables::MigrationsTable->value . ' m ON q.question_id = m.old_question_id' . PHP_EOL
                 . 'WHERE t.type_tag IN ('
                 . implode(
                     ', ',
@@ -141,12 +175,12 @@ public function getRemainingAmountOfSteps(): int
         )->cnt;
     }
 
-    private function fetchValidRecord(): array
+    private function fetchValidRecord(): \stdClass
     {
-        $query_string = 'SELECT q.*, t.sequence FROM ' . self::QUESTIONS_TABLE . ' q' . PHP_EOL
+        $query_string = 'SELECT q.*, t.type_tag, s.sequence FROM ' . self::OLD_QUESTIONS_TABLE . ' q' . PHP_EOL
             . 'JOIN qpl_qst_type t ON q.question_type_fi = t.question_type_id' . PHP_EOL
-            . 'LEFT JOIN ' . self::MIGRATIONS_TABLE . ' m ON q.question_id = m.old_question_id' . PHP_EOL
-            . 'LEFT JOIN ' . self::TEST_QUESTIONS_SEQUENCE_TABLE . ' t ON q.question_id = t.question_fi'
+            . 'LEFT JOIN ' . CoreTables::MigrationsTable->value . ' m ON q.question_id = m.old_question_id' . PHP_EOL
+            . 'LEFT JOIN ' . self::TEST_QUESTIONS_SEQUENCE_TABLE . ' s ON q.question_id = s.question_fi' . PHP_EOL
             . 'WHERE t.type_tag IN ('
             . implode(
                 ', ',
@@ -156,7 +190,7 @@ private function fetchValidRecord(): array
                 )
             ) . ')' . PHP_EOL
             . 'AND q.complete = 1' . PHP_EOL
-            . 'AND m.old_question_id IS NULL'
+            . 'AND m.old_question_id IS NULL' . PHP_EOL
             . 'LIMIT 1';
 
         do {
@@ -165,19 +199,19 @@ private function fetchValidRecord(): array
             );
         } while (!$this->areDbValuesValid($db_values));
 
-        $db_values->original_id = $this->getNewQuestionIdForOld($db_values->original_id);
+        $db_values->original_id = $this->cleanupAndMigrateOriginalId($db_values->original_id);
         return $db_values;
     }
 
     private function areDbValuesValid(
-        array $db_values
+        \stdClass $db_values
     ): bool {
         if ($db_values->original_id === null) {
             return true;
         }
 
         if ($this->allready_migrated_questions === null) {
-            $this->allready_migrated_questions = $this->loadAlreadyMigratedQuestions();
+            $this->loadAlreadyMigratedQuestions();
         }
 
         if (isset($this->allready_migrated_questions[$db_values->original_id])) {
@@ -187,51 +221,49 @@ private function areDbValuesValid(
         return false;
     }
 
-    private function getNewQuestionIdForOld(
-        ?int $question_id
-    ): ?uuid {
-        if ($question_id === null) {
-            return null;
-        }
-
-        if ($this->allready_migrated_questions === null) {
-            $this->allready_migrated_questions = $this->loadAlreadyMigratedQuestions();
-        }
-
-        if (!isset($this->allready_migrated_questions[$question_id])) {
+    private function cleanupAndMigrateOriginalId(
+        ?int $original_id
+    ): ?Uuid {
+        if ($original_id === null
+            || in_array($this->allready_migrated_questions_in_qpls, $original_id)) {
             return null;
         }
-
         return $this->uuid_factory->fromString(
-            $this->allready_migrated_questions[$question_id]
+            $this->allready_migrated_questions[$original_id]
         );
     }
 
-    private function loadAlreadyMigratedQuestions(): array
+    private function loadAlreadyMigratedQuestions(): void
     {
 
         $query = $this->db->query(
-            'SELECT * FROM ' . self::MIGRATIONS_TABLE
+            'SELECT m.*, o.type FROM ' . CoreTables::MigrationsTable->value . ' m' . PHP_EOL
+            . 'JOIN ' . CoreTables::Linking->value . 'l' . PHP_EOL
+            . 'ON m.new_question_id = l.question_id' . PHP_EOL
+            . 'JOIN object_data o ON l.obj_id = o.obj_id' . PHP_EOL
         );
 
-        $questions = [];
+        $this->allready_migrated_questions = [];
+        $this->allready_migrated_questions_in_qpls = [];
         while (($row = $this->db->fetchObject($query)) !== null) {
-            $questions[$row->old_question_id] = $row->new_question_id;
+            $this->allready_migrated_questions[$row->old_question_id] = $row->new_question_id;
+            if ($row->type === 'qpl') {
+                $this->allready_migrated_questions_in_qpls[] = $row->new_question_id;
+            }
         }
-        return $questions;
     }
 
-    private function getObjIdFromMapping(
+    private function getObjIdFromLearningModulMapping(
         int $question_id
     ): ?int {
         if ($this->question_to_learning_module_mapping === null) {
-            $this->question_to_learning_module_mapping = $this->loadQuestionsToLearningModuleMapping();
+            $this->loadQuestionsToLearningModuleMapping();
         }
 
         $this->question_to_learning_module_mapping[$question_id] ?? null;
     }
 
-    private function loadQuestionsToLearningModuleMapping(): array
+    private function loadQuestionsToLearningModuleMapping(): void
     {
 
         $query = $this->db->query(
@@ -242,38 +274,83 @@ private function loadQuestionsToLearningModuleMapping(): array
             . 'WHERE page_parent_type = "lm"'
         );
 
-        $mapping = [];
+        $this->question_to_learning_module_mapping = [];
         while (($row = $this->db->fetchObject($query)) !== null) {
-            $mapping[$row->question_id] = $row->obj_id;
+            $this->question_to_learning_module_mapping[$row->question_id] = $row->obj_id;
         }
-        return $mapping;
     }
 
-    private function buildQuestionPage(
-
-    ): int {
-        $new_id = $this->getNextAvailableQuestionPageId();
-        $page = new \ilAssQuestionPage();
-        $page->copy(
-            $new_id,
-            'qsts',
+    private function buildInsertLinkingStatement(
+        Uuid $new_question_id,
+        int $obj_id,
+        ?int $position
+    ): Insert {
+        return new Insert(
+            CoreTables::Linking->getColumns(),
+            [
+                new Value(\ilDBConstants::T_TEXT, $new_question_id->toString()),
+                new Value(\ilDBConstants::T_INTEGER, $obj_id),
+                new Value(\ilDBConstants::T_INTEGER, $position)
+            ]
         );
-        return $new_id;
     }
 
-    private function getNextAvailableQuestionPageId(): int
-    {
+    private function buildInsertQuestionStatement(
+        Uuid $id,
+        string $title,
+        string $author,
+        Lifecycle $lifecycle,
+        string $remarks,
+        ?Uuid $original_id,
+        int $create_date
+    ): Insert {
+        return new Insert(
+            CoreTables::Questions->getColumns(),
+            [
+                new Value(\ilDBConstants::T_TEXT, $id->toString()),
+                new Value(\ilDBConstants::T_INTEGER, 0),
+                new Value(\ilDBConstants::T_TEXT, $title),
+                new Value(\ilDBConstants::T_TEXT, $author),
+                new Value(\ilDBConstants::T_TEXT, $lifecycle->value),
+                new Value(\ilDBConstants::T_TEXT, $remarks),
+                new Value(\ilDBConstants::T_TEXT, $original_id?->toString()),
+                new Value(\ilDBConstants::T_INTEGER, time()),
+                new Value(\ilDBConstants::T_INTEGER, $create_date)
+            ]
+        );
+    }
 
-        $last_id = $this->db->fetchObject(
-            $this->db->query(
-                'SELECT MAX(page_id) AS last FROM ' . CoreTables::PageEditor->value
-                    . ' WHERE parent_type = "qsts"'
-            )
-        )->last;
-        if ($last_id === null) {
-            return 1;
-        }
+    private function buildInsertMigrationStatement(
+        int $old_question_id,
+        Uuid $new_question_id
+    ): Insert {
+        return new Insert(
+            CoreTables::MigrationsTable->getColumns(),
+            [
+                new Value(\ilDBConstants::T_INTEGER, $old_question_id),
+                new Value(\ilDBConstants::T_TEXT, $new_question_id->toString())
+            ]
+        );
+    }
 
-        return $last_id + 1;
+    private function buildMigrationInsert(
+        AnswerFormMigration $answer_form_migration,
+        array $question_inserts,
+        Uuid $new_question_id,
+        \stdClass $db_values
+    ): AnswerFormMigrationInsert {
+        return new AnswerFormMigrationInsert(
+            $this->db,
+            $this->io,
+            $this->uuid_factory,
+            new TableNameBuilder(
+                $answer_form_migration->getTableNameSpace()
+            ),
+            $question_inserts,
+            $db_values->question_id,
+            $new_question_id,
+            $this->uuid_factory->uuid4(),
+            $answer_form_migration->getDefinitionClass()
+        );
     }
 }
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php b/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
index ba7b5c1ef0c2..78787cd9dbc1 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
@@ -16,15 +16,10 @@
  *
  *********************************************************************/
 
-/**
- * Question page object
- *
- * @author Alex Killing <alex.killing@gmx.de>
- *
- * @version $Id$
- *
- * @ingroup components\ILIASTestQuestionPool
- */
+declare(strict_types=1);
+
+use ILIAS\Questions\Question\QuestionImplementation;
+
 class ilAssQuestionPage extends ilPageObject
 {
     /**
@@ -35,4 +30,19 @@ public function getParentType(): string
     {
         return "qpl";
     }
+
+    public function copyToAnswerForm(
+        int $new_id,
+        QuestionImplementation $question
+    ): void {
+        $new_page_object = new QstsQuestionPage();
+        $new_page_object->setParentId($this->getParentId());
+        $new_page_object->setId($new_id);
+        $new_page_object->setXMLContent($this->copyXMLContent(false, $this->getParentId()));
+        $new_page_object->setActive($this->getActive());
+        $new_page_object->setActivationStart($this->getActivationStart());
+        $new_page_object->setActivationEnd($this->getActivationEnd());
+        $new_page_object->setQuestion($question);
+        $new_page_object->create(false);
+    }
 }

From dcd301f4f824aebc1bc8dc33e17d660b369f53c3 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 28 Jan 2026 12:37:59 +0100
Subject: [PATCH 100/141] Questions: Implement Combinations

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  15 +-
 .../Questions/src/AnswerForm/Persistence.php  |   6 +-
 .../Questions/src/AnswerForm/Views/Edit.php   |   9 +-
 .../Cloze/Layout/CombinationsOverview.php     | 320 +++++++++++++++--
 .../AnswerFormTypes/Cloze/Layout/Factory.php  | 106 ------
 .../Cloze/Layout/OverviewTable.php            |   2 +-
 .../src/AnswerFormTypes/Cloze/Persistence.php | 109 ++++--
 .../Cloze/Properties/ClozeText/Text.php       |  17 +
 .../Properties/Combinations/Combination.php   | 312 ++++++++++++++++
 .../Properties/Combinations/Combinations.php  | 176 +++++++++
 .../Combinations/EditCombinations.php         | 340 +++---------------
 .../Cloze/Properties/Combinations/Factory.php | 297 +++++++++++----
 .../Cloze/Properties/Combinations/InRange.php |  38 ++
 .../Properties/Combinations/MatchingValue.php |  99 +++++
 .../Cloze/Properties/Factory.php              |  32 +-
 .../Gaps/AnswerOptions/AnswerOptions.php      |  13 +-
 .../Properties/Gaps/AnswerOptions/Factory.php |   6 +-
 .../Cloze/Properties/Gaps/Gaps.php            |  30 +-
 .../Cloze/Properties/Gaps/LongMenu.php        |   8 +-
 .../Cloze/Properties/Gaps/Numeric.php         |  12 +-
 .../Cloze/Properties/Gaps/Select.php          |   8 +-
 .../Cloze/Properties/Gaps/Text.php            |   6 -
 .../Cloze/Properties/Gaps/Type.php            |   8 +-
 .../Cloze/Properties/Properties.php           |  69 +++-
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  |  73 ++--
 .../Questions/src/Persistence/Repository.php  |   1 -
 .../Questions/src/Persistence/TableTypes.php  |   2 +-
 .../Presentation/Definitions/Environment.php  |   7 +-
 .../Definitions/EnvironmentImplementation.php |  60 +++-
 .../src/Presentation/Layout/EditForm.php      |   2 +-
 .../src/Presentation/Layout/EditOverview.php  |   2 +-
 .../src/Presentation/Layout/Factory.php       |  28 +-
 .../src/Presentation/Layout/InputsBuilder.php |  90 +++++
 .../Presentation/Layout/QuestionsTable.php    |   2 +-
 .../src/Presentation/Layout/Renderable.php    | 132 +------
 .../Questions/src/Presentation/Views/Edit.php |  57 +--
 .../src/Setup/ClozeQuestionTables.php         |  51 ++-
 37 files changed, 1760 insertions(+), 785 deletions(-)
 delete mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/Factory.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combinations.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/InRange.php
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php
 create mode 100644 components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 17add5b3afea..926462a6ab37 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -25,7 +25,7 @@
 use ILIAS\Questions\Persistence\TableNameSpaceCore;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\Presentation\Views\Edit;
-use ILIAS\Questions\Presentation\Layout\Factory as DefinitionsFactory;
+use ILIAS\Questions\Presentation\Layout\Factory as LayoutFactory;
 use ILIAS\Questions\Units\Repository as UnitsRepository;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Factory as UuidFactory;
@@ -73,9 +73,10 @@ protected static function buildDIC(ILIASContainer $DIC): self
                 new UuidFactory(),
                 $c[AnswerFormFactory::class]
             );
-        $dic[DefinitionsFactory::class] = static fn($c): DefinitionsFactory =>
-            new DefinitionsFactory(
+        $dic[LayoutFactory::class] = static fn($c): LayoutFactory =>
+            new LayoutFactory(
                 $DIC['ui.factory'],
+                $DIC['refinery'],
                 $DIC['http'],
                 $DIC['lng']
             );
@@ -95,7 +96,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
             $c[UuidFactory::class],
             $c[AnswerFormFactory::class],
             $c[QuestionsRepository::class],
-            $c[DefinitionsFactory::class]
+            $c[LayoutFactory::class]
         );
 
         $dic[Cloze\Properties\ClozeText\Factory::class] = static fn($c): Cloze\Properties\ClozeText\Factory
@@ -140,7 +141,8 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic[Cloze\Properties\Factory::class] = static fn($c): Cloze\Properties\Factory
             => new Cloze\Properties\Factory(
                 $c[Cloze\Properties\ClozeText\Factory::class],
-                $c[Cloze\Properties\Gaps\Factory::class]
+                $c[Cloze\Properties\Gaps\Factory::class],
+                $c[Cloze\Properties\Combinations\Factory::class]
             );
         $dic[Cloze\Persistence::class] = static fn($c): Cloze\Persistence
             => new Cloze\Persistence(
@@ -150,6 +152,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
             => new Cloze\Views\Edit(
                 $DIC['lng'],
                 $DIC['ui.factory'],
+                $DIC['ilToolbar'],
                 $DIC['refinery'],
                 $DIC['http'],
                 $c[Cloze\Properties\Factory::class],
@@ -172,6 +175,8 @@ protected static function buildDIC(ILIASContainer $DIC): self
             $c[Cloze\Views\Edit::class],
             $c[Cloze\Views\Participant::class]
         );
+        $dic[Cloze\Properties\Combinations\Factory::class] = static fn($c): Cloze\Properties\Combinations\Factory
+            => new Cloze\Properties\Combinations\Factory($c[UuidFactory::class]);
 
         return $dic;
     }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Persistence.php b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
index da1a89a9da46..6b0484912f80 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
@@ -33,20 +33,20 @@ public function getTableNameSpace(): TableNameSpace;
     public function getColumns(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
-        ?string $table_identifier = null,
+        string $table_identifier = '',
         array $columns_to_skip = []
     ): array;
 
     public function getIdColumn(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
-        ?string $table_identifier = null
+        string $table_identifier = ''
     ): Column;
 
     public function getForeignKeyColumn(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
-        ?string $table_identifier = null
+        string $table_identifier = ''
     ): Column;
 
     public function completeQuery(
diff --git a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
index 76e6705616a7..aa4106783d8c 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Views/Edit.php
@@ -22,8 +22,11 @@
 
 use ILIAS\Questions\AnswerForm\Properties;
 use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Questions\Presentation\Layout\Async;
 use ILIAS\Questions\Presentation\Layout\EditForm;
 use ILIAS\Questions\Presentation\Layout\EditOverview;
+use ILIAS\Questions\Presentation\Layout\Renderable;
+use ILIAS\UI\URLBuilder;
 
 interface Edit
 {
@@ -37,5 +40,9 @@ public function edit(
 
     public function other(
         Environment $environment
-    ): EditForm|Properties;
+    ): Async|Renderable|Properties;
+
+    public function getFinishEditingUrl(
+        Environment $environment
+    ): URLBuilder;
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
index 440884a95599..2e7733125b78 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
@@ -18,65 +18,327 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\Presentation\Layout;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Layout;
 
-use ILIAS\Questions\Presentation\Definitions\Editability;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations\Combination;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations\Factory as CombinationsFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
 use ILIAS\Questions\Presentation\Definitions\Environment;
-use ILIAS\Data\URI;
+use ILIAS\Questions\Presentation\Layout\Async;
+use ILIAS\Questions\Presentation\Layout\InputsBuilder;
+use ILIAS\Questions\Presentation\Layout\Renderable;
+use ILIAS\Data\Range;
+use ILIAS\Data\Order;
+use ILIAS\HTTP\Services as Http;
 use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\UI\Component\Modal\RoundTrip as RoundTripModal;
+use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
+use ILIAS\UI\Component\Table\Data as DataTable;
+use ILIAS\UI\Component\Table\DataRetrieval;
+use ILIAS\UI\Component\Table\DataRowBuilder;
 use ILIAS\UI\Renderer as UIRenderer;
-use Psr\Http\Message\ServerRequestInterface;
 
-class EditOverview
+class CombinationsOverview implements DataRetrieval, Renderable
 {
+    private const string STEP_SAVE = 's';
+    private const string STEP_SET_COMBINATION_VALUES = 'scv';
+    private const string STEP_JUMP_TO_SET_COMBINATION_VALUES = 'jscv';
+    private const string STEP_DELETE_COMBINATION = 'dc';
+    private const string STEP_CONFIRM_DELETE_COMBINATION = 'cdc';
+
+    private ?RoundTripModal $modal = null;
+
     public function __construct(
         private readonly UIFactory $ui_factory,
+        private readonly \ilToolbarGUI $toolbar,
+        private readonly Refinery $refinery,
         private readonly Language $lng,
-        private readonly ServerRequestInterface $request,
+        private readonly Http $http,
         private readonly Environment $environment,
-        private readonly URI $uri_to_edit_basic_answer_form_properties
+        private readonly CombinationsFactory $combinations_factory
     ) {
     }
 
+    #[\Override]
     public function render(
         UIRenderer $ui_renderer
     ): string {
-        return $ui_renderer->render($this->buildContent());
+        $content = [
+            $this->initializeModal($this->buildSetCombinationGapsModal()),
+            $this->buildTable()
+        ];
+        if ($this->modal !== null) {
+            $content[] = $this->modal;
+        }
+        return $ui_renderer->render($content);
     }
 
-    private function buildContent(): array
+    #[\Override]
+    public function getRows(
+        DataRowBuilder $row_builder,
+        array $visible_column_ids,
+        Range $range,
+        Order $order,
+        mixed $additional_viewcontrol_data,
+        mixed $filter_data,
+        mixed $additional_parameters
+    ): \Generator {
+        yield from $this->environment->getAnswerFormProperties()
+            ->getCombinations()->toTableRows($this->lng, $row_builder);
+    }
+
+    #[\Override]
+    public function getTotalRowCount(
+        mixed $additional_viewcontrol_data,
+        mixed $filter_data,
+        mixed $additional_parameters
+    ): ?int {
+        return $this->environment->getAnswerFormProperties()
+            ->getCombinations()->getNumberOfCombinations();
+    }
+
+    public function doAction(): Async|self|Properties
     {
-        return [
-            $this->buildBasicAnswerFormPanel(),
-            $this->environment->getAnswerFormProperties()->getOverviewTable(
-                $this->ui_factory->table(),
-                $this->lng,
-                $this->request,
-                $this->environment
+        return match ($this->environment->getStep()) {
+            self::STEP_SET_COMBINATION_VALUES => $this->processSetCombinationGapsModal(),
+            self::STEP_DELETE_COMBINATION => $this->deleteCombination(),
+            self::STEP_SAVE => $this->processSetCombinationValues(),
+            default => $this->buildAction()
+        };
+    }
+
+    private function buildTable(): DataTable
+    {
+        return $this->ui_factory->table()->data(
+            $this,
+            $this->lng->txt('combinations'),
+            $this->getColumns()
+        )->withActions($this->getActions())
+        ->withRequest($this->http->request());
+    }
+
+    private function initializeModal(
+        RoundTripModal $modal
+    ): RoundTripModal {
+        $this->toolbar->addComponent(
+            $this->ui_factory->button()->standard(
+                $this->lng->txt('add_combination'),
+                $modal->getShowSignal()
             )
+        );
+        return $modal;
+    }
+
+    private function getColumns(): array
+    {
+        $cf = $this->ui_factory->table()->column();
+        return [
+            'gaps' => $cf->text($this->lng->txt('gaps')),
+            'values' => $cf->text($this->lng->txt('combinations_awarding_points')),
+            'available_points' => $cf->number($this->lng->txt('available_points'))->withDecimals(2)
         ];
     }
 
-    private function buildBasicAnswerFormPanel(): StandardPanel
+    private function getActions(): array
     {
-        $content = [
-            $this->ui_factory->listing()->descriptive(
-                $this->environment->getAnswerFormProperties()->getBasicPropertiesForListing($this->lng)
-            )
+        $af = $this->ui_factory->table()->action();
+        return [
+            $af->single(
+                $this->lng->txt('edit'),
+                $this->environment->getUrlBuilderWithStepParameter(self::STEP_JUMP_TO_SET_COMBINATION_VALUES),
+                $this->environment->getTableRowIdToken()
+            )->withAsync(true),
+            $af->single(
+                $this->lng->txt('delete'),
+                $this->environment->getUrlBuilderWithStepParameter(self::STEP_CONFIRM_DELETE_COMBINATION),
+                $this->environment->getTableRowIdToken()
+            )->withAsync(true)
         ];
+    }
 
-        if ($this->environment->getEditability() === Editability::Full) {
-            $content[] = $this->ui_factory->button()->standard(
-                $this->lng->txt('edit_basic_answer_form_properties'),
-                $this->uri_to_edit_basic_answer_form_properties->__toString()
+    private function buildAction(): Async
+    {
+        $affected_item = $this->environment->getAnswerFormProperties()
+            ->getCombinations()->getCombinationById(
+                $this->environment->getTableRowIds()[0]
             );
+
+        if ($affected_item === null) {
+            return $this->buildNoItemsSelectedAsync();
+        }
+
+        return $this->environment->getPresentationFactory()->getAsync(
+            match ($this->environment->getStep()) {
+                self::STEP_JUMP_TO_SET_COMBINATION_VALUES =>
+                    $this->buildSetCombinationValuesModal($affected_item),
+                self::STEP_CONFIRM_DELETE_COMBINATION =>
+                    $this->confirmDeleteCombination($affected_item)
+            }
+        );
+    }
+
+    private function buildNoItemsSelectedAsync(): Async
+    {
+        return new Async(
+            $this->http,
+            $this->ui_factory->messageBox()->failure('no_combination_selected')
+        );
+    }
+
+    private function buildSetCombinationGapsModal(): RoundTripModal
+    {
+        $properties = $this->environment->getAnswerFormProperties();
+        $gaps = $properties->getGaps();
+        return $this->ui_factory->modal()->roundtrip(
+            $this->lng->txt('add_combination'),
+            $properties->getClozeText()->buildPanelForEditing(
+                $this->ui_factory,
+                $this->lng,
+                $gaps
+            ),
+            [
+                'combination' => $gaps->buildGapsMultiSelect(
+                    $this->lng->txt('select_gaps_for_combinations'),
+                    $this->ui_factory->input()->field()
+                )->withRequired(true)
+                ->withAdditionalTransformation(
+                    $this->refinery->custom()->constraint(
+                        fn(array $v): bool => count($v) > 1,
+                        $this->lng->txt('combination_needs_more_than_one')
+                    )
+                )->withAdditionalTransformation(
+                    $this->refinery->custom()->transformation(
+                        fn(array $v): Combination => $this->combinations_factory
+                        ->buildNewCombination($v)
+                    )
+                )
+            ],
+            $this->environment
+                ->getUrlBuilderWithStepParameter(self::STEP_SET_COMBINATION_VALUES)
+                ->buildURI()
+                ->__toString()
+        )->withSubmitLabel($this->lng->txt('next'));
+    }
+
+    private function processSetCombinationGapsModal(): self
+    {
+        $clone = clone $this;
+
+        $set_gaps_modal = $clone->buildSetCombinationGapsModal()
+            ->withRequest($clone->http->request());
+        $data = $set_gaps_modal->getData();
+
+        if ($data === null) {
+            $clone->modal = $set_gaps_modal->withOnLoad($set_gaps_modal->getShowSignal());
+            return $clone;
+        }
+
+        $set_values_modal = $clone->buildSetCombinationValuesModal($data['combination']);
+        $clone->modal = $set_values_modal->withOnLoad($set_values_modal->getShowSignal());
+        return $clone;
+    }
+
+    private function buildSetCombinationValuesModal(
+        ?Combination $combination = null
+    ): RoundTripModal {
+        $properties = $this->environment->getAnswerFormProperties();
+        $gaps = $properties->getGaps();
+
+        $inputs_builder = $this->buildInputsBuilder($combination);
+        $inputs = $inputs_builder->getInputs(
+            $this->environment
+        );
+
+        return $this->ui_factory->modal()->roundtrip(
+            $this->lng->txt('edit'),
+            $properties->getClozeText()->buildPanelForEditing(
+                $this->ui_factory,
+                $this->lng,
+                $gaps
+            ),
+            [
+                'values_awarding_points' => $inputs
+            ],
+            $inputs_builder->addCarryToEnvironment(
+                $this->environment
+            )->getUrlBuilderWithStepParameter(self::STEP_SAVE)
+            ->buildURI()
+            ->__toString()
+        );
+    }
+
+    private function processSetCombinationValues(): self|Properties
+    {
+        $set_values_modal = $this->buildSetCombinationValuesModal()
+            ->withRequest($this->http->request());
+        $data = $set_values_modal->getData();
+        if ($data === null) {
+            $this->modal = $this->initializeModal($set_values_modal)
+                ->withOnLoad($set_values_modal->getShowSignal());
+            return $this;
         }
 
-        return $this->ui_factory->panel()->standard(
-            $this->lng->txt('basic_answer_form_properites'),
-            $content
+        return $data['values_awarding_points'];
+    }
+
+    private function confirmDeleteCombination(
+        Combination $affected_item
+    ): InterruptiveModal {
+        return $this->ui_factory->modal()->interruptive(
+            $this->lng->txt('confirm'),
+            $this->lng->txt('delete_combination'),
+            $this->environment->getUrlBuilderWithStepParameter(
+                self::STEP_DELETE_COMBINATION
+            )->withParameter(
+                $this->environment->getTableRowIdToken(),
+                [$affected_item->getId()->toString()]
+            )->buildURI()->__toString()
+        );
+    }
+
+    private function deleteCombination(): Properties
+    {
+        $combination_identifier = $this->environment->getTableRowIds();
+        if ($combination_identifier === []) {
+            return $this->environment->getAnswerFormProperties();
+        }
+
+        /** @var \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties $answer_form_properties */
+        $answer_form_properties = $this->environment->getAnswerFormProperties();
+
+        return $answer_form_properties->withCombinations(
+            $answer_form_properties->getCombinations()->withoutCombination(
+                $combination_identifier[0]
+            )
         );
     }
+
+    private function buildInputsBuilder(
+        ?Combination $combination,
+    ): InputsBuilder {
+        $properties = $this->environment->getAnswerFormProperties();
+        $inputs_builder = $this->environment->getPresentationFactory()->getInputsBuilder(
+            $this->combinations_factory->getToCombinationTransformation(
+                $this->ui_factory->input()->field(),
+                $this->refinery,
+                $this->lng,
+                $properties
+            ),
+            $combination?->buildPointsInputs(
+                $this->ui_factory->input()->field(),
+                $this->refinery,
+                $this->lng,
+                $this->combinations_factory,
+                $properties
+            )
+        );
+
+        if ($combination === null) {
+            return $inputs_builder;
+        }
+
+        return $inputs_builder->withCarry($combination->buildCarryString());
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/Factory.php
deleted file mode 100644
index a2bc23fbc70d..000000000000
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/Factory.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\Presentation\Layout;
-
-use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
-use ILIAS\Questions\Presentation\Definitions\Environment;
-use ILIAS\Questions\Presentation\Definitions\Leaf;
-use ILIAS\Data\URI;
-use ILIAS\HTTP\Services as HttpService;
-use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
-use ILIAS\Language\Language;
-use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\URLBuilder;
-use ILIAS\UI\Component\Input\Field\Section;
-use ILIAS\UI\Component\Input\Field\Group;
-use ILIAS\UI\Component\MessageBox\MessageBox;
-use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
-use ILIAS\UI\Component\Modal\RoundTrip as RoundTripModal;
-
-class Factory
-{
-    public function __construct(
-        private readonly UIFactory $ui_factory,
-        private readonly HttpService $http,
-        private readonly Language $lng
-    ) {
-    }
-
-    public function getEditOverview(
-        Environment $environment,
-        URI $uri_to_edit_basic_answer_form_properties
-    ): EditOverview {
-        return new EditOverview(
-            $this->ui_factory,
-            $this->lng,
-            $this->http->request(),
-            $environment,
-            $uri_to_edit_basic_answer_form_properties
-        );
-    }
-
-    public function getEditForm(
-        URLBuilder $url_builder,
-        Section $main_section_inputs,
-        bool $is_final_step,
-        ?Group $carry_inputs = null
-    ): EditForm {
-        return new EditForm(
-            $this->ui_factory->input()->container()->form(),
-            $this->lng,
-            $url_builder,
-            $main_section_inputs,
-            $is_final_step,
-            $carry_inputs
-        );
-    }
-
-    public function getAsync(
-        InterruptiveModal|RoundTripModal|MessageBox $content
-    ): Async {
-        return new Async(
-            $this->http,
-            $content
-        );
-    }
-
-    public function getCarrySectionData(
-        ArrayBasedRequestWrapper $post_wrapper,
-        Refinery $refinery
-    ): CarryWrapper {
-        return new CarryWrapper(
-            array_reduce(
-                $post_wrapper->keys(),
-                function (array $c, string $v) use ($post_wrapper, $refinery): array {
-                    $value = new Leaf(
-                        $post_wrapper->retrieve($v, $refinery->identity())
-                    );
-                    foreach (array_reverse(explode('/', $v)) as $path_element) {
-                        $value = [$path_element => $value];
-                    }
-                    return array_merge_recursive($c, $value);
-                },
-                []
-            )['form'][EditForm::CARRY_SECTION_NAME] ?? []
-        );
-    }
-}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
index 01d99c6ebbc6..039947f97b54 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
@@ -71,7 +71,7 @@ public function getTotalRowCount(
         mixed $filter_data,
         mixed $additional_parameters
     ): ?int {
-        return 0;
+        return $this->environment->getAnswerFormProperties()->getGaps()->getNumberOfGaps();
     }
 
     private function getColums(): array
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
index 6d835d8bce23..3fa8bb631adf 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
@@ -41,7 +41,7 @@ class Persistence implements PersistenceInterface
     private const array ANSWER_FORM_TABLE_COLUMNS = [
         'answer_form_id',
         'scoring_identical_responses',
-        'combinations_activated'
+        'combinations_enabled'
     ];
 
     private const string ANSWER_INPUTS_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
@@ -68,15 +68,24 @@ class Persistence implements PersistenceInterface
         'upper_limit'
     ];
 
-    private const string COMBINATIONS_TABLE_IDENTIFIER = 'combinations';
-    private const string COMBINATIONS_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
-    private const array COMBINATIONS_TABLE_COLUMNS = [
+    public const string COMBINATION_TABLE_IDENTIFIER = 'combinations';
+    private const string COMBINATION_TABLE_FOREIGN_KEY_COLUMN = 'answer_form_id';
+    private const array COMBINATION_TABLE_COLUMNS = [
         'id',
         'answer_form_id',
-        'answer_options',
         'points'
     ];
 
+    public const string COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER = 'combinations_to_answer_options';
+    private const string COMBINATION_TO_ANSWER_OPTIONS_TABLE_ID_COLUMN = 'combination_id';
+    private const string COMBINATION_TO_ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN = 'combination_id';
+    private const array COMBINATION_TO_ANSWER_OPTIONS_TABLE_COLUMNS = [
+        'combination_id',
+        'gap_id',
+        'answer_option_id',
+        'in_range'
+    ];
+
     public function __construct(
         private readonly TableNameSpaceCore $table_namespace
     ) {
@@ -92,7 +101,7 @@ public function getTableNameSpace(): TableNameSpace
     public function getColumns(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
-        ?string $table_identifier = null,
+        string $table_identifier = '',
         array $columns_to_skip = []
     ): array {
         $table = $table_type->getTable($table_name_builder, $table_identifier);
@@ -100,7 +109,10 @@ public function getColumns(
             TableTypes::TypeSpecificAnswerForms => self::ANSWER_FORM_TABLE_COLUMNS,
             TableTypes::AnswerInputs => self::ANSWER_INPUTS_TABLE_COLUMNS,
             TableTypes::AnswerOptions => self::ANSWER_OPTIONS_TABLE_COLUMNS,
-            TableTypes::Additional => self::COMBINATIONS_TABLE_COLUMNS
+            TableTypes::Additional => match($table_identifier) {
+                self::COMBINATION_TABLE_IDENTIFIER => self::COMBINATION_TABLE_COLUMNS,
+                self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER => self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_COLUMNS
+            }
         };
         return array_map(
             fn(string $v): Column => new Column($table, $v),
@@ -117,25 +129,36 @@ public function getColumns(
     public function getIdColumn(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
-        ?string $table_identifier = null
+        string $table_identifier = ''
     ): Column {
-        return match($table_type) {
-            TableTypes::TypeSpecificAnswerForms => new Column(
+        if ($table_type === TableTypes::TypeSpecificAnswerForms) {
+            return new Column(
                 $table_type->getTable($table_name_builder),
                 self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
-            ),
-            default => new Column(
-                $table_type->getTable($table_name_builder, $table_identifier),
-                self::ID_COLUMN
-            )
-        };
+            );
+        }
+
+        if ($table_identifier === self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER) {
+            return new Column(
+                $table_type->getTable(
+                    $table_name_builder,
+                    self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER
+                ),
+                self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_ID_COLUMN
+            );
+        }
+
+        return new Column(
+            $table_type->getTable($table_name_builder, $table_identifier),
+            self::ID_COLUMN
+        );
     }
 
     #[\Override]
     public function getForeignKeyColumn(
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
-        ?string $table_identifier = null
+        string $table_identifier = ''
     ): Column {
         return match($table_type) {
             TableTypes::TypeSpecificAnswerForms => new Column(
@@ -152,7 +175,9 @@ public function getForeignKeyColumn(
             ),
             TableTypes::Additional => new Column(
                 $table_type->getTable($table_name_builder, $table_identifier),
-                self::COMBINATIONS_TABLE_FOREIGN_KEY_COLUMN
+                $table_identifier === self::COMBINATION_TABLE_IDENTIFIER
+                    ? self::COMBINATION_TABLE_FOREIGN_KEY_COLUMN
+                    : self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN
             )
         };
     }
@@ -167,7 +192,13 @@ public function completeQuery(
         $answer_form_specific_table_definition = TableTypes::TypeSpecificAnswerForms;
         $answer_input_table_definition = TableTypes::AnswerInputs;
         $answer_options_table_definition = TableTypes::AnswerOptions;
-        $combinations_table_definition = TableTypes::Additional;
+        $additional_table_definition = TableTypes::Additional;
+
+        $combinations_id_column = $this->getIdColumn(
+            $table_name_builder,
+            $additional_table_definition,
+            self::COMBINATION_TABLE_IDENTIFIER
+        );
 
         return $query->withAdditionalJoin(
             new Join(
@@ -236,8 +267,8 @@ public function completeQuery(
                 $answer_form_id_column,
                 $this->getForeignKeyColumn(
                     $table_name_builder,
-                    $combinations_table_definition,
-                    self::COMBINATIONS_TABLE_IDENTIFIER
+                    $additional_table_definition,
+                    self::COMBINATION_TABLE_IDENTIFIER
                 ),
                 JoinType::Left
             )
@@ -245,10 +276,42 @@ public function completeQuery(
             new Select(
                 $this->getColumns(
                     $table_name_builder,
-                    $combinations_table_definition,
-                    self::COMBINATIONS_TABLE_IDENTIFIER
+                    $additional_table_definition,
+                    self::COMBINATION_TABLE_IDENTIFIER
                 )
             )
+        )->withAdditionalJoin(
+            new Join(
+                $combinations_id_column,
+                $this->getForeignKeyColumn(
+                    $table_name_builder,
+                    $additional_table_definition,
+                    self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER
+                ),
+                JoinType::Left
+            )
+        )->withAdditionalSelect(
+            new Select(
+                $this->getColumns(
+                    $table_name_builder,
+                    $additional_table_definition,
+                    self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER
+                )
+            )
+        )->withAdditionalOrder(
+            new Order(
+                $combinations_id_column
+            )
         );
     }
+
+    public function getCombinationsTableIdentifier(): string
+    {
+        return self::COMBINATION_TABLE_IDENTIFIER;
+    }
+
+    public function getCombinationToAnswerOptionsTableIdentifier(): string
+    {
+        return self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER;
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 59120c3fa759..d6e9cfb092b9 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -27,9 +27,11 @@
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Markdown as MarkdownInput;
 use ILIAS\UI\Component\Input\Field\Hidden as HiddenInput;
+use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use Mustache\Engine;
 
 class Text
@@ -83,6 +85,21 @@ public function getRenderedMarkdownForParticipantPresentation(): string
         );
     }
 
+    public function buildPanelForEditing(
+        UIFactory $ui_factory,
+        Language $lng,
+        Gaps $gaps
+    ): StandardPanel {
+        return $ui_factory->panel()->standard(
+            $lng->txt('cloze_text'),
+            $ui_factory->legacy()->content(
+                $this->getRenderedMarkdownForEditingPresentation(
+                    $gaps
+                )
+            )
+        );
+    }
+
     public function getRenderedMarkdownForEditingPresentation(
         Gaps $gaps
     ): string {
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
new file mode 100644
index 000000000000..c8d31c083c9f
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
@@ -0,0 +1,312 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations;
+
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
+use ILIAS\Questions\Persistence\Delete;
+use ILIAS\Questions\Persistence\Manipulate;
+use ILIAS\Questions\Persistence\Replace;
+use ILIAS\Questions\Persistence\Table;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Value;
+use ILIAS\Questions\Persistence\Where;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Table\DataRow;
+use ILIAS\UI\Component\Table\DataRowBuilder;
+
+class Combination
+{
+    /**
+     * @param Uuid $id
+     * @param array<ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations\MatchingValue> $matching_values
+     */
+    public function __construct(
+        private readonly Uuid $id,
+        private ?float $available_points,
+        private array $matching_values = []
+    ) {
+    }
+
+    public function getId(): Uuid
+    {
+        return $this->id;
+    }
+
+    public function getAvailablePoints(): ?float
+    {
+        return $this->available_points;
+    }
+
+    public function withAdditionalMatchingValue(
+        MatchingValue $matching_value
+    ): self {
+        $clone = clone $this;
+        $clone->matching_values[] = $matching_value;
+        return $clone;
+    }
+
+    public function getValuePresentation(
+        Language $lng
+    ): string {
+        return implode(
+            ' - ',
+            array_map(
+                fn(MatchingValue $v): string => $v->buildPresentationString($lng),
+                $this->matching_values
+            )
+        ) . " ({$this->available_points})";
+    }
+
+    public function containsAnswerOptionsExactly(
+        array $vs
+    ): bool {
+        return array_diff(
+            $vs,
+            array_map(
+                fn(MatchingValue $v): string => $v->getAnswerOption()->getAnswerOptionId()->toString(),
+                $this->matching_values
+            )
+        ) === [];
+    }
+
+    public function toStorage(
+        Uuid $answer_form_id,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder,
+        Manipulate $manipulate
+    ): Manipulate {
+        if ($this->matching_values === []) {
+            throw new \UnexpectedValueException(
+                'A Combination without MatchingValues cannot be stored.'
+            );
+        }
+
+        return array_reduce(
+            $this->matching_values,
+            fn(Manipulate $c, MatchingValue $v): Manipulate => $c->withAdditionalStatement(
+                $v->toStorage(
+                    $persistence,
+                    $table_name_builder
+                )
+            ),
+            $manipulate->withAdditionalStatement(
+                $this->buildReplace(
+                    $answer_form_id,
+                    $persistence,
+                    $table_name_builder
+                )
+            )
+        );
+    }
+
+    public function toDelete(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder,
+        Manipulate $manipulate
+    ): Manipulate {
+        return $manipulate->withAdditionalStatement(
+            $this->buildDelete($persistence, $table_name_builder)
+        )->withAdditionalStatement(
+            $this->buildDeleteForLinkedValues(
+                $persistence,
+                $table_name_builder
+            )
+        );
+    }
+
+    private function buildReplace(
+        Uuid $answer_form_id,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Replace {
+        $table_definition = TableTypes::Additional;
+        return new Replace(
+            $persistence->getColumns(
+                $table_name_builder,
+                $table_definition,
+                $persistence->getCombinationsTableIdentifier()
+            ),
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->id->toString()),
+                new Value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
+                new Value(\ilDBConstants::T_FLOAT, $this->available_points)
+            ]
+        );
+    }
+
+    private function buildDelete(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Delete {
+        $table_definition = TableTypes::Additional;
+        return new Delete(
+            new Table(
+                $table_definition,
+                $table_name_builder,
+                $persistence->getCombinationsTableIdentifier()
+            ),
+            [
+                new Where(
+                    $persistence->getIdColumn(
+                        $table_name_builder,
+                        $table_definition,
+                        $persistence->getCombinationsTableIdentifier()
+                    ),
+                    new Value(\ilDBConstants::T_TEXT, $this->id->toString())
+                )
+            ]
+        );
+    }
+
+    private function buildDeleteForLinkedValues(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Delete {
+        $table_definition = TableTypes::Additional;
+        return new Delete(
+            new Table(
+                $table_definition,
+                $table_name_builder,
+                $persistence->getCombinationToAnswerOptionsTableIdentifier()
+            ),
+            [
+                new Where(
+                    $persistence->getIdColumn(
+                        $table_name_builder,
+                        $table_definition,
+                        $persistence->getCombinationToAnswerOptionsTableIdentifier()
+                    ),
+                    new Value(\ilDBConstants::T_TEXT, $this->id->toString())
+                )
+            ]
+        );
+    }
+
+    public function toTableRow(
+        Language $lng,
+        DataRowBuilder $data_row_builder
+    ): DataRow {
+        return $data_row_builder->buildDataRow(
+            $this->id->toString(),
+            [
+                'gaps' => $this->buildGapsString(),
+                'values' => $this->getValuePresentation($lng),
+                'available_points' => $this->getAvailablePoints()
+            ]
+        );
+    }
+
+    public function buildGapsString(): string
+    {
+        return implode(
+            '<br>',
+            array_map(
+                fn(MatchingValue $v): string => $v->getGapId()->toString(),
+                $this->matching_values
+            )
+        );
+    }
+
+    public function buildPointsInputs(
+        FieldFactory $field_factory,
+        Refinery $refinery,
+        Language $lng,
+        Factory $combinations_factory,
+        Properties $properties
+    ): Group {
+        return $field_factory->section(
+            [
+                'values' => $this->buildValuesInputs(
+                    $field_factory,
+                    $properties
+                ),
+                'points' => $field_factory->numeric(
+                    $lng->txt('points')
+                )->withStepSize(0.01)
+                ->withRequired(true)
+                ->withValue($this->getAvailablePoints())
+            ],
+            $lng->txt('values')
+        )->withAdditionalTransformation(
+            $refinery->custom()->constraint(
+                fn(array $vs): bool => !$properties->getCombinations()
+                    ->hasMatchingCombinationForAnswerOptionIds($vs['values']),
+                $lng->txt('combination_already_exists')
+            )
+        )->withAdditionalTransformation(
+            $refinery->custom()->transformation(
+                fn(array $v): Properties => $properties->withCombinations(
+                    $properties->getCombinations()->withAdditionalCombination(
+                        $combinations_factory->buildCombination(
+                            $this->id,
+                            $v['points'],
+                            $combinations_factory->buildMatchingValuesFromForm(
+                                $properties,
+                                $this->id,
+                                $v['values']
+                            )
+                        )
+                    )
+                )
+            )
+        );
+    }
+
+    public function buildCarryString(): string
+    {
+        return json_encode([
+            $this->id->toString() => array_map(
+                fn(MatchingValue $v) => $v->getGapId()->toString(),
+                $this->matching_values
+            )
+        ]);
+    }
+
+    private function buildValuesInputs(
+        FieldFactory $field_factory,
+        Properties $properties
+    ): Group {
+        return $field_factory->group(
+            array_reduce(
+                $this->matching_values,
+                function (array $c, MatchingValue $v) use ($field_factory, $properties): array {
+                    $gap = $properties->getGaps()->getGapById($v->getGapId());
+                    $c[$v->getGapId()->toString()] = $field_factory->select(
+                        $gap->buildShortenedGapName(),
+                        $gap->getType()->getCombinationsSelectValues($gap)
+                    )->withRequired(true)
+                    ->withValue(
+                        $v->getAnswerOption()?->getAnswerOptionId()->toString()
+                    );
+                    return $c;
+                },
+                []
+            )
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combinations.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combinations.php
new file mode 100644
index 000000000000..90c6540c8a3e
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combinations.php
@@ -0,0 +1,176 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations;
+
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\Persistence\Manipulate;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\HTTP\Services as HttpServices;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Table\DataRowBuilder;
+
+class Combinations
+{
+    private array $combinations;
+
+    private array $deleted_combinations = [];
+
+    public function __construct(
+        private readonly Factory $combinations_factory,
+        private readonly Uuid $answer_form_id,
+        private bool $enabled,
+        array $combinations
+    ) {
+        $this->combinations = array_reduce(
+            $combinations,
+            function (array $c, Combination $v): array {
+                $c[$v->getId()->toString()] = $v;
+                return $c;
+            },
+            []
+        );
+    }
+
+    public function areCombinationsEnabled(): bool
+    {
+        return $this->enabled;
+    }
+
+    public function withCombinationsEnabled(
+        bool $combinations_enabled
+    ): self {
+        $clone = clone $this;
+        $clone->enabled = $combinations_enabled;
+        return $clone;
+    }
+
+    public function getCombinationById(
+        string $id
+    ): ?Combination {
+        return $this->combinations[$id] ?? null;
+    }
+
+    public function withAdditionalCombination(
+        Combination $combination
+    ): self {
+        $clone = clone $this;
+        $clone->combinations[$combination->getId()->toString()] = $combination;
+        return $clone;
+    }
+
+    public function withoutCombination(
+        string $id
+    ): self {
+        $clone = clone $this;
+        $clone->deleted_combinations[] = $clone->combinations[$id];
+        unset($clone->combinations[$id]);
+        return $clone;
+    }
+
+    public function hasMatchingCombinationForAnswerOptionIds(
+        array $vs
+    ): bool {
+        foreach ($this->combinations as $combination) {
+            if ($combination->containsAnswerOptionsExactly($vs)) {
+                return true;
+            }
+            return false;
+        }
+    }
+
+    public function getEditView(
+        UIFactory $ui_factory,
+        \ilToolbarGUI $toolbar,
+        Refinery $refinery,
+        Language $lng,
+        HttpServices $http
+    ): EditCombinations {
+        return new EditCombinations(
+            $ui_factory,
+            $toolbar,
+            $refinery,
+            $lng,
+            $http,
+            $this->combinations_factory
+        );
+    }
+
+    public function toStorage(
+        Manipulate $manipulate,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Manipulate {
+        return array_reduce(
+            $this->combinations,
+            fn(Manipulate $c, Combination $v): Manipulate => $v->toStorage(
+                $this->answer_form_id,
+                $persistence,
+                $table_name_builder,
+                $c
+            ),
+            array_reduce(
+                $this->deleted_combinations,
+                fn(Manipulate $c, Combination $v): Manipulate => $v->toDelete(
+                    $persistence,
+                    $table_name_builder,
+                    $manipulate
+                ),
+                $manipulate
+            )
+        );
+    }
+
+    public function toDelete(
+        Manipulate $manipulate,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Manipulate {
+        return array_reduce(
+            $this->combinations,
+            fn(Manipulate $c, Combination $v): Manipulate => $c->withAdditionalStatement(
+                $v->toDelete(
+                    $this->answer_form_id,
+                    $manipulate,
+                    $persistence,
+                    $table_name_builder
+                )
+            ),
+            $manipulate
+        );
+    }
+
+    public function toTableRows(
+        Language $lng,
+        DataRowBuilder $row_builder,
+    ): \Generator {
+        foreach ($this->combinations as $combination) {
+            yield $combination->toTableRow($lng, $row_builder);
+        }
+    }
+
+    public function getNumberOfCombinations(): int
+    {
+        return count($this->combinations);
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/EditCombinations.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/EditCombinations.php
index 64eb908e2555..031189a70094 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/EditCombinations.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/EditCombinations.php
@@ -18,335 +18,77 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations;
 
-use ILIAS\Questions\AnswerForm\Views\Edit as EditViewInterface;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Factory as PropertiesFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Layout\CombinationsOverview;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
 use ILIAS\Questions\Presentation\Definitions\Environment;
-use ILIAS\Questions\Presentation\Layout\EditForm;
-use ILIAS\Questions\Presentation\Layout\EditOverview;
+use ILIAS\Questions\Presentation\Layout\Async;
+use ILIAS\Questions\Presentation\Layout\Renderable;
 use ILIAS\HTTP\Services as HTTPServices;
 use ILIAS\Language\Language;
-use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
-use ILIAS\UI\Component\Modal\InterruptiveItem\Standard as InterruptiveItem;
-use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Factory as UIFactory;
 
-class Edit implements EditViewInterface
+class EditCombinations
 {
-    private const string STEP_EDIT_BASIC_PROPERTIES = 'ebp';
-    private const string STEP_CONFIRMED_GAP_REMOVAL = 'cgr';
-    private const string STEP_SET_GAP_TYPES = 'sgt';
-    public const string STEP_JUMP_TO_SET_GAP_TYPES = 'jsgt';
-    private const string STEP_SET_ANSWER_OPTIONS = 'sao';
-    public const string STEP_JUMP_TO_SET_ANSWER_OPTIONS = 'jsao';
-    private const string STEP_SET_POINTS = 'sp';
-    public const string STEP_JUMP_TO_SET_POINTS = 'jsp';
-    private const string STEP_SAVE = 's';
+    private const string STEP_EDIT_COMBINATIONS_OVERVIEW = 'eco';
+
+    private const string LANG_VAR_EDIT_COMBINATIONS = 'edit_combinations';
 
     public function __construct(
-        private readonly Language $lng,
         private readonly UIFactory $ui_factory,
+        private readonly \ilToolbarGUI $toolbar,
         private readonly Refinery $refinery,
+        private readonly Language $lng,
         private readonly HTTPServices $http,
-        private readonly PropertiesFactory $properties_factory,
-        private readonly ClozeTextFactory $cloze_text_factory,
-        private readonly GapFactory $gap_factory
+        private readonly Factory $combinations_factory
     ) {
     }
 
-    #[\Override]
-    public function create(
-        Environment $environment
-    ): EditForm|Properties {
-        $step = $environment->getStep();
-
-        return match($step) {
-            '' => $this->buildBasicEditingForm($environment),
-            default => $this->callIntermediateStep($environment, $step)
-        };
-    }
-
-    #[\Override]
-    public function edit(
-        Environment $environment
-    ): EditOverview|EditForm|Properties {
-        $step = $environment->getStep();
-
-        if ($step === '') {
-            return $environment->getPresentationFactory()->getEditOverview(
-                $environment,
-                $environment->getUrlBuilderWithStepParameter(self::STEP_EDIT_BASIC_PROPERTIES)
-                    ->buildURI()
-            );
-        }
-
-        $environment->setEditAnswerFormBackTarget();
-
-        return match ($step) {
-            self::STEP_EDIT_BASIC_PROPERTIES => $this->buildBasicEditingForm($environment),
-            default => $this->callIntermediateStep($environment, $step)
-        };
-    }
-
-    #[\Override]
-    public function other(
-        Environment $environment
-    ): EditForm|Properties {
-
-    }
-
-    private function callIntermediateStep(
-        Environment $environment,
-        string $step
-    ): EditForm|Properties {
-        $initialized_environment = $environment->withPreservedTableRowIdsParameter();
-
-        if ($step !== self::STEP_JUMP_TO_SET_ANSWER_OPTIONS
-            && $step !== self::STEP_JUMP_TO_SET_ANSWER_OPTIONS
-            && $step !== self::STEP_JUMP_TO_SET_POINTS) {
-            $initialized_environment = $initialized_environment->withAnswerFormProperties(
-                $environment->getAnswerFormProperties()->withValuesFromCarry(
-                    $this->refinery,
-                    $this->cloze_text_factory,
-                    $this->gap_factory,
-                    $environment->getPresentationFactory()->getCarrySectionData(
-                        $this->http->wrapper()->post(),
-                        $this->refinery
-                    )
-                )
-            );
-        }
-
-        return match ($step) {
-            self::STEP_SET_GAP_TYPES,
-            self::STEP_CONFIRMED_GAP_REMOVAL => $this->processBasicEditingForm(
-                $initialized_environment
-            ),
-            self::STEP_JUMP_TO_SET_GAP_TYPES => $this->buildGapTypesForm(
-                $initialized_environment
-            ),
-            self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm(
-                $initialized_environment
-            ),
-            self::STEP_JUMP_TO_SET_ANSWER_OPTIONS => $this->buildAnswerOptionsForm(
-                $initialized_environment
-            ),
-            self::STEP_SET_POINTS => $this->processAnswerOptionsForm(
-                $initialized_environment
-            ),
-            self::STEP_JUMP_TO_SET_POINTS => $this->buildAssignPointsForm(
-                $initialized_environment
-            ),
-            self::STEP_SAVE => $this->processAssignPointsForm(
-                $initialized_environment
-            )
-        };
-    }
-
-    private function buildBasicEditingForm(
-        Environment $environment
-    ): EditForm {
-        return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_GAP_TYPES),
-            $environment->getAnswerFormProperties()->buildBasicEditingInputs(
-                $this->lng,
-                $this->ui_factory->input()->field(),
-                $this->refinery,
-                $this->properties_factory,
-                $this->cloze_text_factory
-            ),
-            false
-        );
-    }
-
-    private function processBasicEditingForm(
+    public function addCombinationsSubTab(
         Environment $environment
-    ): EditForm|Properties {
-        $form = $this->buildBasicEditingForm(
-            $environment
-        )->withRequest($this->http->request());
-
-        $data = $form->getData();
-        if ($data === null) {
-            return $form;
-        }
-
-        $new_gaps = $data->getGaps();
-        $old_gaps = $environment->getAnswerFormProperties()->getGaps();
-
-        if ($environment->getStep() !== self::STEP_CONFIRMED_GAP_REMOVAL) {
-            $removed_gaps = $new_gaps->getRemovedGaps($old_gaps);
-            if ($removed_gaps !== []) {
-                return $form->withConfirmation(
-                    $this->buildRemovedGapsConfirmation(
-                        $environment,
-                        $removed_gaps
-                    )
-                );
-            }
-        }
-
-        if ($new_gaps->getAddedGaps($old_gaps) === []) {
-            return $data;
-        }
-
-        return $this->buildGapTypesForm(
-            $environment->withAnswerFormProperties($data)
+    ): void {
+        $environment->addEditAnswerFormSubTab(
+            self::STEP_EDIT_COMBINATIONS_OVERVIEW,
+            self::LANG_VAR_EDIT_COMBINATIONS
         );
     }
 
-    private function buildGapTypesForm(
+    public function show(
         Environment $environment
-    ): EditForm {
-        $properties = $environment->getAnswerFormProperties();
-        $ff = $this->ui_factory->input()->field();
-        return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_ANSWER_OPTIONS),
-            $properties->getGaps()->buildGapsTypeInputs(
-                $this->lng,
-                $ff,
-                $this->refinery,
-                $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng),
-                $environment->getTableRowIds()
-            ),
-            false,
-            $properties->withClozeText($properties->getClozeText())
-                ->buildCarryInputs($ff)
-        )->withContentBeforeForm(
-            $this->buildClozeTextPanel($properties)
+    ): Async|Renderable|Properties {
+        $environment->addEditAnswerFormSubTab(
+            self::STEP_EDIT_COMBINATIONS_OVERVIEW,
+            self::LANG_VAR_EDIT_COMBINATIONS
         );
-    }
-
-    private function processGapTypesForm(
-        Environment $environment
-    ): EditForm {
-        $form = $this->buildGapTypesForm(
-            $environment
-        )->withRequest($this->http->request());
-
-        $data = $form->getData();
-        return $data === null
-            ? $form
-            : $this->buildAnswerOptionsForm(
-                $environment->withAnswerFormProperties(
-                    $environment->getAnswerFormProperties()->withGaps($data)
-                )
-            );
-    }
 
-    private function buildAnswerOptionsForm(
-        Environment $environment
-    ): EditForm {
-        $properties = $environment->getAnswerFormProperties();
-        $ff = $this->ui_factory->input()->field();
-        return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_POINTS),
-            $properties->getGaps()->buildAnswerOptionsInputs(
-                $this->lng,
-                $ff,
-                $this->refinery,
-                $environment->getTableRowIds()
-            ),
-            false,
-            $properties->buildCarryInputs($ff)
-        )->withContentBeforeForm(
-            $this->buildClozeTextPanel($properties)
+        $environment->activateEditAnswerFormSubTab(
+            self::STEP_EDIT_COMBINATIONS_OVERVIEW
         );
-    }
 
-    private function processAnswerOptionsForm(
-        Environment $environment
-    ): EditForm {
-        $form = $this->buildAnswerOptionsForm(
-            $environment
-        )->withRequest($this->http->request());
+        $combinations_overview = $this->buildCombinationsOverview($environment);
 
-        $data = $form->getData();
-        return $data === null
-            ? $form
-            : $this->buildAssignPointsForm(
-                $environment->withAnswerFormProperties(
-                    $environment->getAnswerFormProperties()->withGaps($data)
-                )
-            );
-    }
+        $step = $environment->getStep();
+        if ($step === self::STEP_EDIT_COMBINATIONS_OVERVIEW
+            || $step === '') {
+            return $combinations_overview;
+        }
 
-    private function buildAssignPointsForm(
-        Environment $environment
-    ): EditForm {
-        $properties = $environment->getAnswerFormProperties();
-        $ff = $this->ui_factory->input()->field();
-        return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilderWithStepParameter(self::STEP_SAVE),
-            $properties->getGaps()->buildPointInputs(
-                $this->lng,
-                $ff,
-                $this->refinery,
-                $environment->getTableRowIds()
-            ),
-            true,
-            $properties->buildCarryInputs($ff)
-        )->withContentBeforeForm(
-            $this->buildClozeTextPanel($properties)
-        );
+        return $combinations_overview->doAction();
     }
 
-    private function processAssignPointsForm(
+    private function buildCombinationsOverview(
         Environment $environment
-    ): EditForm|Properties {
-        $form = $this->buildAssignPointsForm(
-            $environment
-        )->withRequest($this->http->request());
-
-        $properties = $environment->getAnswerFormProperties();
-        $data = $form->getData();
-        return $data === null
-            ? $form->withContentBeforeForm(
-                $this->buildClozeTextPanel($properties)
-            ) : $properties->withGaps($data);
-    }
-
-    private function buildClozeTextPanel(
-        Properties $properties
-    ): StandardPanel {
-        return $this->ui_factory->panel()->standard(
-            $this->lng->txt('cloze_text'),
-            $this->ui_factory->legacy()->content(
-                $properties->getClozeText()->getRenderedMarkdownForEditingPresentation(
-                    $properties->getGaps()
-                )
-            )
-        );
-    }
-
-    /**
-     * @param array<\ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap> $removed_gaps
-     */
-    private function buildRemovedGapsConfirmation(
-        Environment $environment,
-        array $removed_gaps
-    ): InterruptiveModal {
-        return $this->ui_factory->modal()->interruptive(
-            $this->lng->txt('confirm'),
-            $this->lng->txt('confirm_remove_gaps'),
-            $environment->getUrlBuilderWithStepParameter(
-                self::STEP_CONFIRMED_GAP_REMOVAL
-            )->buildURI()->__toString()
-        )->withAffectedItems(
-            array_map(
-                fn(Gap $v): InterruptiveItem => $this->ui_factory->modal()
-                    ->interruptiveItem()->standard(
-                        $v->getAnswerInputId()->toString(),
-                        $v->buildShortenedGapName()
-                    ),
-                $removed_gaps
-            )
+    ): CombinationsOverview {
+        return new CombinationsOverview(
+            $this->ui_factory,
+            $this->toolbar,
+            $this->refinery,
+            $this->lng,
+            $this->http,
+            $environment,
+            $this->combinations_factory
         );
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
index 103012a35f75..0c734d0a9b7d 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
@@ -18,91 +18,262 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties;
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations;
 
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
 use ILIAS\Questions\Persistence\Query;
 use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Custom\Transformation as CustomTransformation;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Field\Group;
 
 class Factory
 {
     public function __construct(
-        private readonly ClozeTextFactory $cloze_text_factory,
-        private readonly GapsFactory $gaps_factory
+        private readonly UuidFactory $uuid_factory
     ) {
     }
 
-    public function fromData(
+    public function getCombinations(
         TypeGenericProperties $type_generic_properties,
-        ?Query $query
-    ): Properties {
-        if ($query === null) {
-            return new Properties(
-                $type_generic_properties->getAnswerFormId(),
-                $type_generic_properties->getQuestionId(),
-                $type_generic_properties->getDefinition(),
-                $this->cloze_text_factory->buildFromTextString(
-                    $type_generic_properties->getAdditionalText()
-                ),
-                $type_generic_properties->getAdditionalTextLegacy(),
-                $this->gaps_factory->getEmptyGapsObject(
-                    $type_generic_properties->getAnswerFormId()
+        bool $combinations_enabled,
+        ?Gaps $gaps = null,
+        ?Query $query = null
+    ): Combinations {
+        return new Combinations(
+            $this,
+            $type_generic_properties->getAnswerFormId(),
+            $combinations_enabled,
+            !$combinations_enabled || $gaps === null || $query === null
+                ? []
+                : $this->retrieveMatchingValuesFromQuery(
+                    $type_generic_properties,
+                    $gaps,
+                    $this->retrieveCombinationsFromQuery(
+                        $type_generic_properties,
+                        $query
+                    ),
+                    $query
                 )
-            );
-        }
+        );
+    }
 
-        [
-            'scoring_identical_responses' => $scoring_identical_responses,
-            'combinations_activated' => $combinations_activated
-        ] = $query->retrieveCurrentRecord(
-            TableTypes::TypeSpecificAnswerForms->getTable(
-                $query->getTableNameBuilder($type_generic_properties->getDefinition()::class)
-            ),
-            $query->getRefinery()->custom()->transformation(
-                fn(array $vs): array => [
-                    'scoring_identical_responses' => ScoringIdentical::tryFrom($vs[0]['scoring_identical_responses']),
-                    'combinations_activated' => $vs[0]['combinations_activated'] === 1
-                ]
+    /**
+     * @param array<string> $gap_ids
+     */
+    public function buildNewCombination(
+        array $gap_ids,
+    ): Combination {
+        $combination_id = $this->uuid_factory->uuid4();
+        return $this->buildCombination(
+            $combination_id,
+            null,
+            array_map(
+                fn(string $v): MatchingValue => new MatchingValue(
+                    $combination_id,
+                    $this->uuid_factory->fromString($v)
+                ),
+                $gap_ids
             )
         );
+    }
 
-        return new Properties(
-            $type_generic_properties->getAnswerFormId(),
-            $type_generic_properties->getQuestionId(),
-            $type_generic_properties->getDefinition(),
-            $this->cloze_text_factory->buildFromTextString(
-                $type_generic_properties->getAdditionalText()
-            ),
-            $type_generic_properties->getAdditionalTextLegacy(),
-            $this->gaps_factory->fromDatabase(
-                $type_generic_properties->getAnswerFormId(),
-                $query
-            ),
-            $scoring_identical_responses,
-            $combinations_activated
+    /**
+     * @param array<\ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations\MatchingValue> $matching_values
+     */
+    public function buildCombination(
+        Uuid $combination_id,
+        ?float $points,
+        array $matching_values
+    ): Combination {
+        return new Combination(
+            $combination_id,
+            $points,
+            $matching_values
         );
     }
 
-    public function fromForm(
+    /**
+     * @param array<string, mixed> $values_array
+     */
+    public function buildMatchingValuesFromForm(
         Properties $properties,
-        ClozeText $cloze_text,
-        ScoringIdentical $scoring_of_identical_responses,
-        bool $combinations_enabled
-    ): Properties {
-        $updated_gaps = $cloze_text->updateGapsFromMarkdown(
-            $properties->getAnswerFormId(),
-            $properties->getGaps()
+        Uuid $combination_id,
+        array $values_array
+    ): array {
+        return array_reduce(
+            array_keys($values_array),
+            function (array $c, string $v) use (
+                $properties,
+                $values_array,
+                $combination_id
+            ): array {
+                $gap_id = $this->uuid_factory->fromString($v);
+                $answer_option = $properties->getGaps()
+                    ->getGapById($gap_id)
+                    ->getAnswerOptions()
+                    ->getAnswerOptionById(
+                        $this->uuid_factory->fromString($values_array[$v])
+                    );
+
+                if ($answer_option === null) {
+                    return $c;
+                }
+
+                $c[] = new MatchingValue(
+                    $combination_id,
+                    $gap_id,
+                    $answer_option,
+                    null
+                );
+                return $c;
+            },
+            []
+        );
+    }
+
+    public function getToCombinationTransformation(
+        FieldFactory $field_factory,
+        Refinery $refinery,
+        Language $lng,
+        Properties $properties
+    ): CustomTransformation {
+        return $refinery->custom()->transformation(
+            function (string $v) use (
+                $field_factory,
+                $refinery,
+                $lng,
+                $properties
+            ): Group {
+                $values_array = json_decode($v, true);
+                $combination_id = $this->uuid_factory->fromString(
+                    array_key_first($values_array)
+                );
+                return new Combination(
+                    $combination_id,
+                    null,
+                    array_map(
+                        fn(string $v): MatchingValue => new MatchingValue(
+                            $combination_id,
+                            $this->uuid_factory->fromString($v)
+                        ),
+                        $values_array[$combination_id->toString()]
+                    )
+                )->buildPointsInputs(
+                    $field_factory,
+                    $refinery,
+                    $lng,
+                    $this,
+                    $properties
+                );
+            }
+        );
+    }
+
+    private function retrieveCombinationsFromQuery(
+        TypeGenericProperties $type_generic_properties,
+        Query $query
+    ): array {
+        return $query->retrieveCurrentRecord(
+            TableTypes::Additional->getTable(
+                $query->getTableNameBuilder(
+                    $type_generic_properties->getDefinition()::class
+                ),
+                Persistence::COMBINATION_TABLE_IDENTIFIER
+            ),
+            $query->getRefinery()->custom()->transformation(
+                fn(array $vs): array => $this->buildCombinationsFromQuery(
+                    array_filter(
+                        $vs,
+                        fn(array $v): bool => $v['answer_form_id'] !== null
+                    )
+                )
+            )
+        );
+    }
+
+    private function buildCombinationsFromQuery(
+        array $values
+    ): array {
+        if ($values === []) {
+            return [];
+        }
+
+        return array_reduce(
+            $values,
+            function (array $c, array $v): array {
+                if (array_key_exists($v['id'], $c)) {
+                    return $c;
+                }
+
+                $c[$v['id']] = new Combination(
+                    $this->uuid_factory->fromString($v['id']),
+                    $v['points']
+                );
+
+                return $c;
+            },
+            []
         );
+    }
+
+    private function retrieveMatchingValuesFromQuery(
+        TypeGenericProperties $type_generic_properties,
+        Gaps $gaps,
+        array $combinations,
+        Query $query
+    ): array {
+        return $query->retrieveCurrentRecord(
+            TableTypes::Additional->getTable(
+                $query->getTableNameBuilder(
+                    $type_generic_properties->getDefinition()::class
+                ),
+                Persistence::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER
+            ),
+            $query->getRefinery()->custom()->transformation(
+                function (array $vs) use (
+                    $gaps,
+                    $combinations
+                ): array {
+                    $already_added = [];
+                    foreach ($vs as $v) {
+                        if (!array_key_exists($v['combination_id'], $combinations)
+                            || in_array(
+                                $v['combination_id'] . $v['gap_id'],
+                                $already_added
+                            )
+                        ) {
+                            continue;
+                        }
 
-        return $properties
-            ->withClozeText(
-                $cloze_text->withIdsOfNewGapsInClozeText($updated_gaps->getUndefinedGaps())
-            )->withGaps($updated_gaps)
-            ->withScoringOfIdenticalResponses($scoring_of_identical_responses)
-            ->withCombinationsEnabled($combinations_enabled);
+                        $already_added[] = $v['combination_id'] . $v['gap_id'];
+
+                        $gap_id = $this->uuid_factory->fromString($v['gap_id']);
+
+                        $combinations[$v['combination_id']] = $combinations[$v['combination_id']]
+                            ->withAdditionalMatchingValue(
+                                new MatchingValue(
+                                    $this->uuid_factory->fromString($v['combination_id']),
+                                    $gap_id,
+                                    $gaps->getGapById($gap_id)
+                                        ->getAnswerOptions()
+                                        ->getAnswerOptionById(
+                                            $this->uuid_factory->fromString($v['answer_option_id'])
+                                        )
+                                )
+                            );
+                    }
+
+                    return array_values($combinations);
+                }
+            )
+        );
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/InRange.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/InRange.php
new file mode 100644
index 000000000000..a32b62eff39c
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/InRange.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations;
+
+use ILIAS\Language\Language;
+
+enum InRange: string
+{
+    case InRange = 'i';
+    case OutOfRange = 'o';
+
+    public function getLabel(
+        Language $lng
+    ): string {
+        return match($this) {
+            self::InRange => $lng->txt('in_range'),
+            self::OutOfRange => $lng->txt('out_of_range')
+        };
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php
new file mode 100644
index 000000000000..a30a9f6d12de
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations;
+
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\Persistence\Replace;
+use ILIAS\Questions\Persistence\TableNameBuilder;
+use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Value;
+use ILIAS\Language\Language;
+use ILIAS\Data\UUID\Uuid;
+
+class MatchingValue
+{
+    public const string SEPARATOR_IDS = '/';
+    public const string SEPARATOR_IN_RANGE = '|';
+
+    public function __construct(
+        private readonly Uuid $combination_id,
+        private readonly Uuid $gap_id,
+        private readonly ?AnswerOption $answer_option = null,
+        private readonly ?InRange $in_range = null
+    ) {
+    }
+
+    public function getGapId(): Uuid
+    {
+        return $this->gap_id;
+    }
+
+    public function getAnswerOption(): ?AnswerOption
+    {
+        return $this->answer_option;
+    }
+
+    public function buildPresentationString(
+        Language $lng
+    ): string {
+        if ($this->answer_option === null) {
+            return '';
+        }
+
+        if ($this->in_range !== null) {
+            return $this->in_range->getLabel($lng);
+        }
+
+        $value = $this->answer_option->getTextValue();
+        if (strlen($value) < 11) {
+            return $value;
+        }
+
+        return mb_substr($value, 0, 10) . '...';
+    }
+
+    public function toStorage(
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Replace {
+        if ($this->answer_option === null) {
+            throw new \UnexpectedValueException(
+                'A MatchingValue without AnswerOption cannot be stored.'
+            );
+        }
+
+        $table_definition = TableTypes::Additional;
+        return new Replace(
+            $persistence->getColumns(
+                $table_name_builder,
+                $table_definition,
+                $persistence->getCombinationToAnswerOptionsTableIdentifier()
+            ),
+            [
+                new Value(\ilDBConstants::T_TEXT, $this->combination_id->toString()),
+                new Value(\ilDBConstants::T_TEXT, $this->gap_id->toString()),
+                new Value(\ilDBConstants::T_TEXT, $this->answer_option->getAnswerOptionId()->toString()),
+                new Value(\ilDBConstants::T_TEXT, $this->in_range?->value)
+            ]
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
index 9df088c63851..44dab3e82a0e 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
@@ -23,6 +23,7 @@
 use ILIAS\Questions\AnswerForm\TypeGenericProperties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text as ClozeText;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations\Factory as CombinationsFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
 use ILIAS\Questions\Persistence\Query;
@@ -32,7 +33,8 @@ class Factory
 {
     public function __construct(
         private readonly ClozeTextFactory $cloze_text_factory,
-        private readonly GapsFactory $gaps_factory
+        private readonly GapsFactory $gaps_factory,
+        private readonly CombinationsFactory $combinations_factory
     ) {
     }
 
@@ -49,8 +51,13 @@ public function fromData(
                     $type_generic_properties->getAdditionalText()
                 ),
                 $type_generic_properties->getAdditionalTextLegacy(),
+                ScoringIdentical::ScoreAll,
                 $this->gaps_factory->getEmptyGapsObject(
                     $type_generic_properties->getAnswerFormId()
+                ),
+                $this->combinations_factory->getCombinations(
+                    $type_generic_properties,
+                    false
                 )
             );
         }
@@ -76,6 +83,11 @@ function (array $vs) use ($type_generic_properties): array {
             )
         );
 
+        $gaps = $this->gaps_factory->fromDatabase(
+            $type_generic_properties->getAnswerFormId(),
+            $query
+        );
+
         return new Properties(
             $type_generic_properties->getAnswerFormId(),
             $type_generic_properties->getQuestionId(),
@@ -84,12 +96,14 @@ function (array $vs) use ($type_generic_properties): array {
                 $type_generic_properties->getAdditionalText()
             ),
             $type_generic_properties->getAdditionalTextLegacy(),
-            $this->gaps_factory->fromDatabase(
-                $type_generic_properties->getAnswerFormId(),
-                $query
-            ),
             $scoring_identical_responses,
-            $combinations_enabled
+            $gaps,
+            $this->combinations_factory->getCombinations(
+                $type_generic_properties,
+                $combinations_enabled,
+                $gaps,
+                $query
+            )
         );
     }
 
@@ -109,7 +123,11 @@ public function fromForm(
                 $cloze_text->withIdsOfNewGapsInClozeText($updated_gaps->getUndefinedGaps())
             )->withGaps($updated_gaps)
             ->withScoringOfIdenticalResponses($scoring_of_identical_responses)
-            ->withCombinationsEnabled($combinations_enabled);
+            ->withCombinations(
+                $properties->getCombinations()->withCombinationsEnabled(
+                    $combinations_enabled
+                )
+            );
     }
 
     private function retrieveFirstMatchingRowFromDBRecords(
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
index 8309f2c77eea..00bf3b3b704a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
@@ -50,6 +50,15 @@ public function isIncomplete(): bool
             || $this->answer_options_awarding_points === [];
     }
 
+    public function getAnswerOptionById(
+        Uuid $answer_option_id
+    ): ?AnswerOption {
+        return array_find(
+            $this->answer_options,
+            fn(AnswerOption $v): bool => $v->getAnswerOptionId()->toString() === $answer_option_id->toString()
+        );
+    }
+
     public function getAnswerOptionForPositionOrNew(
         int $position
     ): AnswerOption {
@@ -185,7 +194,7 @@ function (AnswerOption $v) use ($refinery, $values_from_form): AnswerOption {
         return $clone;
     }
 
-    public function buildArrayForInput(
+    public function buildArrayForSelectInput(
         Transformation $shuffle_transformation
     ): array {
         return array_reduce(
@@ -221,7 +230,7 @@ public function getEditPointsInputs(
             $answer_options_awarding_points ?? $this->answer_options,
             function (array $c, AnswerOption $v) use ($ff, $build_label): array {
                 $c[$v->getAnswerOptionId()->toString()] = $ff->numeric($build_label($v))
-                    ->withStepSize(0.0001)
+                    ->withStepSize(0.01)
                     ->withValue($v->getAvailablePoints());
                 return $c;
             },
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
index bf71bfed14b5..fde7139f60e7 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
@@ -87,6 +87,10 @@ function (array $vs): array {
                     $return_array = [];
                     $answer_options = [];
                     foreach ($vs as $v) {
+                        if (array_key_exists($v['id'], $answer_options)) {
+                            continue;
+                        }
+
                         if ($previous_answer_input_id !== null
                             && $v['answer_input_id'] !== $previous_answer_input_id) {
                             $return_array[$previous_answer_input_id] = new AnswerOptions(
@@ -97,7 +101,7 @@ function (array $vs): array {
                             $answer_options = [];
                         }
                         $previous_answer_input_id = $v['answer_input_id'];
-                        $answer_options[] = new AnswerOption(
+                        $answer_options[$v['id']] = new AnswerOption(
                             $this->uuid_factory->fromString($v['id']),
                             $this->uuid_factory->fromString($v['answer_input_id']),
                             $v['position'],
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 8aa75827cdf8..20c9305e66a0 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -35,8 +35,9 @@
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
-use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\Component\Input\Field\MultiSelect;
 use ILIAS\UI\Component\Table\DataRowBuilder;
 
 class Gaps
@@ -73,6 +74,11 @@ public function getGapByTagName(
         return $this->gaps[$this->extractIdFromTagName($tag_name)] ?? null;
     }
 
+    public function getNumberOfGaps(
+    ): int {
+        return count($this->gaps);
+    }
+
     public function hasAtLeastOneGap(): bool
     {
         return $this->gaps !== [];
@@ -267,8 +273,26 @@ function (array $c, Gap $v) use ($lng, $ff): array {
         );
     }
 
-    public function getCarryInputs(FieldFactory $ff): Group
-    {
+    public function buildGapsMultiSelect(
+        string $label,
+        FieldFactory $ff
+    ): MultiSelect {
+        return $ff->multiSelect(
+            $label,
+            array_reduce(
+                $this->gaps,
+                function (array $c, Gap $v): array {
+                    $c[$v->getAnswerInputId()->toString()] = $v->buildShortenedGapName();
+                    return $c;
+                },
+                []
+            )
+        );
+    }
+
+    public function getCarryInputs(
+        FieldFactory $ff
+    ): Group {
         return $ff->group(
             array_reduce(
                 $this->gaps,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
index e2d3ee9e2852..773e17b34c8b 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/LongMenu.php
@@ -72,7 +72,7 @@ public function getParticipantViewLegacyInput(
             . "{$gap->getMinAutocomplete()}, "
             . json_encode(
                 array_values(
-                    $gap->getAnswerOptions()->buildArrayForInput(
+                    $gap->getAnswerOptions()->buildArrayForSelectInput(
                         $this->refinery->random()->dontShuffle()
                     )
                 )
@@ -177,12 +177,6 @@ public function getBuildGapTransformation(
         );
     }
 
-    #[\Override]
-    public function getAnswerInput(): \ilFormPropertyGUI
-    {
-        ;
-    }
-
     private function retrieveAnswerOptionsArrayFromUpload(
         ?array $upload_value
     ): array {
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
index 33349d9f33c8..540a6f45b2f5 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Numeric.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations\InRange;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
 use ILIAS\Language\Language;
@@ -148,8 +149,13 @@ public function getBuildGapTransformation(
     }
 
     #[\Override]
-    public function getAnswerInput(): \ilFormPropertyGUI
-    {
-        ;
+    public function getCombinationsSelectValues(
+        Gap $gap
+    ): array {
+        $values = [];
+        foreach (InRange::cases() as $in_range) {
+            $values[$in_range->value] = $in_range->getLabel($this->lng);
+        }
+        return $values;
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
index 6a1afbbf7671..bef4eeadf8f4 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Select.php
@@ -62,7 +62,7 @@ public function getParticipantViewLegacyInput(
             ? $this->refinery->random()->shuffleArray(new GivenSeed(4))
             : $this->refinery->random()->dontShuffle();
 
-        foreach ($gap->getAnswerOptions()->buildArrayForInput($shuffler) as $key => $answer_option) {
+        foreach ($gap->getAnswerOptions()->buildArrayForSelectInput($shuffler) as $key => $answer_option) {
             $gaptemplate->setCurrentBlock('select_gap_option');
             $gaptemplate->setVariable(
                 'SELECT_GAP_VALUE',
@@ -149,10 +149,4 @@ public function getBuildGapTransformation(
             )->withShuffleAnswerOptions($vs['shuffle_answer_options'])
         );
     }
-
-    #[\Override]
-    public function getAnswerInput(): \ilFormPropertyGUI
-    {
-        ;
-    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
index 7ef1fc75d296..851b45ffc422 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Text.php
@@ -148,10 +148,4 @@ public function getBuildGapTransformation(
                 )
         );
     }
-
-    #[\Override]
-    public function getAnswerInput(): \ilFormPropertyGUI
-    {
-        ;
-    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
index becbef79ccf9..e9344e48b384 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Type.php
@@ -54,7 +54,13 @@ abstract public function getBuildGapTransformation(
         Gap $gap
     ): Transformation;
 
-    abstract public function getAnswerInput(): \ilFormPropertyGUI;
+    public function getCombinationsSelectValues(
+        Gap $gap
+    ): array {
+        return $gap->getAnswerOptions()->buildArrayForSelectInput(
+            $this->refinery->random()->dontShuffle()
+        );
+    }
 
     public function getAddPointsTransformation(
         Gap $gap
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index caefc207870f..6a4fb96cd06f 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -27,6 +27,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Layout\OverviewTable;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Text;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations\Combinations;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
@@ -59,6 +60,8 @@ class Properties implements PropertiesInterface
     private const string FORM_KEY_ENABLE_COMBINATIONS = 'enable_combinations';
     private const string FORM_KEY_GAPS_TO_EDIT = 'gaps';
 
+    private bool $updated_combinations = false;
+
     /**
      * @param array<string, \ILIAS\Questions\AnswerFormTypes\Cloze\Gap> $gaps
      */
@@ -68,9 +71,9 @@ public function __construct(
         private readonly Definition $definition,
         private Text $cloze_text,
         private readonly string $legacy_cloze_text,
+        private ScoringIdentical $scoring_identical,
         private Gaps $gaps,
-        private ScoringIdentical $scoring_identical = ScoringIdentical::ScoreAll,
-        private bool $combinations_enabled = false
+        private Combinations $combinations
     ) {
     }
 
@@ -145,16 +148,17 @@ public function withScoringOfIdenticalResponses(
         return $clone;
     }
 
-    public function areCombinationsEnabled(): bool
+    public function getCombinations(): Combinations
     {
-        return $this->combinations_enabled;
+        return $this->combinations;
     }
 
-    public function withCombinationsEnabled(
-        bool $combinations_enabled
+    public function withCombinations(
+        Combinations $combinations
     ): self {
         $clone = clone $this;
-        $clone->combinations_enabled = $combinations_enabled;
+        $clone->combinations = $combinations;
+        $clone->updated_combinations = true;
         return $clone;
     }
 
@@ -180,7 +184,7 @@ public function getBasicPropertiesForListing(
                 ->getRenderedMarkdownForEditingPresentation($this->gaps),
             $lng->txt('score_identical') => $this->scoring_identical
                 ->getTranslatedOptionName($lng),
-            $lng->txt('gap_combinations') => $this->combinations_enabled
+            $lng->txt('gap_combinations') => $this->combinations->areCombinationsEnabled()
                 ? $lng->txt('enabled')
                 : $lng->txt('disabled')
         ];
@@ -222,7 +226,7 @@ public function buildBasicEditingInputs(
                     $this->scoring_identical
                 )->withValue($this->getScoringOfIdenticalResponses()->value),
                 self::FORM_KEY_ENABLE_COMBINATIONS => $ff->checkbox($lng->txt('cloze_enable_combinations'))
-                    ->withValue($this->areCombinationsEnabled())
+                    ->withValue($this->combinations->areCombinationsEnabled())
             ],
             $lng->txt('create_answer_form')
         )->withAdditionalTransformation(
@@ -253,7 +257,7 @@ public function buildCarryInputs(
                     ->withValue($this->getScoringOfIdenticalResponses()->value),
                 self::FORM_KEY_ENABLE_COMBINATIONS => $ff->hidden()
                     ->withDedicatedName(self::FORM_KEY_ENABLE_COMBINATIONS)
-                    ->withValue($this->areCombinationsEnabled() ? 1 : 0)
+                    ->withValue($this->combinations->areCombinationsEnabled() ? 1 : 0)
             ]
         );
     }
@@ -289,11 +293,15 @@ public function withValuesFromCarry(
             ])
         );
 
-        $clone->combinations_enabled = $carry->retrieve(
+        $clone->combinations = $carry->retrieve(
             self::FORM_KEY_ENABLE_COMBINATIONS,
             $refinery->byTrying([
-                $refinery->kindlyTo()->bool(),
-                $refinery->always($clone->combinations_enabled)
+                $refinery->custom()->transformation(
+                    fn($v): Combinations => $clone->combinations->withCombinationsEnabled(
+                        $refinery->kindlyTo()->bool()->transform($v)
+                    )
+                ),
+                $refinery->always($clone->combinations)
             ])
         );
 
@@ -333,7 +341,11 @@ public function toStorage(
             );
 
         return $this->gaps->toStorage(
-            $manipulate->withAdditionalStatement(
+            $this->addReplaceCombinationsStatements(
+                $manipulate,
+                $persistence,
+                $table_name_builder
+            )->withAdditionalStatement(
                 $answer_form_statement
             ),
             $persistence,
@@ -378,7 +390,10 @@ private function buildInsertAnswerFormStatement(
             [
                 new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
                 new Value(\ilDBConstants::T_TEXT, $this->scoring_identical->value),
-                new Value(\ilDBConstants::T_INTEGER, $this->combinations_enabled ? 1 : 0)
+                new Value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->combinations->areCombinationsEnabled() ? 1 : 0
+                )
             ]
         );
     }
@@ -392,12 +407,15 @@ private function buildUpdateAnswerFormStatement(
             $persistence->getColumns(
                 $table_name_builder,
                 $table_definition,
-                null,
+                '',
                 ['answer_form_id']
             ),
             [
                 new Value(\ilDBConstants::T_TEXT, $this->scoring_identical->value),
-                new Value(\ilDBConstants::T_INTEGER, $this->combinations_enabled ? 1 : 0)
+                new Value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->combinations->areCombinationsEnabled() ? 1 : 0
+                )
             ],
             [
                 new Where(
@@ -411,6 +429,23 @@ private function buildUpdateAnswerFormStatement(
         );
     }
 
+    private function addReplaceCombinationsStatements(
+        Manipulate $manipulate,
+        Persistence $persistence,
+        TableNameBuilder $table_name_builder
+    ): Manipulate {
+        if (!$this->combinations->areCombinationsEnabled()
+            || !$this->updated_combinations) {
+            return $manipulate;
+        }
+
+        return $this->combinations->toStorage(
+            $manipulate,
+            $persistence,
+            $table_name_builder
+        );
+    }
+
     private function buildDeleteAnswerFormStatement(
         Persistence $persistence,
         TableNameBuilder $table_name_builder
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 64eb908e2555..7f4acf5ed02e 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -27,15 +27,17 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
 use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Questions\Presentation\Layout\Async;
 use ILIAS\Questions\Presentation\Layout\EditForm;
 use ILIAS\Questions\Presentation\Layout\EditOverview;
+use ILIAS\Questions\Presentation\Layout\Renderable;
 use ILIAS\HTTP\Services as HTTPServices;
 use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
 use ILIAS\UI\Component\Modal\InterruptiveItem\Standard as InterruptiveItem;
-use ILIAS\UI\Component\Panel\Standard as StandardPanel;
-use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\URLBuilder;
 
 class Edit implements EditViewInterface
 {
@@ -52,6 +54,7 @@ class Edit implements EditViewInterface
     public function __construct(
         private readonly Language $lng,
         private readonly UIFactory $ui_factory,
+        private readonly \ilToolbarGUI $toolbar,
         private readonly Refinery $refinery,
         private readonly HTTPServices $http,
         private readonly PropertiesFactory $properties_factory,
@@ -78,6 +81,17 @@ public function edit(
     ): EditOverview|EditForm|Properties {
         $step = $environment->getStep();
 
+        $combinations = $environment->getAnswerFormProperties()->getCombinations();
+        if ($combinations->areCombinationsEnabled()) {
+            $combinations->getEditView(
+                $this->ui_factory,
+                $this->toolbar,
+                $this->refinery,
+                $this->lng,
+                $this->http
+            )->addCombinationsSubTab($environment);
+        }
+
         if ($step === '') {
             return $environment->getPresentationFactory()->getEditOverview(
                 $environment,
@@ -97,8 +111,23 @@ public function edit(
     #[\Override]
     public function other(
         Environment $environment
-    ): EditForm|Properties {
+    ): Async|Renderable|Properties {
+        return $environment
+            ->getAnswerFormProperties()
+            ->getCombinations()->getEditView(
+                $this->ui_factory,
+                $this->toolbar,
+                $this->refinery,
+                $this->lng,
+                $this->http
+            )->show($environment);
+    }
 
+    #[\Override]
+    public function getFinishEditingUrl(
+        Environment $environment
+    ): URLBuilder {
+        return $environment->getUrlBuilder();
     }
 
     private function callIntermediateStep(
@@ -116,8 +145,7 @@ private function callIntermediateStep(
                     $this->cloze_text_factory,
                     $this->gap_factory,
                     $environment->getPresentationFactory()->getCarrySectionData(
-                        $this->http->wrapper()->post(),
-                        $this->refinery
+                        $this->http->wrapper()->post()
                     )
                 )
             );
@@ -219,7 +247,11 @@ private function buildGapTypesForm(
             $properties->withClozeText($properties->getClozeText())
                 ->buildCarryInputs($ff)
         )->withContentBeforeForm(
-            $this->buildClozeTextPanel($properties)
+            $properties->getClozeText()->buildPanelForEditing(
+                $this->ui_factory,
+                $this->lng,
+                $properties->getGaps()
+            )
         );
     }
 
@@ -256,7 +288,11 @@ private function buildAnswerOptionsForm(
             false,
             $properties->buildCarryInputs($ff)
         )->withContentBeforeForm(
-            $this->buildClozeTextPanel($properties)
+            $properties->getClozeText()->buildPanelForEditing(
+                $this->ui_factory,
+                $this->lng,
+                $properties->getGaps()
+            )
         );
     }
 
@@ -293,7 +329,11 @@ private function buildAssignPointsForm(
             true,
             $properties->buildCarryInputs($ff)
         )->withContentBeforeForm(
-            $this->buildClozeTextPanel($properties)
+            $properties->getClozeText()->buildPanelForEditing(
+                $this->ui_factory,
+                $this->lng,
+                $properties->getGaps()
+            )
         );
     }
 
@@ -308,21 +348,12 @@ private function processAssignPointsForm(
         $data = $form->getData();
         return $data === null
             ? $form->withContentBeforeForm(
-                $this->buildClozeTextPanel($properties)
-            ) : $properties->withGaps($data);
-    }
-
-    private function buildClozeTextPanel(
-        Properties $properties
-    ): StandardPanel {
-        return $this->ui_factory->panel()->standard(
-            $this->lng->txt('cloze_text'),
-            $this->ui_factory->legacy()->content(
-                $properties->getClozeText()->getRenderedMarkdownForEditingPresentation(
+                $properties->getClozeText()->buildPanelForEditing(
+                    $this->ui_factory,
+                    $this->lng,
                     $properties->getGaps()
                 )
-            )
-        );
+            ) : $properties->withGaps($data);
     }
 
     /**
diff --git a/components/ILIAS/Questions/src/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
index 1b9f1f8a2bd0..156a9ea93283 100644
--- a/components/ILIAS/Questions/src/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -24,7 +24,6 @@
 use ILIAS\Questions\AnswerForm\Definition as AnswerFormDefinition;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Questions\Question\QuestionImplementation;
-use ILIAS\Questions\Setup\QuestionsMigration;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Refinery\Factory as Refinery;
diff --git a/components/ILIAS/Questions/src/Persistence/TableTypes.php b/components/ILIAS/Questions/src/Persistence/TableTypes.php
index 06116bfe7059..a12804600aa5 100644
--- a/components/ILIAS/Questions/src/Persistence/TableTypes.php
+++ b/components/ILIAS/Questions/src/Persistence/TableTypes.php
@@ -30,7 +30,7 @@ enum TableTypes
 
     public function getTable(
         TableNameBuilder $table_name_builder,
-        ?string $table_identifier = null
+        string $table_identifier = ''
     ): Table {
         return match($this) {
             self::Additional => new Table(
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php b/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
index 9c112f518e33..0ef27b1057ce 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
@@ -30,8 +30,11 @@ interface Environment
     public function setEditAnswerFormBackTarget(): void;
 
     public function addEditAnswerFormSubTab(
-        string $id,
-        string $text,
+        string $step,
+        string $text
+    ): void;
+
+    public function activateEditAnswerFormSubTab(
         string $step
     ): void;
 
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
index cc5adc752c91..f4baf4d425e7 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
@@ -22,6 +22,7 @@
 
 use ILIAS\Questions\AnswerForm\Properties;
 use ILIAS\Questions\Presentation\Layout\Factory;
+use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Data\URI;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
@@ -29,6 +30,7 @@
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
+use ILIAS\UI\Component\Input\Input;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
 
@@ -41,6 +43,7 @@ class EnvironmentImplementation implements Environment
     private const string TOKEN_STRING_QUESTION_IDS = 'qs';
     private const string TOKEN_TYPE_HASH = 't';
     private const string TOKEN_TABLE_ROW_ID = 'r';
+    private const string TOKEN_CARRY_ID = 'c';
 
     private const string INTERRUPTIVE_ITEMS_KEY = 'interruptive_items';
 
@@ -57,6 +60,7 @@ class EnvironmentImplementation implements Environment
     private readonly URLBuilderToken $question_ids_token;
     private readonly URLBuilderToken $type_hash_token;
     private readonly URLBuilderToken $table_row_token;
+    private readonly URLBuilderToken $carry_token;
 
     private ?array $table_row_ids = null;
 
@@ -87,17 +91,28 @@ public function setEditAnswerFormBackTarget(): void
 
     #[\Override]
     public function addEditAnswerFormSubTab(
-        string $id,
-        string $text,
-        string $step
+        string $step,
+        string $language_variable
     ): void {
         $this->tabs_gui->addSubTab(
-            $id,
-            $text,
-            $this->getUrlBuilderWithStepParameter($step)->buildURI()->__toString()
+            $step,
+            $this->lng->txt($language_variable),
+            $this->getUrlBuilderWithStepParameter($step)
+                ->withParameter(
+                    $this->action_token,
+                    Edit::CMD_OTHER_ANSWER_FORM
+                )->buildURI()
+                ->__toString()
         );
     }
 
+    #[\Override]
+    public function activateEditAnswerFormSubTab(
+        string $step
+    ): void {
+        $this->tabs_gui->activateSubTab($step);
+    }
+
     #[\Override]
     public function getPresentationFactory(): Factory
     {
@@ -237,6 +252,15 @@ public function withAnswerFormTypeHashParameter(
         return $clone;
     }
 
+    public function withCarryParameter(
+        string $carry
+    ): self {
+        $clone = clone $this;
+        $clone->url_builder = $this->url_builder
+            ->withParameter($this->carry_token, $carry);
+        return $clone;
+    }
+
     public function getQuestionId(): ?Uuid
     {
         return $this->http->wrapper()->query()->retrieve(
@@ -283,11 +307,20 @@ public function getQuestionIds(): array|string|null
         );
     }
 
-    public function getTypeClassHast(): string
+    public function getTypeClassHash(): string
     {
         return $this->retrieveStringValueForToken($this->type_hash_token);
     }
 
+    public function getCarry(
+        Transformation $to_form_transformation
+    ): Input|array|string|null {
+        return $this->http->wrapper()->query()->retrieve(
+            $this->carry_token->getName(),
+            $to_form_transformation
+        );
+    }
+
     public function setEditAnswerFormTabs(
         string $cmd_feedback,
         string $cmd_content_for_repetition
@@ -316,7 +349,14 @@ public function setEditAnswerFormTabs(
                 ->__toString()
         );
 
+        $this->tabs_gui->addSubTab(
+            self::TAB_ID_ANSWER_FORM,
+            $this->lng->txt('overview'),
+            $this->withDefaultStep()->getUrlBuilder()->buildURI()->__toString()
+        );
+
         $this->tabs_gui->activateTab(self::TAB_ID_ANSWER_FORM);
+        $this->tabs_gui->activateSubTab(self::TAB_ID_ANSWER_FORM);
     }
 
     public function setParametersForQuestionCmds(): void
@@ -338,7 +378,8 @@ private function acquireURLBuilderAndParameters(
             $this->question_id_token,
             $this->question_ids_token,
             $this->type_hash_token,
-            $this->table_row_token
+            $this->table_row_token,
+            $this->carry_token
         ] = (new URLBuilder($base_uri))
             ->acquireParameters(
                 self::QUERY_PARAMETER_NAME_SPACE,
@@ -347,7 +388,8 @@ private function acquireURLBuilderAndParameters(
                 self::TOKEN_STRING_QUESTION_ID,
                 self::TOKEN_STRING_QUESTION_IDS,
                 self::TOKEN_TYPE_HASH,
-                self::TOKEN_TABLE_ROW_ID
+                self::TOKEN_TABLE_ROW_ID,
+                self::TOKEN_CARRY_ID
             );
     }
 
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
index cad255b94886..3b6dfbd7c8b1 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
@@ -31,7 +31,7 @@
 use ILIAS\UI\Renderer as UIRenderer;
 use Psr\Http\Message\ServerRequestInterface;
 
-class EditForm
+class EditForm implements Renderable
 {
     private const string MAIN_SECTION_NAME = 'form';
     public const string CARRY_SECTION_NAME = 'carry';
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php b/components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php
index 440884a95599..fe795f394183 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php
@@ -29,7 +29,7 @@
 use ILIAS\UI\Renderer as UIRenderer;
 use Psr\Http\Message\ServerRequestInterface;
 
-class EditOverview
+class EditOverview implements Renderable
 {
     public function __construct(
         private readonly UIFactory $ui_factory,
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
index a2bc23fbc70d..77a0b02922a8 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
@@ -27,11 +27,13 @@
 use ILIAS\HTTP\Services as HttpService;
 use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Language\Language;
+use ILIAS\Refinery\Custom\Transformation as CustomTransformation;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Input\Input;
 use ILIAS\UI\Component\MessageBox\MessageBox;
 use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
 use ILIAS\UI\Component\Modal\RoundTrip as RoundTripModal;
@@ -40,6 +42,7 @@ class Factory
 {
     public function __construct(
         private readonly UIFactory $ui_factory,
+        private readonly Refinery $refinery,
         private readonly HttpService $http,
         private readonly Language $lng
     ) {
@@ -83,16 +86,33 @@ public function getAsync(
         );
     }
 
+    /**
+     * @param CustomTransformation $to_inputs This MUST return an `array` of
+     * inputs that will then be used in the form. The transformation will receive
+     * the string produced by `$to_carry` as parameter.
+     * @param Input|array|null $inputs If you provide inputs it is assumed that no
+     * carry is present and you want to use them directly.
+     */
+    public function getInputsBuilder(
+        CustomTransformation $to_inputs,
+        Input|array|null $inputs = null
+    ): InputsBuilder {
+        return new InputsBuilder(
+            $this->refinery,
+            $to_inputs,
+            $inputs
+        );
+    }
+
     public function getCarrySectionData(
-        ArrayBasedRequestWrapper $post_wrapper,
-        Refinery $refinery
+        ArrayBasedRequestWrapper $post_wrapper
     ): CarryWrapper {
         return new CarryWrapper(
             array_reduce(
                 $post_wrapper->keys(),
-                function (array $c, string $v) use ($post_wrapper, $refinery): array {
+                function (array $c, string $v) use ($post_wrapper): array {
                     $value = new Leaf(
-                        $post_wrapper->retrieve($v, $refinery->identity())
+                        $post_wrapper->retrieve($v, $this->refinery->identity())
                     );
                     foreach (array_reverse(explode('/', $v)) as $path_element) {
                         $value = [$path_element => $value];
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php b/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php
new file mode 100644
index 000000000000..6089cf295a80
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation\Layout;
+
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Custom\Transformation as CustomTransformation;
+use ILIAS\UI\Component\Input\Input;
+
+/**
+ * This is a InputBuilder for multipart forms. It allows you to carry the necessary
+ * information from one page of the form to the next in the query. Be aware that
+ * you are thoroughly limited in the amount of information that you can carry over,
+ * so make sure to just set the minimum you absolutely need.
+ */
+class InputsBuilder
+{
+    private ?string $carry = null;
+
+    public function __construct(
+        private readonly Refinery $refinery,
+        private readonly CustomTransformation $to_inputs,
+        private Input|array|null $inputs
+    ) {
+    }
+
+    /**
+     * @param string $carry The `string` will be `base64-encoded` before
+     * adding it to the `Query`. The string whill be passed to the `$to_inputs`
+     * to allow the recreation of the inputs.
+     */
+    public function withCarry(
+        string $carry
+    ): self {
+        $clone = clone $this;
+        $clone->carry = $carry;
+        return $clone;
+    }
+
+    public function addCarryToEnvironment(
+        EnvironmentImplementation $environment
+    ): Environment {
+        return $environment->withCarryParameter(
+            $this->carry === null
+                ? $environment->getCarry($this->refinery->identity())
+                : base64_encode($this->carry)
+        );
+    }
+
+    public function getInputs(
+        EnvironmentImplementation $environment
+    ): Input|array {
+        if ($this->inputs === null) {
+            $this->buildInputs($environment);
+        }
+
+        return $this->inputs;
+    }
+
+    private function buildInputs(
+        EnvironmentImplementation $environment
+    ): void {
+        $this->inputs = $environment->getCarry(
+            $this->refinery->custom()->transformation(
+                fn(string $v): Input|array => $this->to_inputs->transform(
+                    base64_decode($v)
+                )
+            )
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
index b6e87a2e7c11..8653b2a97b42 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
@@ -34,7 +34,7 @@
 use ILIAS\UI\Component\Input\Container\Filter\Standard as Filter;
 use Psr\Http\Message\ServerRequestInterface;
 
-class QuestionsTable implements DataRetrieval
+class QuestionsTable implements Renderable, DataRetrieval
 {
     public function __construct(
         private readonly UIFactory $ui_factory,
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Renderable.php b/components/ILIAS/Questions/src/Presentation/Layout/Renderable.php
index cad255b94886..522b6d0def13 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Renderable.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Renderable.php
@@ -20,139 +20,11 @@
 
 namespace ILIAS\Questions\Presentation\Layout;
 
-use ILIAS\Language\Language;
-use ILIAS\UI\Component\Input\Container\Form\Factory as FormFactory;
-use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
-use ILIAS\UI\Component\Input\Field\Section;
-use ILIAS\UI\Component\Input\Field\Group;
-use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
-use ILIAS\UI\Component\Panel\Standard as StandardPanel;
-use ILIAS\UI\URLBuilder;
 use ILIAS\UI\Renderer as UIRenderer;
-use Psr\Http\Message\ServerRequestInterface;
 
-class EditForm
+interface Renderable
 {
-    private const string MAIN_SECTION_NAME = 'form';
-    public const string CARRY_SECTION_NAME = 'carry';
-
-    private StandardForm $form;
-
-    private ?StandardPanel $content_before_form = null;
-    private ?StandardPanel $content_after_form = null;
-    private ?InterruptiveModal $confirmation = null;
-
-    public function __construct(
-        private readonly FormFactory $form_factory,
-        private readonly Language $lng,
-        private readonly URLBuilder $url_builder,
-        private readonly Section $main_section_inputs,
-        private readonly bool $is_final_step,
-        private readonly ?Group $carry_inputs
-    ) {
-        $this->form = $this->buildForm();
-    }
-
-    public function withContentBeforeForm(
-        StandardPanel $content
-    ): self {
-        $clone = clone $this;
-        $clone->content_before_form = $content;
-        return $clone;
-    }
-
-    public function withContentAfterForm(
-        StandardPanel $content
-    ): self {
-        $clone = clone $this;
-        $clone->content_after_form = $content;
-        return $clone;
-    }
-
-    public function withConfirmation(
-        InterruptiveModal $confirmation_modal
-    ): self {
-        $clone = clone $this;
-        $clone->confirmation = $confirmation_modal;
-        return $clone;
-    }
-
     public function render(
         UIRenderer $ui_renderer
-    ): string {
-        return $ui_renderer->render($this->buildContent());
-    }
-
-    public function withRequest(
-        ServerRequestInterface $request
-    ): self {
-        $clone = clone $this;
-        $clone->form = $clone->form->withRequest($request);
-        return $clone;
-    }
-
-    public function getData(): mixed
-    {
-        $data = $this->form->getData();
-        return $data[self::MAIN_SECTION_NAME] ?? null;
-    }
-
-    private function buildContent(): array
-    {
-        $content = [];
-
-        if ($this->content_before_form !== null) {
-            $content[] = $this->content_before_form;
-        }
-
-        if ($this->confirmation !== null) {
-            $content[] = $this->confirmation->withOnLoad(
-                $this->confirmation->getShowSignal()
-            )->withAdditionalOnLoadCode(
-                function ($id) {
-                    return "var button = {$id}.querySelector('input[type=\"submit\"]'); "
-                    . "button.addEventListener('click', (e) => {e.preventDefault();"
-                    . 'const form = button.closest("dialog").nextElementSibling;'
-                    . "form.action = '{$this->confirmation->getFormAction()}';"
-                    . 'form.submit();});';
-                }
-            );
-        }
-
-        $content[] = $this->form;
-
-        if ($this->content_after_form !== null) {
-            $content[] = $this->content_after_form;
-        }
-
-        return $content;
-    }
-
-    private function buildForm(): StandardForm
-    {
-        $form = $this->form_factory->standard(
-            $this->url_builder->buildURI()->__toString(),
-            $this->buildFormInputs()
-        );
-
-        if ($this->is_final_step) {
-            return $form->withSubmitLabel($this->lng->txt('save'));
-        }
-
-        return $form->withSubmitLabel($this->lng->txt('next'));
-    }
-
-    private function buildFormInputs(): array
-    {
-        $form_inputs = [
-            self::MAIN_SECTION_NAME => $this->main_section_inputs
-        ];
-
-        if ($this->carry_inputs !== null) {
-            $form_inputs[self::CARRY_SECTION_NAME] = $this->carry_inputs
-                ->withDedicatedName(self::CARRY_SECTION_NAME);
-        }
-
-        return $form_inputs;
-    }
+    ): string;
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index f4c1bb110701..5ed3121d0034 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -22,8 +22,8 @@
 
 use ILIAS\Questions\Presentation\Layout\Async;
 use ILIAS\Questions\Presentation\Layout\EditForm;
-use ILIAS\Questions\Presentation\Layout\EditOverview;
-use ILIAS\Questions\Presentation\Layout\Factory as DefinitionsFactory;
+use ILIAS\Questions\Presentation\Layout\Factory as LayoutFactory;
+use ILIAS\Questions\Presentation\Layout\Renderable;
 use ILIAS\Questions\Presentation\Definitions\Editability;
 use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Presentation\Layout\QuestionsTable;
@@ -31,7 +31,6 @@
 use ILIAS\Questions\AnswerForm\Definition;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
-use ILIAS\Questions\AnswerForm\TypeGenericProperties;
 use ILIAS\Questions\AnswerForm\Views\Edit as AnswerFormEditView;
 use ILIAS\Questions\Persistence\Repository;
 use ILIAS\Questions\Question\QuestionImplementation;
@@ -55,7 +54,7 @@ class Edit
     public const string CMD_EDIT_QUESTION = 'edit';
     public const string CMD_DELETE_QUESTION = 'delete';
     private const string CMD_CREATE_ANSWER_FORM = 'create_af';
-    private const string CMD_EDIT_ANSWER_FORM = 'edit_af';
+    public const string CMD_OTHER_ANSWER_FORM = 'other_af';
     private const string CMD_EDIT_FEEDBACK = 'edit_f';
     private const string CMD_EDIT_CONTENT_FOR_REPETITION = 'edit_cfr';
 
@@ -79,7 +78,7 @@ public function __construct(
         private readonly UuidFactory $uuid_factory,
         private readonly AnswerFormFactory $answer_form_factory,
         private readonly Repository $questions_repository,
-        private readonly DefinitionsFactory $definitions_factory
+        private readonly LayoutFactory $definitions_factory
     ) {
     }
 
@@ -108,7 +107,7 @@ public function withOrderingEnabled(
         return $clone;
     }
 
-    public function view(
+    public function show(
         \ilToolbarGUI $toolbar,
         URI $base_uri,
         int $obj_id,
@@ -180,7 +179,7 @@ public function createAnswerForm(
         )->withActionParameter(self::CMD_CREATE_ANSWER_FORM)
         ->withQuestionIdParameter($question->getId());
 
-        $answer_form_type_class_hash = $environment->getTypeClassHast();
+        $answer_form_type_class_hash = $environment->getTypeClassHash();
 
         if ($answer_form_type_class_hash !== '') {
             $type = $this->answer_form_factory
@@ -190,7 +189,8 @@ public function createAnswerForm(
                 $environment->withAnswerFormProperties(
                     $type->buildProperties(
                         $this->answer_form_factory->getDefaultTypeGenericProperties(
-                            $question->getId()
+                            $question->getId(),
+                            $type
                         ),
                         null
                     )
@@ -205,8 +205,7 @@ public function createAnswerForm(
             self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
                 $environment,
                 $question,
-                $content_object,
-                $this->answer_form_factory->getDefaultTypeGenericProperties($question->getId())
+                $content_object
             ),
             default => $this->buildCreateAnswerForm($environment)
         };
@@ -218,12 +217,11 @@ public function editAnswerForm(
         QuestionImplementation $question,
         AnswerFormProperties $answer_form_properties,
         Definition $type
-    ): Async|EditForm|EditOverview {
+    ): Async|Renderable {
         $environment = $this->buildEnvironment(
             $base_uri,
             $obj_id
         )->withAnswerFormProperties($answer_form_properties)
-        ->withActionParameter(self::CMD_EDIT_ANSWER_FORM)
         ->withQuestionIdParameter($question->getId());
 
         $environment->setEditAnswerFormTabs(
@@ -231,17 +229,26 @@ public function editAnswerForm(
             self::CMD_EDIT_CONTENT_FOR_REPETITION
         );
 
-        $edit = $type->getEditView()->edit($environment);
+        $edit_view = $type->getEditView();
 
-        if (!($edit instanceof AnswerFormProperties)) {
-            return $edit;
+        if ($environment->getAction() === self::CMD_OTHER_ANSWER_FORM) {
+            $environment = $environment->withActionParameter(self::CMD_OTHER_ANSWER_FORM);
+            $next = $edit_view->other($environment);
+        } else {
+            $next = $edit_view->edit($environment);
+        }
+
+        if (!($next instanceof AnswerFormProperties)) {
+            return $next;
         }
 
         $this->questions_repository->update(
-            [$question->withAnswerForm($edit)]
+            [$question->withAnswerForm($next)]
         );
 
-        $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
+        $this->ctrl->redirectToURL(
+            $edit_view->getFinishEditingUrl($environment)->buildURI()->__toString()
+        );
     }
 
     private function createQuestion(
@@ -382,8 +389,7 @@ private function showTable(
     private function processCreateAnswerForm(
         EnvironmentImplementation $environment,
         QuestionImplementation $question,
-        \ilPCAnswerForm $content_obj,
-        TypeGenericProperties $generic_answer_form_properties
+        \ilPCAnswerForm $content_object
     ): EditForm {
         $form = $this->buildCreateAnswerForm($environment)->withRequest($this->http->request());
 
@@ -393,14 +399,17 @@ private function processCreateAnswerForm(
             : $this->forwardCreateAnswerFormCmd(
                 $environment->withAnswerFormProperties(
                     $data->buildProperties(
-                        $generic_answer_form_properties,
+                        $this->answer_form_factory->getDefaultTypeGenericProperties(
+                            $question->getId(),
+                            $data
+                        ),
                         null
                     )
                 )->withAnswerFormTypeHashParameter(
                     $this->answer_form_factory->getHashedClass($data::class)
                 ),
                 $question,
-                $content_obj,
+                $content_object,
                 $data->getEditView()
             );
     }
@@ -408,7 +417,7 @@ private function processCreateAnswerForm(
     private function forwardCreateAnswerFormCmd(
         EnvironmentImplementation $environment,
         QuestionImplementation $question,
-        \ilPCAnswerForm $content_obj,
+        \ilPCAnswerForm $content_object,
         AnswerFormEditView $answer_form_edit_view
     ): ?EditForm {
         $create = $answer_form_edit_view->create($environment);
@@ -421,8 +430,8 @@ private function forwardCreateAnswerFormCmd(
             [$question->withAnswerForm($create)]
         );
 
-        $content_obj->create($create->getAnswerFormId());
-        $content_obj->getPage()->update();
+        $content_object->create($create->getAnswerFormId());
+        $content_object->getPage()->update();
 
         $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
     }
diff --git a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
index f9079f62090f..2ca3f8714441 100644
--- a/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/ClozeQuestionTables.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\Setup;
 
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
 
@@ -179,7 +180,10 @@ public function step_3(): void
 
     public function step_4(): void
     {
-        $table_name = $this->table_name_builder->getTableNameFor(TableTypes::Additional, 'combinations');
+        $table_name = $this->table_name_builder->getTableNameFor(
+            TableTypes::Additional,
+            Persistence::COMBINATION_TABLE_IDENTIFIER
+        );
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
                 'id' => [
@@ -192,11 +196,6 @@ public function step_4(): void
                     'length' => 64,
                     'notnull' => true
                 ],
-                'answer_options' => [
-                    'type' => \ilDBConstants::T_TEXT,
-                    'length' => 4000,
-                    'notnull' => true
-                ],
                 'points' => [
                     'type' => \ilDBConstants::T_FLOAT,
                     'notnull' => false
@@ -214,6 +213,46 @@ public function step_4(): void
     }
 
     public function step_5(): void
+    {
+        $table_name = $this->table_name_builder->getTableNameFor(
+            TableTypes::Additional,
+            Persistence::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER
+        );
+        if (!$this->db->tableExists($table_name)) {
+            $this->db->createTable($table_name, [
+                'combination_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'gap_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'answer_option_id' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 64,
+                    'notnull' => true
+                ],
+                'in_range' => [
+                    'type' => \ilDBConstants::T_TEXT,
+                    'length' => 16,
+                    'notnull' => false
+                ]
+            ]);
+        }
+
+        if (!$this->db->addPrimaryKey($table_name, ['combination_id', 'gap_id'])) {
+            $this->db->addPrimaryKey($table_name, ['combination_id', 'gap_id']);
+        }
+
+        if (!$this->db->indexExistsByFields($table_name, ['combination_id'])) {
+            $this->db->addIndex($table_name, ['combination_id'], 'ci');
+        }
+    }
+
+    public function step_6(): void
     {
         $table_name = $this->table_name_builder->getTableNameFor(TableTypes::Responses);
         if (!$this->db->tableExists($table_name)) {

From 70a3c1223d2e27c8f10f94dc5be85c4182fa0160 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 28 Jan 2026 15:58:43 +0100
Subject: [PATCH 101/141] Questions: Implementing Combinations

---
 .../Cloze/Layout/CombinationsOverview.php     |   6 +-
 .../Cloze/Migration/MigrationCloze.php        | 121 ++++++++++++++++-
 .../Cloze/Migration/MigrationTextSubset.php   | 122 ++++++++++++++++++
 .../Properties/Combinations/Combination.php   |  13 +-
 .../Cloze/Properties/Combinations/Factory.php |  29 +++--
 .../Properties/Combinations/MatchingValue.php |   9 +-
 6 files changed, 275 insertions(+), 25 deletions(-)
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
index 2e7733125b78..a0f344715a59 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
@@ -136,8 +136,8 @@ private function getColumns(): array
         $cf = $this->ui_factory->table()->column();
         return [
             'gaps' => $cf->text($this->lng->txt('gaps')),
-            'values' => $cf->text($this->lng->txt('combinations_awarding_points')),
-            'available_points' => $cf->number($this->lng->txt('available_points'))->withDecimals(2)
+            'values' => $cf->text($this->lng->txt('values')),
+            'available_points' => $cf->number($this->lng->txt('points'))->withDecimals(2)
         ];
     }
 
@@ -211,7 +211,7 @@ private function buildSetCombinationGapsModal(): RoundTripModal
                 )->withAdditionalTransformation(
                     $this->refinery->custom()->transformation(
                         fn(array $v): Combination => $this->combinations_factory
-                        ->buildNewCombination($v)
+                        ->buildNewCombination($gaps, $v)
                     )
                 )
             ],
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
index 6c5adb72b8f9..99133c7f92c3 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
@@ -24,8 +24,11 @@
 use ILIAS\Questions\AnswerForm\Migration\MigrationInsert;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations\InRange;
 use ILIAS\Questions\Definitions\TextMatchingOptions;
+use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\TableNameSpace;
+use ILIAS\Questions\Persistence\TableTypes;
 
 class MigrationCloze implements Migration
 {
@@ -60,6 +63,7 @@ public function buildInsertStatement(
         MigrationInsert $migration_insert
     ): MigrationInsert {
         $answer_input_mapping = [];
+        $answer_options_mapping = [];
         foreach ($this->fetchDBValues(
             $migration_insert->getDb(),
             $migration_insert->getOldQuestionId()
@@ -67,6 +71,7 @@ public function buildInsertStatement(
             $answer_form_id = $migration_insert->getAnswerFormId();
             if (!isset($answer_input_mapping[$db_row->gap_id])) {
                 $answer_input_mapping[$db_row->gap_id] = $migration_insert->getUuid();
+                $answer_options_mapping[$db_row->gap_id] = [];
                 $migration_insert = $migration_insert->withAdditionalInsert(
                     $this->buildGapInsertStatement(
                         $this->persistence,
@@ -84,11 +89,17 @@ public function buildInsertStatement(
                 );
             }
 
+            $answer_option_id = $migration_insert->getUuid();
+            $answer_options_mapping[$db_row->gap_id][$db_row->answertext] = [
+                'is_numeric' => $db_row->cloze_type == \assClozeGap::TYPE_NUMERIC,
+                'answer_option_id' => $answer_option_id
+            ];
+
             $migration_insert = $migration_insert->withAdditionalInsert(
                 $this->buildAnswerOptionInsertStatement(
                     $this->persistence,
                     $migration_insert->getTableNameBuilder(),
-                    $migration_insert->getUuid(),
+                    $answer_option_id,
                     $answer_input_mapping[$db_row->gap_id],
                     $db_row->aorder,
                     $db_row->answertext,
@@ -99,6 +110,14 @@ public function buildInsertStatement(
             );
         }
 
+        if ($db_row->combinations_enabled) {
+            $migration_insert = $this->addCombinationInserStatements(
+                $migration_insert,
+                $answer_input_mapping,
+                $answer_options_mapping
+            );
+        }
+
         return $migration_insert
             ->withAdditionalInsert(
                 $this->buildAnswerFormInsertStatement(
@@ -137,6 +156,91 @@ private function fetchDBValues(
         }
     }
 
+    private function fetchCombinationsDBValues(
+        \ilDBInterface $db,
+        int $old_question_id
+    ): \Generator {
+        $query = $db->query(
+            'SELECT combination_id, gap_fi, answer, points FROM qpl_a_cloze_combi_res' . PHP_EOL
+                . "WHERE question_fi = {$db->quote($old_question_id)}" . PHP_EOL
+                . 'ORDER BY combination_id, row_id'
+        );
+
+        while (($row = $db->fetchObject($query)) !== null) {
+            yield $row;
+        }
+    }
+
+    private function addCombinationInserStatements(
+        MigrationInsert $migration_insert,
+        array $answer_input_mapping,
+        array $answer_options_mapping
+    ): MigrationInsert {
+        $combination_mapping = [];
+        foreach ($this->fetchCombinationsDBValues(
+            $migration_insert->getDb(),
+            $migration_insert->getOldQuestionId()
+        ) as $db_row) {
+            if (!isset($combination_mapping[$db_row->combination_id . $db_row->row_id])) {
+                $combination_mapping[$db_row->combination_id . $db_row->row_id] = $migration_insert->getUuid();
+                $migration_insert = $migration_insert->withAdditionalInsert(
+                    new Insert(
+                        $this->persistence->getColumns(
+                            $this->persistence->getTableNameSpace(),
+                            TableTypes::Additional,
+                            $this->persistence->getCombinationsTableIdentifier()
+                        ),
+                        [
+                            new Value(
+                                \ilDBConstants::T_TEXT,
+                                $combination_mapping[$db_row->combination_id . $db_row->row_id]->toString()
+                            ),
+                            new Value(
+                                \ilDBConstants::T_TEXT,
+                                $migration_insert->getAnswerFormId()->toString()
+                            ),
+                            new Value(\ilDBConstants::T_FLOAT, $db_row->points),
+                        ]
+                    )
+                );
+            }
+
+            $answer_option = $db_row->answer === 'out_of_bound'
+                ? reset($answer_options_mapping[$db_row->gap_fi])
+                : $answer_options_mapping[$db_row->gap_fi][$db_row->answer];
+
+            $migration_insert = $migration_insert->withAdditionalInsert(
+                new Insert(
+                    $this->persistence->getColumns(
+                        $this->persistence->getTableNameSpace(),
+                        TableTypes::Additional,
+                        $this->persistence->getCombinationToAnswerOptionsTableIdentifier()
+                    ),
+                    [
+                        new Value(
+                            \ilDBConstants::T_TEXT,
+                            $combination_mapping[$db_row->combination_id . $db_row->row_id]->toString()
+                        ),
+                        new Value(
+                            \ilDBConstants::T_TEXT,
+                            $answer_input_mapping[$db_row->gap_fi]
+                        ),
+                        new Value(
+                            \ilDBConstants::T_TEXT,
+                            $answer_option['answer_option_id']
+                        ),
+                        new Value(
+                            \ilDBConstants::T_TEXT,
+                            $this->buildRangeValue($answer_option['is_numeric'], $db_row->answer)
+                        ),
+                    ]
+                )
+            );
+        }
+
+        return $migration_insert;
+    }
+
     private function buildNewGapTypeIdentifierFromOld(
         int $old_gap_type
     ): string {
@@ -160,4 +264,19 @@ private function buildNewTextRatingFromOld(
             \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN5 => TextMatchingOptions::Levenstein5
         };
     }
+
+    private function buildRangeValue(
+        bool $is_numeric,
+        string $value
+    ): ?string {
+        if ($is_numeric === null) {
+            return null;
+        }
+
+        if ($value === 'out_of_bounds') {
+            return InRange::OutOfRange->value;
+        }
+
+        return InRange::InRange->value;
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
new file mode 100644
index 000000000000..ad9825006ed1
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Migration;
+
+use ILIAS\Questions\AnswerForm\Migration\Migration;
+use ILIAS\Questions\AnswerForm\Migration\MigrationInsert;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
+use ILIAS\Questions\Persistence\TableNameSpace;
+
+class MigrationNumeric implements Migration
+{
+    use BasicMigrationFunctions;
+
+    public function __construct(
+        private readonly Persistence $persistence,
+        private readonly \EvalMath $math
+    ) {
+        $this->math->suppress_errors = true;
+    }
+
+    #[\Override]
+    public function getOldQuestionIdentifier(): string
+    {
+        return 'assNumeric';
+    }
+
+    #[\Override]
+    public function getDefinitionClass(): string
+    {
+        return Definition::class;
+    }
+
+    #[\Override]
+    public function getTableNameSpace(): TableNameSpace
+    {
+        return $this->persistence->getTableNameSpace();
+    }
+
+    #[\Override]
+    public function buildInsertStatement(
+        MigrationInsert $migration_insert
+    ): MigrationInsert {
+        $db_row = $this->fetchDBValues(
+            $migration_insert->getDb(),
+            $migration_insert->getOldQuestionId()
+        )->current();
+
+        $answer_form_id = $migration_insert->getAnswerFormId();
+        $gap_id = $migration_insert->getUuid();
+        return $migration_insert->withAdditionalInsert(
+            $this->buildGapInsertStatement(
+                $this->persistence,
+                $migration_insert->getTableNameBuilder(),
+                $gap_id,
+                $answer_form_id,
+                0,
+                'numeric',
+                null,
+                0.0001,
+                null,
+                null,
+                null
+            )
+        )->withAdditionalInsert(
+            $this->buildAnswerOptionInsertStatement(
+                $this->persistence,
+                $migration_insert->getTableNameBuilder(),
+                $migration_insert->getUuid(),
+                $gap_id,
+                0,
+                '',
+                $db_row->points,
+                $this->limitToFloat($this->math, $db_row->lowerlimit),
+                $this->limitToFloat($this->math, $db_row->upperlimit)
+            )
+        )->withAdditionalInsert(
+            $this->buildAnswerFormInsertStatement(
+                $this->persistence,
+                $migration_insert->getTableNameBuilder(),
+                $answer_form_id,
+                ScoringIdentical::ScoreAll,
+                0
+            )
+        )->withAdditionalTextLegacy(
+            '{{' . Gap::GAP_PLACEHOLDER_NAME . '_' . array_shift($gap_id->toString()) . '}}'
+        );
+    }
+
+    private function fetchDBValues(
+        \ilDBInterface $db,
+        int $old_question_id
+    ): \Generator {
+        $query = $db->query(
+            'SELECT points, lowerlimit, upperlimit FROM qpl_num_range' . PHP_EOL
+            . "WHERE q.question_fi = {$db->quote($old_question_id)}"
+        );
+
+        while (($row = $db->fetchObject($query)) !== null) {
+            yield $row;
+        }
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
index c8d31c083c9f..8ba82d26f080 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
@@ -74,12 +74,12 @@ public function getValuePresentation(
         Language $lng
     ): string {
         return implode(
-            ' - ',
+            '<br>',
             array_map(
                 fn(MatchingValue $v): string => $v->buildPresentationString($lng),
                 $this->matching_values
             )
-        ) . " ({$this->available_points})";
+        );
     }
 
     public function containsAnswerOptionsExactly(
@@ -226,7 +226,7 @@ public function buildGapsString(): string
         return implode(
             '<br>',
             array_map(
-                fn(MatchingValue $v): string => $v->getGapId()->toString(),
+                fn(MatchingValue $v): string => $v->getGap()->buildShortenedGapRepresentation(),
                 $this->matching_values
             )
         );
@@ -281,7 +281,7 @@ public function buildCarryString(): string
     {
         return json_encode([
             $this->id->toString() => array_map(
-                fn(MatchingValue $v) => $v->getGapId()->toString(),
+                fn(MatchingValue $v) => $v->getGap()->getAnswerInputId()->toString(),
                 $this->matching_values
             )
         ]);
@@ -295,8 +295,9 @@ private function buildValuesInputs(
             array_reduce(
                 $this->matching_values,
                 function (array $c, MatchingValue $v) use ($field_factory, $properties): array {
-                    $gap = $properties->getGaps()->getGapById($v->getGapId());
-                    $c[$v->getGapId()->toString()] = $field_factory->select(
+                    $gap_id = $v->getGap()->getAnswerInputId();
+                    $gap = $properties->getGaps()->getGapById($gap_id);
+                    $c[$gap_id] = $field_factory->select(
                         $gap->buildShortenedGapName(),
                         $gap->getType()->getCombinationsSelectValues($gap)
                     )->withRequired(true)
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
index 0c734d0a9b7d..609c3141ac2a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
@@ -69,6 +69,7 @@ public function getCombinations(
      * @param array<string> $gap_ids
      */
     public function buildNewCombination(
+        Gaps $gaps,
         array $gap_ids,
     ): Combination {
         $combination_id = $this->uuid_factory->uuid4();
@@ -78,7 +79,9 @@ public function buildNewCombination(
             array_map(
                 fn(string $v): MatchingValue => new MatchingValue(
                     $combination_id,
-                    $this->uuid_factory->fromString($v)
+                    $gaps->getGapById(
+                        $this->uuid_factory->fromString($v)
+                    )
                 ),
                 $gap_ids
             )
@@ -115,10 +118,11 @@ function (array $c, string $v) use (
                 $values_array,
                 $combination_id
             ): array {
-                $gap_id = $this->uuid_factory->fromString($v);
-                $answer_option = $properties->getGaps()
-                    ->getGapById($gap_id)
-                    ->getAnswerOptions()
+                $gap = $properties->getGaps()->getGapById(
+                    $this->uuid_factory->fromString($v)
+                );
+                $answer_option =
+                    $gap->getAnswerOptions()
                     ->getAnswerOptionById(
                         $this->uuid_factory->fromString($values_array[$v])
                     );
@@ -129,7 +133,7 @@ function (array $c, string $v) use (
 
                 $c[] = new MatchingValue(
                     $combination_id,
-                    $gap_id,
+                    $gap,
                     $answer_option,
                     null
                 );
@@ -162,7 +166,9 @@ function (string $v) use (
                     array_map(
                         fn(string $v): MatchingValue => new MatchingValue(
                             $combination_id,
-                            $this->uuid_factory->fromString($v)
+                            $properties->getGaps()->getGapById(
+                                $this->uuid_factory->fromString($v)
+                            )
                         ),
                         $values_array[$combination_id->toString()]
                     )
@@ -255,15 +261,16 @@ function (array $vs) use (
 
                         $already_added[] = $v['combination_id'] . $v['gap_id'];
 
-                        $gap_id = $this->uuid_factory->fromString($v['gap_id']);
+                        $gap = $gaps->getGapById(
+                            $this->uuid_factory->fromString($v['gap_id'])
+                        );
 
                         $combinations[$v['combination_id']] = $combinations[$v['combination_id']]
                             ->withAdditionalMatchingValue(
                                 new MatchingValue(
                                     $this->uuid_factory->fromString($v['combination_id']),
-                                    $gap_id,
-                                    $gaps->getGapById($gap_id)
-                                        ->getAnswerOptions()
+                                    $gap,
+                                    $gap->getAnswerOptions()
                                         ->getAnswerOptionById(
                                             $this->uuid_factory->fromString($v['answer_option_id'])
                                         )
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php
index a30a9f6d12de..6f7a97fbc520 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php
@@ -21,6 +21,7 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations;
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\Persistence\Replace;
 use ILIAS\Questions\Persistence\TableNameBuilder;
@@ -36,15 +37,15 @@ class MatchingValue
 
     public function __construct(
         private readonly Uuid $combination_id,
-        private readonly Uuid $gap_id,
+        private readonly Gap $gap,
         private readonly ?AnswerOption $answer_option = null,
         private readonly ?InRange $in_range = null
     ) {
     }
 
-    public function getGapId(): Uuid
+    public function getGap(): Gap
     {
-        return $this->gap_id;
+        return $this->gap;
     }
 
     public function getAnswerOption(): ?AnswerOption
@@ -90,7 +91,7 @@ public function toStorage(
             ),
             [
                 new Value(\ilDBConstants::T_TEXT, $this->combination_id->toString()),
-                new Value(\ilDBConstants::T_TEXT, $this->gap_id->toString()),
+                new Value(\ilDBConstants::T_TEXT, $this->gap->getAnswerInputId()->toString()),
                 new Value(\ilDBConstants::T_TEXT, $this->answer_option->getAnswerOptionId()->toString()),
                 new Value(\ilDBConstants::T_TEXT, $this->in_range?->value)
             ]

From 7c8c16ec9f341e39fab9574b744c58163b01f667 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 28 Jan 2026 15:59:05 +0100
Subject: [PATCH 102/141] Questions: Add LangVar For AnswerForm

---
 lang/ilias_de.lang | 1 +
 lang/ilias_en.lang | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index fd266bc696db..e780c27cd7f8 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -14043,6 +14043,7 @@ qpl#:#qpl_page_type_qfbg#:#Generelles Feedback
 qpl#:#qpl_page_type_qfbs#:#Spezielles Feedback
 qpl#:#qpl_page_type_qht#:#Hinweis
 qpl#:#qpl_page_type_qpl#:#Fragenseite
+qsts#:#answer_form#:#Antwort Formular
 qsts#:#cloze_enable_combinations#:#Enable Gap Combination
 qsts#:#cont_ed_insert_answf#:#Antwortformular einfügen
 qsts#:#create_answer_form#:#Antwortformular erstellen
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index ca4200875e3d..f8d7c6567aae 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -14016,6 +14016,7 @@ qpl#:#qpl_page_type_qfbg#:#General Feedback
 qpl#:#qpl_page_type_qfbs#:#Special Feedback
 qpl#:#qpl_page_type_qht#:#Hint
 qpl#:#qpl_page_type_qpl#:#Question Page
+qsts#:#answer_form#:#Answer Form
 qsts#:#cloze_enable_combinations#:#Lückenkombinationen aktivieren
 qsts#:#cont_ed_insert_answf#:#Insert Answer Form
 qsts#:#create_answer_form#:#Create Answer Form

From 5c8b3212d048580f6f6e3c90a4b923a062dec2b5 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 28 Jan 2026 16:19:57 +0100
Subject: [PATCH 103/141] Questions: Implement Migration For TextSubset

---
 .../Cloze/Migration/MigrationTextSubset.php   | 100 +++++++++---------
 1 file changed, 52 insertions(+), 48 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
index ad9825006ed1..2b5af74ffdeb 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
@@ -26,22 +26,21 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\Persistence\TableNameSpace;
+use ILIAS\Data\UUID\Uuid;
 
-class MigrationNumeric implements Migration
+class MigrationTextSubset implements Migration
 {
     use BasicMigrationFunctions;
 
     public function __construct(
-        private readonly Persistence $persistence,
-        private readonly \EvalMath $math
+        private readonly Persistence $persistence
     ) {
-        $this->math->suppress_errors = true;
     }
 
     #[\Override]
     public function getOldQuestionIdentifier(): string
     {
-        return 'assNumeric';
+        return 'assTextSubset';
     }
 
     #[\Override]
@@ -60,50 +59,54 @@ public function getTableNameSpace(): TableNameSpace
     public function buildInsertStatement(
         MigrationInsert $migration_insert
     ): MigrationInsert {
-        $db_row = $this->fetchDBValues(
+        $gaps = [];
+        foreach ($this->fetchDBValues(
             $migration_insert->getDb(),
             $migration_insert->getOldQuestionId()
-        )->current();
+        ) as $db_row) {
+            $answer_form_id = $migration_insert->getAnswerFormId();
 
-        $answer_form_id = $migration_insert->getAnswerFormId();
-        $gap_id = $migration_insert->getUuid();
-        return $migration_insert->withAdditionalInsert(
-            $this->buildGapInsertStatement(
-                $this->persistence,
-                $migration_insert->getTableNameBuilder(),
-                $gap_id,
-                $answer_form_id,
-                0,
-                'numeric',
-                null,
-                0.0001,
-                null,
-                null,
-                null
-            )
-        )->withAdditionalInsert(
-            $this->buildAnswerOptionInsertStatement(
-                $this->persistence,
-                $migration_insert->getTableNameBuilder(),
-                $migration_insert->getUuid(),
-                $gap_id,
-                0,
-                '',
-                $db_row->points,
-                $this->limitToFloat($this->math, $db_row->lowerlimit),
-                $this->limitToFloat($this->math, $db_row->upperlimit)
-            )
-        )->withAdditionalInsert(
-            $this->buildAnswerFormInsertStatement(
-                $this->persistence,
-                $migration_insert->getTableNameBuilder(),
-                $answer_form_id,
-                ScoringIdentical::ScoreAll,
-                0
-            )
-        )->withAdditionalTextLegacy(
-            '{{' . Gap::GAP_PLACEHOLDER_NAME . '_' . array_shift($gap_id->toString()) . '}}'
-        );
+            if ($gaps === []) {
+                for ($i = 0; $i < $db_row->correctanswers; $i++) {
+                    $gaps[] = $migration_insert->getUuid();
+                }
+            }
+
+            foreach ($gaps as $gap_id) {
+                $migration_insert = $migration_insert->withAdditionalInsert(
+                    $this->buildAnswerOptionInsertStatement(
+                        $this->persistence,
+                        $migration_insert->getTableNameBuilder(),
+                        $migration_insert->getUuid(),
+                        $gap_id,
+                        $db_row->aorder,
+                        $db_row->answertext,
+                        $db_row->points,
+                        null,
+                        null
+                    )
+                );
+            }
+        }
+
+        return $migration_insert
+            ->withAdditionalInsert(
+                $this->buildAnswerFormInsertStatement(
+                    $this->persistence,
+                    $migration_insert->getTableNameBuilder(),
+                    $answer_form_id,
+                    ScoringIdentical::OnlyScoreDistinct,
+                    false
+                )
+            )->withAdditionalText(
+                implode(
+                    "\n\n",
+                    array_map(
+                        fn(Uuid $v) => "{{GAP_{$v->toString()}}}",
+                        $gaps,
+                    )
+                )
+            );
     }
 
     private function fetchDBValues(
@@ -111,8 +114,9 @@ private function fetchDBValues(
         int $old_question_id
     ): \Generator {
         $query = $db->query(
-            'SELECT points, lowerlimit, upperlimit FROM qpl_num_range' . PHP_EOL
-            . "WHERE q.question_fi = {$db->quote($old_question_id)}"
+            'SELECT * FROM qpl_qst_textsubset q' . PHP_EOL
+            . 'JOIN qpl_a_textsubset a ON q.question_fi = a.question_fi' . PHP_EOL
+            . "WHERE q.question_fi = {$db->quote($old_question_id)}" . PHP_EOL
         );
 
         while (($row = $db->fetchObject($query)) !== null) {

From e25908a18255ae49b7bd9af136c7f2bf44da2a12 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 28 Jan 2026 16:21:29 +0100
Subject: [PATCH 104/141] Questions: Implement Migration For TextSubset

---
 components/ILIAS/Questions/Questions.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/ILIAS/Questions/Questions.php b/components/ILIAS/Questions/Questions.php
index 66a3852d69c8..0354c1e3430b 100644
--- a/components/ILIAS/Questions/Questions.php
+++ b/components/ILIAS/Questions/Questions.php
@@ -25,6 +25,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Migration\MigrationCloze;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Migration\MigrationLongMenu;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Migration\MigrationNumeric;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Migration\MigrationTextSubset;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\Persistence\TableNameSpaceCore;
 use ILIAS\Questions\Setup\Agent;
@@ -58,6 +59,9 @@ public function init(
             $internal[Persistence::class],
             $internal[\EvalMath::class]
         );
+        $contribute[AnswerFormMigration::class] = static fn() => new MigrationTextSubset(
+            $internal[Persistence::class]
+        );
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\ComponentJS($this, 'js/dist/ParticipantViewLongMenu.js');
 

From 37e0fc8282b5506a033e348354f98853d4f18f17 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 28 Jan 2026 18:36:06 +0100
Subject: [PATCH 105/141] Questions: Speedup Loading Lists

---
 .../Questions/src/Persistence/Repository.php  | 49 ++++++++++++++++---
 .../Presentation/Layout/QuestionsTable.php    |  2 +-
 .../Questions/src/Presentation/Views/Edit.php |  6 +--
 .../src/Question/QuestionImplementation.php   | 42 ++++++++++++++++
 4 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/components/ILIAS/Questions/src/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
index 156a9ea93283..aa9eda087481 100644
--- a/components/ILIAS/Questions/src/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -50,15 +50,48 @@ public function getNew(
     /**
      * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
      */
-    public function getAllQuestions(): \Generator
+    public function getQuestionDataOnlyForAllQuestions(): \Generator
     {
-        yield from $this->getForBaseQuery(
-            new Query(
-                $this->db,
-                $this->answer_form_factory,
-                $this->refinery
+        foreach ((new Query(
+            $this->db,
+            $this->answer_form_factory,
+            $this->refinery
+        ))->loadNextRecord() as $query_with_record) {
+            yield $this->retrieveQuestionFromQuery(
+                $query_with_record,
+                []
+            );
+        }
+    }
+
+    /**
+     * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
+     */
+    public function getQuestionDataOnlyForQuestionIds(
+        array $question_ids
+    ): \Generator {
+        foreach ((new Query(
+            $this->db,
+            $this->answer_form_factory,
+            $this->refinery
+        )->withAdditionalWhere(
+            new Where(
+                CoreTables::Questions->getIdColumn(),
+                new Value(
+                    \ilDBConstants::T_TEXT,
+                    array_map(
+                        fn(Uuid $v): string => $v->toString(),
+                        $question_ids
+                    )
+                ),
+                Operator::In
             )
-        );
+        ))->loadNextRecord() as $query_with_record) {
+            yield $this->retrieveQuestionFromQuery(
+                $query_with_record,
+                []
+            );
+        }
     }
 
     public function getForQuestionId(
@@ -219,7 +252,7 @@ private function retrieveQuestionFromQuery(
             )
         );
 
-        if ($question->getPageId() !== 0) {
+        if ($answer_forms === [] || $question->getPageId() !== 0) {
             return $question;
         }
 
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
index 8653b2a97b42..ce58b1f44cc9 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
@@ -67,7 +67,7 @@ public function getRows(
         $environment_with_action = $this->environment->withActionParameter(
             Edit::CMD_EDIT_QUESTION
         );
-        foreach ($this->questions_repository->getAllQuestions() as $question) {
+        foreach ($this->questions_repository->getQuestionDataOnlyForAllQuestions() as $question) {
             yield $question->toTableRow(
                 $row_builder,
                 $this->ui_factory,
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 5ed3121d0034..76e95d60b572 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -491,7 +491,7 @@ private function buildItemGroupForQuestionListSlate(
                         $environment->withActionParameter(self::CMD_EDIT_QUESTION)
                     )
                 ),
-                iterator_to_array($this->questions_repository->getAllQuestions())
+                iterator_to_array($this->questions_repository->getQuestionDataOnlyForAllQuestions())
             )
         );
     }
@@ -545,8 +545,8 @@ private function buildAffectedItems(
         string|array $question_ids
     ): array {
         $questions = $question_ids === 'ALL_OBJECTS'
-                ? $this->questions_repository->getAllQuestions()
-                : $this->questions_repository->getForQuestionIds($question_ids);
+                ? $this->questions_repository->getQuestionDataOnlyForAllQuestions()
+                : $this->questions_repository->getQuestionDataOnlyForQuestionIds($question_ids);
         $affected_items = [];
         foreach ($questions as $question) {
             $affected_items[] = $this->ui_factory->modal()->interruptiveItem()->standard(
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index 5eba94dd88b1..dc53fde12789 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -319,6 +319,10 @@ public function toDelete(
         return $this->addDeleteAnswerFormsStatementsToManipulate(
             $manipulate->withAdditionalStatement(
                 $this->buildDeleteQuestionStatement()
+            )->withAdditionalStatement(
+                $this->buildDeleteLinkingStatement()
+            )->withAdditionalStatement(
+                $this->buildDeleteMigrationStatement()
             ),
             $this->answer_forms
         );
@@ -509,6 +513,44 @@ private function buildDeleteQuestionStatement(): Delete
         );
     }
 
+    private function buildDeleteLinkingStatement(): Delete
+    {
+        $table_definition = CoreTables::Linking;
+        return new Delete(
+            $table_definition->getTable(),
+            [
+                new Where(
+                    $table_definition->getIdColumn(),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        $this->id->toString()
+                    )
+                )
+            ]
+        );
+    }
+
+    /**
+     * skergomard, 2026-01-86: This we only need while the migrations exist, after
+     * this MUST go!
+     */
+    private function buildDeleteMigrationStatement(): Delete
+    {
+        $table_definition = CoreTables::MigrationsTable;
+        return new Delete(
+            $table_definition->getTable(),
+            [
+                new Where(
+                    $table_definition->getIdColumn(),
+                    new Value(
+                        \ilDBConstants::T_TEXT,
+                        $this->id->toString()
+                    )
+                )
+            ]
+        );
+    }
+
     /**
      * skergomard, 2026-01-26: This we only need while the migrations exist, after
      * this a question MUST never change the page assigned to it after its creation!

From f047d0ea8d3c7cc6cbee05632ce355c7716706fb Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 29 Jan 2026 13:00:42 +0100
Subject: [PATCH 106/141] Questions: Improvements in Migration and Display

---
 .../src/AnswerForm/Migration/Migration.php    |  6 +-
 .../Cloze/Migration/MigrationCloze.php        | 35 +++++---
 .../Cloze/Migration/MigrationLongMenu.php     | 25 ++++--
 .../Cloze/Migration/MigrationNumeric.php      | 19 +++--
 .../Cloze/Migration/MigrationTextSubset.php   | 15 +++-
 .../Cloze/Properties/Gaps/Factory.php         |  3 +-
 .../Questions/src/Persistence/CoreTables.php  |  3 +-
 .../Questions/src/Persistence/JoinType.php    |  2 +-
 .../ILIAS/Questions/src/Persistence/Query.php | 13 +--
 .../Questions/src/Persistence/Repository.php  |  6 +-
 .../Presentation/Layout/QuestionsTable.php    |  5 +-
 .../Questions/src/Presentation/Views/Edit.php | 62 +++++++++-----
 .../src/Setup/OverarchingQuestionTables.php   | 11 ++-
 .../src/Setup/QuestionsMigration.php          | 84 +++++++++++--------
 14 files changed, 187 insertions(+), 102 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerForm/Migration/Migration.php b/components/ILIAS/Questions/src/AnswerForm/Migration/Migration.php
index 590824fb049c..326bb0349021 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Migration/Migration.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Migration/Migration.php
@@ -21,6 +21,7 @@
 namespace ILIAS\Questions\AnswerForm\Migration;
 
 use ILIAS\Questions\Persistence\TableNameSpace;
+use ILIAS\Setup\Environment;
 
 interface Migration
 {
@@ -34,7 +35,8 @@ public function getDefinitionClass(): string;
 
     public function getTableNameSpace(): TableNameSpace;
 
-    public function buildInsertStatement(
+    public function completeMigrationInsert(
+        Environment $environment,
         MigrationInsert $migration_insert
-    ): MigrationInsert;
+    ): ?MigrationInsert;
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
index 99133c7f92c3..fed99b2ddaaf 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
@@ -29,6 +29,8 @@
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\TableNameSpace;
 use ILIAS\Questions\Persistence\TableTypes;
+use ILIAS\Questions\Persistence\Value;
+use ILIAS\Setup\Environment;
 
 class MigrationCloze implements Migration
 {
@@ -59,11 +61,13 @@ public function getTableNameSpace(): TableNameSpace
     }
 
     #[\Override]
-    public function buildInsertStatement(
+    public function completeMigrationInsert(
+        Environment $environment,
         MigrationInsert $migration_insert
-    ): MigrationInsert {
+    ): ?MigrationInsert {
         $answer_input_mapping = [];
         $answer_options_mapping = [];
+
         foreach ($this->fetchDBValues(
             $migration_insert->getDb(),
             $migration_insert->getOldQuestionId()
@@ -110,6 +114,10 @@ public function buildInsertStatement(
             );
         }
 
+        if (!isset($db_row)) {
+            return null;
+        }
+
         if ($db_row->combinations_enabled) {
             $migration_insert = $this->addCombinationInserStatements(
                 $migration_insert,
@@ -161,7 +169,7 @@ private function fetchCombinationsDBValues(
         int $old_question_id
     ): \Generator {
         $query = $db->query(
-            'SELECT combination_id, gap_fi, answer, points FROM qpl_a_cloze_combi_res' . PHP_EOL
+            'SELECT combination_id, gap_fi, answer, points, row_id FROM qpl_a_cloze_combi_res' . PHP_EOL
                 . "WHERE question_fi = {$db->quote($old_question_id)}" . PHP_EOL
                 . 'ORDER BY combination_id, row_id'
         );
@@ -181,12 +189,21 @@ private function addCombinationInserStatements(
             $migration_insert->getDb(),
             $migration_insert->getOldQuestionId()
         ) as $db_row) {
+            if ($db_row->answer !== 'out_of_bound'
+                && !isset($answer_options_mapping[$db_row->gap_fi][$db_row->answer])) {
+                continue;
+            }
+
+            $answer_option = $db_row->answer === 'out_of_bound'
+                ? reset($answer_options_mapping[$db_row->gap_fi])
+                : $answer_options_mapping[$db_row->gap_fi][$db_row->answer];
+
             if (!isset($combination_mapping[$db_row->combination_id . $db_row->row_id])) {
                 $combination_mapping[$db_row->combination_id . $db_row->row_id] = $migration_insert->getUuid();
                 $migration_insert = $migration_insert->withAdditionalInsert(
                     new Insert(
                         $this->persistence->getColumns(
-                            $this->persistence->getTableNameSpace(),
+                            $migration_insert->getTableNameBuilder(),
                             TableTypes::Additional,
                             $this->persistence->getCombinationsTableIdentifier()
                         ),
@@ -205,14 +222,10 @@ private function addCombinationInserStatements(
                 );
             }
 
-            $answer_option = $db_row->answer === 'out_of_bound'
-                ? reset($answer_options_mapping[$db_row->gap_fi])
-                : $answer_options_mapping[$db_row->gap_fi][$db_row->answer];
-
             $migration_insert = $migration_insert->withAdditionalInsert(
                 new Insert(
                     $this->persistence->getColumns(
-                        $this->persistence->getTableNameSpace(),
+                        $migration_insert->getTableNameBuilder(),
                         TableTypes::Additional,
                         $this->persistence->getCombinationToAnswerOptionsTableIdentifier()
                     ),
@@ -223,11 +236,11 @@ private function addCombinationInserStatements(
                         ),
                         new Value(
                             \ilDBConstants::T_TEXT,
-                            $answer_input_mapping[$db_row->gap_fi]
+                            $answer_input_mapping[$db_row->gap_fi]->toString()
                         ),
                         new Value(
                             \ilDBConstants::T_TEXT,
-                            $answer_option['answer_option_id']
+                            $answer_option['answer_option_id']->toString()
                         ),
                         new Value(
                             \ilDBConstants::T_TEXT,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
index 59b622f36ed3..842d9f8d6b4d 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
@@ -25,6 +25,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\Persistence\TableNameSpace;
+use ILIAS\Setup\Environment;
 
 class MigrationLongMenu implements Migration
 {
@@ -54,9 +55,10 @@ public function getTableNameSpace(): TableNameSpace
     }
 
     #[\Override]
-    public function buildInsertStatement(
+    public function completeMigrationInsert(
+        Environment $environment,
         MigrationInsert $migration_insert
-    ): MigrationInsert {
+    ): ?MigrationInsert {
         $answer_input_mapping = [];
 
         foreach ($this->fetchDBValues(
@@ -78,7 +80,7 @@ public function buildInsertStatement(
                         null,
                         null,
                         null,
-                        $db_row->min_autocomplete,
+                        $db_row->min_auto_complete,
                         $db_row->shuffle_answers === '1' ? 1 : 0
                     )
                 );
@@ -90,17 +92,24 @@ public function buildInsertStatement(
                         'points' => 0.0
                     ],
                     $this->loadAnswersFromFile(
+                        $environment->getResource(Environment::RESOURCE_ILIAS_INI),
+                        $environment->getResource(Environment::RESOURCE_CLIENT_ID),
                         $migration_insert->getOldQuestionId(),
                         $db_row->gap_number
                     )
                 );
             }
 
-            if ($answers[$db_row->position]['text'] === trim($db_row->answer_text)) {
+            if (isset($answers[$db_row->position])
+                && $answers[$db_row->position]['text'] === trim($db_row->answer_text)) {
                 $answers[$db_row->position]['points'] = $db_row->points;
             }
         }
 
+        if (!isset($db_row)) {
+            return null;
+        }
+
         foreach ($answers as $position => $answer) {
             $migration_insert = $migration_insert->withAdditionalInsert(
                 $this->buildAnswerOptionInsertStatement(
@@ -129,7 +138,7 @@ public function buildInsertStatement(
             )->withAdditionalTextLegacy(
                 $this->replaceGapsAndSantizeLegacyClozeText(
                     '\[Longmenu \d+\]',
-                    $db_row->cloze_text,
+                    $db_row->long_menu_text,
                     $answer_input_mapping
                 )
             );
@@ -152,16 +161,18 @@ private function fetchDBValues(
     }
 
     private function loadAnswersFromFile(
+        \ilIniFile $ini,
+        string $client_id,
         int $old_question_id,
         int $gap_id
     ): array {
-        $file = ilFileUtils::getDataDir() . "/assessment/longMenuQuestion/{$old_question_id}/{$gap_id}.txt";
+        $file = "{$ini->readVariable('clients', 'datadir')}/{$client_id}/assessment/longMenuQuestion/{$old_question_id}/{$gap_id}.txt";
 
         if (!file_exists($file)) {
             return [];
         }
 
-        return exlode(
+        return explode(
             "\n",
             file_get_contents($file)
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
index ad9825006ed1..babc3bfe10eb 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
@@ -25,7 +25,9 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
 use ILIAS\Questions\Persistence\TableNameSpace;
+use ILIAS\Setup\Environment;
 
 class MigrationNumeric implements Migration
 {
@@ -57,13 +59,18 @@ public function getTableNameSpace(): TableNameSpace
     }
 
     #[\Override]
-    public function buildInsertStatement(
+    public function completeMigrationInsert(
+        Environment $environment,
         MigrationInsert $migration_insert
-    ): MigrationInsert {
+    ): ?MigrationInsert {
         $db_row = $this->fetchDBValues(
             $migration_insert->getDb(),
             $migration_insert->getOldQuestionId()
-        )->current();
+        )?->current();
+
+        if ($db_row === null) {
+            return null;
+        }
 
         $answer_form_id = $migration_insert->getAnswerFormId();
         $gap_id = $migration_insert->getUuid();
@@ -101,8 +108,8 @@ public function buildInsertStatement(
                 ScoringIdentical::ScoreAll,
                 0
             )
-        )->withAdditionalTextLegacy(
-            '{{' . Gap::GAP_PLACEHOLDER_NAME . '_' . array_shift($gap_id->toString()) . '}}'
+        )->withAdditionalText(
+            '{{' . Gap::GAP_PLACEHOLDER_NAME . '_' . $gap_id->toString() . '}}'
         );
     }
 
@@ -112,7 +119,7 @@ private function fetchDBValues(
     ): \Generator {
         $query = $db->query(
             'SELECT points, lowerlimit, upperlimit FROM qpl_num_range' . PHP_EOL
-            . "WHERE q.question_fi = {$db->quote($old_question_id)}"
+            . "WHERE question_fi = {$db->quote($old_question_id)}"
         );
 
         while (($row = $db->fetchObject($query)) !== null) {
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
index 2b5af74ffdeb..26b67999b624 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
@@ -20,13 +20,14 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Migration;
 
+use ILIAS\Data\UUID\Uuid;
 use ILIAS\Questions\AnswerForm\Migration\Migration;
 use ILIAS\Questions\AnswerForm\Migration\MigrationInsert;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\Persistence\TableNameSpace;
-use ILIAS\Data\UUID\Uuid;
+use ILIAS\Setup\Environment;
 
 class MigrationTextSubset implements Migration
 {
@@ -56,10 +57,12 @@ public function getTableNameSpace(): TableNameSpace
     }
 
     #[\Override]
-    public function buildInsertStatement(
+    public function completeMigrationInsert(
+        Environment $environment,
         MigrationInsert $migration_insert
-    ): MigrationInsert {
+    ): ?MigrationInsert {
         $gaps = [];
+
         foreach ($this->fetchDBValues(
             $migration_insert->getDb(),
             $migration_insert->getOldQuestionId()
@@ -89,6 +92,10 @@ public function buildInsertStatement(
             }
         }
 
+        if (!isset($db_row)) {
+            return null;
+        }
+
         return $migration_insert
             ->withAdditionalInsert(
                 $this->buildAnswerFormInsertStatement(
@@ -96,7 +103,7 @@ public function buildInsertStatement(
                     $migration_insert->getTableNameBuilder(),
                     $answer_form_id,
                     ScoringIdentical::OnlyScoreDistinct,
-                    false
+                    0
                 )
             )->withAdditionalText(
                 implode(
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index 2dcfeae21079..b2b3b0cb9fab 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -127,8 +127,9 @@ private function buildGapFromDBValues(
         array $values,
         array $answer_options
     ): Gap {
+        $answer_input_uuid = $this->uuid_factory->fromString($values['id']);
         return new Gap(
-            $this->uuid_factory->fromString($values['id']),
+            $answer_input_uuid,
             $this->uuid_factory->fromString($values['answer_form_id']),
             $values['position'],
             $answer_options[$values['id']],
diff --git a/components/ILIAS/Questions/src/Persistence/CoreTables.php b/components/ILIAS/Questions/src/Persistence/CoreTables.php
index d06a76b8a4b5..ca083a2cc89c 100644
--- a/components/ILIAS/Questions/src/Persistence/CoreTables.php
+++ b/components/ILIAS/Questions/src/Persistence/CoreTables.php
@@ -60,7 +60,8 @@ enum CoreTables: string
     private const string MIGRATIONS_TABLE_FOREIGN_KEY_COLUMN = 'old_question_id';
     private const array MIGRATIONS_TABLE_COLUMNS = [
         'old_question_id',
-        'new_question_id'
+        'new_question_id',
+        'success'
     ];
 
     case Questions = 'qsts_questions';
diff --git a/components/ILIAS/Questions/src/Persistence/JoinType.php b/components/ILIAS/Questions/src/Persistence/JoinType.php
index e020447a0056..3a7d11732407 100644
--- a/components/ILIAS/Questions/src/Persistence/JoinType.php
+++ b/components/ILIAS/Questions/src/Persistence/JoinType.php
@@ -23,5 +23,5 @@
 enum JoinType: string
 {
     case Inner = 'INNER';
-    case Left = 'left';
+    case Left = 'LEFT';
 }
diff --git a/components/ILIAS/Questions/src/Persistence/Query.php b/components/ILIAS/Questions/src/Persistence/Query.php
index 54dc4463ee86..54f04994b400 100644
--- a/components/ILIAS/Questions/src/Persistence/Query.php
+++ b/components/ILIAS/Questions/src/Persistence/Query.php
@@ -22,6 +22,7 @@
 
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
 use ILIAS\Questions\AnswerForm\Persistence;
+use ILIAS\Data\Range;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
 
@@ -31,7 +32,7 @@ class Query
     private array $where = [];
     private array $joins = [];
     private array $order = [];
-    private ?int $limit = null;
+    private ?Range $range = null;
 
     private array $binding_types = [];
     private array $binding_values = [];
@@ -61,7 +62,7 @@ public function __construct(
         );
 
         $this->joins[] = new Join(
-            $questions_id_column,
+            $questions_linking_table_definition->getIdColumn(),
             $questions_table_definition->getIdColumn(),
             JoinType::Inner
         );
@@ -137,11 +138,11 @@ public function withAdditionalOrder(
         return $clone;
     }
 
-    public function withLimit(
-        int $limit
+    public function withRange(
+        Range $range
     ): self {
         $clone = clone $this;
-        $clone->limit = $limit;
+        $clone->range = $range;
         return $clone;
     }
 
@@ -208,7 +209,7 @@ static function (array $c, Order $v): array {
                     []
                 )
             ) . PHP_EOL
-            . ($this->limit !== null ? "LIMIT = {$this->limit}" : ''),
+            . ($this->range !== null ? "LIMIT {$this->range->getStart()}, {$this->range->getLength()}" : ''),
             $this->binding_types,
             $this->binding_values
         );
diff --git a/components/ILIAS/Questions/src/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
index aa9eda087481..487a0c866b8c 100644
--- a/components/ILIAS/Questions/src/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -25,6 +25,8 @@
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\Order as DataOrder;
+use ILIAS\Data\Range as DataRange;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Refinery\Factory as Refinery;
 
@@ -52,11 +54,11 @@ public function getNew(
      */
     public function getQuestionDataOnlyForAllQuestions(): \Generator
     {
-        foreach ((new Query(
+        foreach ($query = new Query(
             $this->db,
             $this->answer_form_factory,
             $this->refinery
-        ))->loadNextRecord() as $query_with_record) {
+        )->loadNextRecord() as $query_with_record) {
             yield $this->retrieveQuestionFromQuery(
                 $query_with_record,
                 []
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
index ce58b1f44cc9..9e46ea64fa40 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
@@ -95,7 +95,8 @@ private function buildContent(): array
                 $this->getColums(),
             )->withActions(
                 $this->getActions()
-            )->withRequest($this->request)
+            )->withRange(new Range(0, 20))
+            ->withRequest($this->request)
         ];
     }
 
@@ -143,7 +144,7 @@ private function getActions(): array
         return [
             'delete' => $this->ui_factory->table()->action()->standard(
                 $this->lng->txt('delete'),
-                $this->environment->withActionParameter(Edit::CMD_DELETE_QUESTION)
+                $this->environment->withActionParameter(Edit::CMD_DELETE_QUESTIONS)
                     ->getUrlBuilder(),
                 $this->environment->getQuestionIdsToken()
             )->withAsync(true)
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 76e95d60b572..47a65e275812 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -25,6 +25,7 @@
 use ILIAS\Questions\Presentation\Layout\Factory as LayoutFactory;
 use ILIAS\Questions\Presentation\Layout\Renderable;
 use ILIAS\Questions\Presentation\Definitions\Editability;
+use ILIAS\Questions\Presentation\Definitions\Environment;
 use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Presentation\Layout\QuestionsTable;
 use ILIAS\Questions\Presentation\Layout\GlobalScreen\LayoutProvider;
@@ -42,7 +43,6 @@
 use ILIAS\HTTP\Services as HTTP;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Renderer as UIRenderer;
-use ILIAS\UI\Component\Item\Standard as StandardItem;
 use ILIAS\UI\Component\Item\Group as ItemGroup;
 use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
 use ILIAS\Style\Content\Service as ContentStyle;
@@ -52,7 +52,7 @@ class Edit
 {
     private const string CMD_CREATE_QUESTION = 'create';
     public const string CMD_EDIT_QUESTION = 'edit';
-    public const string CMD_DELETE_QUESTION = 'delete';
+    public const string CMD_DELETE_QUESTIONS = 'delete';
     private const string CMD_CREATE_ANSWER_FORM = 'create_af';
     public const string CMD_OTHER_ANSWER_FORM = 'other_af';
     private const string CMD_EDIT_FEEDBACK = 'edit_f';
@@ -126,7 +126,7 @@ public function show(
         return match($environment->getAction()) {
             self::CMD_CREATE_QUESTION => $this->createQuestion($environment),
             self::CMD_EDIT_QUESTION => $this->editQuestion($environment),
-            self::CMD_DELETE_QUESTION => $this->deleteQuestion($environment),
+            self::CMD_DELETE_QUESTIONS => $this->deleteQuestions($environment),
             default => $this->showTable($toolbar, $environment)
         };
     }
@@ -322,7 +322,7 @@ private function editQuestion(
         );
     }
 
-    private function deleteQuestion(
+    private function deleteQuestions(
         EnvironmentImplementation $environment
     ): Async {
         $question_ids = $environment->getQuestionIds();
@@ -335,12 +335,8 @@ private function deleteQuestion(
             );
         }
 
-        if ($environment->getStep() === self::CMD_DELETE_QUESTION) {
-            $this->questions_repository->delete(
-                iterator_to_array(
-                    $this->questions_repository->getForQuestionIds($question_ids)
-                )
-            );
+        if ($environment->getStep() === self::CMD_DELETE_QUESTIONS) {
+            $this->deleteSelectedQuestions($question_ids);
             $this->ctrl->redirectToURL(
                 $environment->getUrlBuilder()->buildURI()->__toString()
             );
@@ -351,9 +347,9 @@ private function deleteQuestion(
                 $this->lng->txt('confirm'),
                 $this->lng->txt('qpl_confirm_delete_questions'),
                 $environment->withActionParameter(
-                    self::CMD_DELETE_QUESTION
+                    self::CMD_DELETE_QUESTIONS
                 )->getUrlBuilderWithStepParameter(
-                    self::CMD_DELETE_QUESTION
+                    self::CMD_DELETE_QUESTIONS
                 )->buildURI()->__toString()
             )->withAffectedItems(
                 $this->buildAffectedItems($question_ids)
@@ -484,18 +480,25 @@ private function buildItemGroupForQuestionListSlate(
     ): ItemGroup {
         return $this->ui_factory->item()->group(
             '',
-            array_map(
-                fn(QuestionImplementation $v): StandardItem => $this->ui_factory->item()->standard(
-                    $v->toEditLink(
-                        $this->ui_factory->link(),
-                        $environment->withActionParameter(self::CMD_EDIT_QUESTION)
-                    )
-                ),
-                iterator_to_array($this->questions_repository->getQuestionDataOnlyForAllQuestions())
-            )
+            $this->builEditLinksForQuestionListSlate($environment)
         );
     }
 
+    private function builEditLinksForQuestionListSlate(
+        Environment $environment
+    ): array {
+        $links = [];
+        foreach ($this->questions_repository->getQuestionDataOnlyForAllQuestions() as $question) {
+            $links[] = $this->ui_factory->item()->standard(
+                $question->toEditLink(
+                    $this->ui_factory->link(),
+                    $environment->withActionParameter(self::CMD_EDIT_QUESTION)
+                )
+            );
+        }
+        return $links;
+    }
+
     private function buildEditStartView(
         EnvironmentImplementation $environment,
         QuestionImplementation $question
@@ -570,7 +573,22 @@ private function checkCapabilities(
         }
     }
 
-    public function buildEnvironment(
+    private function deleteSelectedQuestions(
+        array $question_ids
+    ): void {
+        $questions_to_delete = [];
+        foreach ($this->questions_repository->getForQuestionIds($question_ids) as $question) {
+            if (count($questions_to_delete) < 100) {
+                $questions_to_delete[] = $question;
+                continue;
+            }
+
+            $this->questions_repository->delete($questions_to_delete);
+            $questions_to_delete = [];
+        }
+    }
+
+    private function buildEnvironment(
         URI $base_uri,
         int $obj_id
     ): EnvironmentImplementation {
diff --git a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
index 8f045de511d0..57775096067b 100644
--- a/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
+++ b/components/ILIAS/Questions/src/Setup/OverarchingQuestionTables.php
@@ -131,7 +131,7 @@ public function step_2(): void
                 ],
                 'additional_text_legacy' => [
                     'type' => \ilDBConstants::T_CLOB,
-                    'notnull' => false
+                    'notnull' => true
                 ]
             ]);
         }
@@ -213,14 +213,19 @@ public function step_5(): void
         $table_name = CoreTables::MigrationsTable->value;
         if (!$this->db->tableExists($table_name)) {
             $this->db->createTable($table_name, [
-                'old_question_id' => [
+                'new_question_id' => [
                     'type' => \ilDBConstants::T_TEXT,
                     'length' => 64,
                     'notnull' => true
                 ],
-                'new_question_id' => [
+                'old_question_id' => [
                     'type' => \ilDBConstants::T_INTEGER,
                     'length' => 4,
+                    'notnull' => false
+                ],
+                'success' => [
+                    'type' => \ilDBConstants::T_INTEGER,
+                    'length' => 1,
                     'notnull' => true
                 ]
             ]);
diff --git a/components/ILIAS/Questions/src/Setup/QuestionsMigration.php b/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
index a07550d2838b..1ec6b1813e56 100644
--- a/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
+++ b/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
@@ -37,6 +37,7 @@
 class QuestionsMigration implements Migration
 {
     private const string OLD_QUESTIONS_TABLE = 'qpl_questions';
+    private const string OLD_QUESTION_TYPE_TABLE = 'qpl_qst_type';
     private const string TEST_QUESTIONS_SEQUENCE_TABLE = 'tst_test_question';
 
     private \ilDBInterface $db;
@@ -44,7 +45,6 @@ class QuestionsMigration implements Migration
     private UuidFactory $uuid_factory;
     private readonly array $answer_form_migrations;
 
-    private bool $ilias_is_initialized = false;
     private ?array $question_to_learning_module_mapping = null;
     private ?array $allready_migrated_questions = null;
     private ?array $allready_migrated_questions_in_qpls = null;
@@ -92,19 +92,12 @@ public function prepare(Environment $environment): void
     public function step(
         Environment $environment
     ): void {
-        /**
-         * sk, 2026-01-14: Sadly this is necessary to clone the question pages
-         * without duplicating a humongous amount of code. It is mighty
-         * depressing, but the structure of `COPage` is yay stupid.
-         */
-        if (!$this->ilias_is_initialized) {
-            \ilContext::init(\ilContext::CONTEXT_CRON);
-            entry_point('ILIAS Legacy Initialisation Adapter');
-            $this->ilias_is_initialized = true;
-        }
-
         $db_values = $this->fetchValidRecord();
 
+        if ($db_values === null) {
+            return;
+        }
+
         if ($db_values->obj_fi === 0) {
             $db_values->obj_fi = $this->getObjIdFromLearningModulMapping($db_values->question_id);
         }
@@ -122,7 +115,8 @@ public function step(
 
         $new_question_id = $this->uuid_factory->uuid4();
 
-        $answer_form_migration->buildInsertStatement(
+        $migration_insert = $answer_form_migration->completeMigrationInsert(
+            $environment,
             $this->buildMigrationInsert(
                 $answer_form_migration,
                 [
@@ -148,18 +142,31 @@ public function step(
                 $new_question_id,
                 $db_values
             )
-        )->run();
+        );
+
+        if ($migration_insert === null) {
+            $this->db->manipulate(
+                $this->buildInsertMigrationStatement(
+                    $db_values->question_id,
+                    null
+                )->toManipulateString($this->db)
+            );
+            $this->io->inform(
+                "{$db_values->question_id} could not be migrated due to missing question data."
+            );
+            return;
+        }
 
-        $this->io->inform($new_question_id->toString());
+        $migration_insert->run();
+        $this->io->inform("{$new_question_id->toString()} successfully migrated.");
     }
 
     #[\Override]
     public function getRemainingAmountOfSteps(): int
     {
-        return $this->db->fetchObject(
-            $this->db->query(
-                'SELECT COUNT(question_id) cnt FROM ' . self::OLD_QUESTIONS_TABLE . ' q' . PHP_EOL
-                . 'JOIN qpl_qst_type t ON q.question_type_fi = t.question_type_id' . PHP_EOL
+        $query = $this->db->query(
+            'SELECT COUNT(question_id) cnt FROM ' . self::OLD_QUESTIONS_TABLE . ' q' . PHP_EOL
+                . 'JOIN ' . self::OLD_QUESTION_TYPE_TABLE . ' t ON q.question_type_fi = t.question_type_id' . PHP_EOL
                 . 'LEFT JOIN ' . CoreTables::MigrationsTable->value . ' m ON q.question_id = m.old_question_id' . PHP_EOL
                 . 'WHERE t.type_tag IN ('
                 . implode(
@@ -171,14 +178,17 @@ public function getRemainingAmountOfSteps(): int
                 ) . ')' . PHP_EOL
                 . 'AND q.complete = 1' . PHP_EOL
                 . 'AND m.old_question_id IS NULL'
-            )
+        );
+        return $this->db->fetchObject(
+            $query
         )->cnt;
     }
 
-    private function fetchValidRecord(): \stdClass
+    private function fetchValidRecord(): ?\stdClass
     {
-        $query_string = 'SELECT q.*, t.type_tag, s.sequence FROM ' . self::OLD_QUESTIONS_TABLE . ' q' . PHP_EOL
-            . 'JOIN qpl_qst_type t ON q.question_type_fi = t.question_type_id' . PHP_EOL
+        $query = $this->db->query(
+            'SELECT q.*, t.type_tag, s.sequence FROM ' . self::OLD_QUESTIONS_TABLE . ' q' . PHP_EOL
+            . 'JOIN ' . self::OLD_QUESTION_TYPE_TABLE . ' t ON q.question_type_fi = t.question_type_id' . PHP_EOL
             . 'LEFT JOIN ' . CoreTables::MigrationsTable->value . ' m ON q.question_id = m.old_question_id' . PHP_EOL
             . 'LEFT JOIN ' . self::TEST_QUESTIONS_SEQUENCE_TABLE . ' s ON q.question_id = s.question_fi' . PHP_EOL
             . 'WHERE t.type_tag IN ('
@@ -190,13 +200,14 @@ private function fetchValidRecord(): \stdClass
                 )
             ) . ')' . PHP_EOL
             . 'AND q.complete = 1' . PHP_EOL
-            . 'AND m.old_question_id IS NULL' . PHP_EOL
-            . 'LIMIT 1';
+            . 'AND m.old_question_id IS NULL'
+        );
 
         do {
-            $db_values = $this->db->fetchObject(
-                $this->db->query($query_string)
-            );
+            $db_values = $this->db->fetchObject($query);
+            if ($db_values === null) {
+                return null;
+            }
         } while (!$this->areDbValuesValid($db_values));
 
         $db_values->original_id = $this->cleanupAndMigrateOriginalId($db_values->original_id);
@@ -225,7 +236,7 @@ private function cleanupAndMigrateOriginalId(
         ?int $original_id
     ): ?Uuid {
         if ($original_id === null
-            || in_array($this->allready_migrated_questions_in_qpls, $original_id)) {
+            || in_array($original_id, $this->allready_migrated_questions_in_qpls)) {
             return null;
         }
         return $this->uuid_factory->fromString(
@@ -235,10 +246,9 @@ private function cleanupAndMigrateOriginalId(
 
     private function loadAlreadyMigratedQuestions(): void
     {
-
         $query = $this->db->query(
             'SELECT m.*, o.type FROM ' . CoreTables::MigrationsTable->value . ' m' . PHP_EOL
-            . 'JOIN ' . CoreTables::Linking->value . 'l' . PHP_EOL
+            . 'JOIN ' . CoreTables::Linking->value . ' l' . PHP_EOL
             . 'ON m.new_question_id = l.question_id' . PHP_EOL
             . 'JOIN object_data o ON l.obj_id = o.obj_id' . PHP_EOL
         );
@@ -260,7 +270,7 @@ private function getObjIdFromLearningModulMapping(
             $this->loadQuestionsToLearningModuleMapping();
         }
 
-        $this->question_to_learning_module_mapping[$question_id] ?? null;
+        return $this->question_to_learning_module_mapping[$question_id] ?? null;
     }
 
     private function loadQuestionsToLearningModuleMapping(): void
@@ -322,13 +332,19 @@ private function buildInsertQuestionStatement(
 
     private function buildInsertMigrationStatement(
         int $old_question_id,
-        Uuid $new_question_id
+        ?Uuid $new_question_id
     ): Insert {
         return new Insert(
             CoreTables::MigrationsTable->getColumns(),
             [
                 new Value(\ilDBConstants::T_INTEGER, $old_question_id),
-                new Value(\ilDBConstants::T_TEXT, $new_question_id->toString())
+                new Value(\ilDBConstants::T_TEXT, $new_question_id?->toString()),
+                new Value(
+                    \ilDBConstants::T_INTEGER,
+                    $new_question_id === null
+                        ? '0'
+                        : '1'
+                )
             ]
         );
     }

From d9f62e85e8062d39bdb72c13326d9a07862da394 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 30 Jan 2026 10:14:49 +0100
Subject: [PATCH 107/141] Questions: Small Improvements

---
 .../Questions/src/AnswerForm/Factory.php      |  4 ++
 components/ILIAS/Questions/src/Collector.php  |  7 ++-
 .../Questions/src/Persistence/Repository.php  | 43 ++++++++++++++++---
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerForm/Factory.php
index 5836840dbca5..b951d2bc6fa1 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Factory.php
@@ -49,6 +49,10 @@ function (array $c, Definition $v) {
         );
     }
 
+    /**
+     *
+     * @return array<string>
+     */
     public function getAvailableDefinitions(): array
     {
         return array_values($this->available_answer_form_types);
diff --git a/components/ILIAS/Questions/src/Collector.php b/components/ILIAS/Questions/src/Collector.php
index 68df3dc761ef..d3ecf6764511 100644
--- a/components/ILIAS/Questions/src/Collector.php
+++ b/components/ILIAS/Questions/src/Collector.php
@@ -22,6 +22,7 @@
 
 use ILIAS\Questions\Persistence\Repository;
 use ILIAS\Questions\Question\Question;
+use ILIAS\Data\UUID\Uuid;
 
 class Collector
 {
@@ -42,14 +43,16 @@ public function withRequiredCapabilities(
     }
 
     public function getQuestionsForId(
-        int $id
+        Uuid $id
     ): ?Question {
         return $this->repository->getForQuestionId($id);
     }
 
     /**
+     * Use with Care: This is going to be freakishly expensive, if you ask
+     * for a lot of questions as the query will contain a huge amount of joins!
      *
-     * @param list<int> $ids
+     * @param list<\ILIAS\Data\Uuid> $ids
      * @return \Generator<ILIAS\Questions\Question\Question>
      */
     public function getQuestionsForIds(
diff --git a/components/ILIAS/Questions/src/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
index 487a0c866b8c..8a8c8a5689c8 100644
--- a/components/ILIAS/Questions/src/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -113,13 +113,14 @@ public function getForQuestionId(
                     ),
                     Operator::Equal
                 )
-            )
+            ),
+            [$question_id]
         )->current();
     }
 
     /**
      *
-     * @param array<\ILIAS\Data\Uuid> $question_ids
+     * @param list<\ILIAS\Data\Uuid> $question_ids
      * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
      */
     public function getForQuestionIds(
@@ -142,7 +143,8 @@ public function getForQuestionIds(
                     ),
                     Operator::In
                 )
-            )
+            ),
+            $question_ids
         );
     }
 
@@ -201,13 +203,15 @@ public function delete(
     }
 
     /**
+     * @param  array<\ILIAS\Data\Uuid> $question_ids
      * @return \Generator<\ILIAS\Questions\Question\QuestionImplementation>
      */
     private function getForBaseQuery(
-        Query $query
+        Query $query,
+        array $question_ids
     ): \Generator {
         $query_with_answer_forms = array_reduce(
-            $this->answer_form_factory->getAvailableDefinitions(),
+            $this->getAnswerFormTypesForQuestionIds($question_ids),
             fn(Query $c, AnswerFormDefinition $v) => $v->getPersistence()->completeQuery(
                 $c,
                 CoreTables::AnswerForms->getIdColumn()
@@ -223,6 +227,9 @@ private function getForBaseQuery(
         }
     }
 
+    /**
+     * $param array<\ILIAS\Questions\AnswerForms\Properties> $answer_forms
+     */
     private function retrieveQuestionFromQuery(
         Query $query,
         array $answer_forms
@@ -261,6 +268,9 @@ private function retrieveQuestionFromQuery(
         return $this->migrateQuestionPage($question);
     }
 
+    /**
+     * @return array<\ILIAS\Questions\AnswerForms\Properties>
+     */
     private function retrieveAnswerFormsFromQuery(
         Query $query
     ): array {
@@ -292,6 +302,29 @@ function (array $vs) use ($query): array {
         );
     }
 
+    /**
+     * @param  array<\ILIAS\Data\Uuid> $question_ids
+     * @return array<\ILIAS\Questions\AnswerForm\Definition>
+     */
+    private function getAnswerFormTypesForQuestionIds(
+        array $question_ids
+    ): array {
+        $query = $this->db->query(
+            'SELECT DISTINCT type FROM ' . CoreTables::AnswerForms->value . PHP_EOL
+                . "WHERE {$this->db->in(
+                    'question_id',
+                    $question_ids,
+                    false,
+                    \ilDBConstants::T_TEXT
+                )}"
+        );
+        $answer_form_types = [];
+        while (($type_class = $this->db->fetchObject($query)?->type) !== null) {
+            $answer_form_types[] = $this->answer_form_factory->getDefinitionForClass($type_class);
+        }
+        return $answer_form_types;
+    }
+
     /**
      * @param array<\ILIAS\Questions\Question\QuestionImplementation> $questions
      */

From 3191acc0f6b0dfa24ee2148e134ee632cc97daf4 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 30 Jan 2026 11:21:50 +0100
Subject: [PATCH 108/141] Question: TextLegacy Cannot Be Null

---
 .../Questions/src/AnswerForm/Migration/MigrationInsert.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php b/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
index 9c02ad13fc98..799e49ffcfc6 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
@@ -34,7 +34,7 @@ class MigrationInsert
     private ?int $image_size = null;
     private ?bool $shuffle_answer_options = null;
     private string $additional_text = '';
-    private ?string $additional_text_legacy = null;
+    private ?string $additional_text_legacy = '';
 
     public function __construct(
         private readonly \ilDBInterface $db,

From 59af0f76e8c218c674f17d6049a587d054aff783 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 30 Jan 2026 11:42:00 +0100
Subject: [PATCH 109/141] Questions: Fix Deleting Questions

---
 components/ILIAS/Questions/src/Presentation/Views/Edit.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 47a65e275812..d35f0adf2fbb 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -586,6 +586,8 @@ private function deleteSelectedQuestions(
             $this->questions_repository->delete($questions_to_delete);
             $questions_to_delete = [];
         }
+
+        $this->questions_repository->delete($questions_to_delete);
     }
 
     private function buildEnvironment(

From 9b52849f8f50bf104422439a4f57b428eddfcfde Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 30 Jan 2026 15:02:47 +0100
Subject: [PATCH 110/141] Questions: No Duplicating Questions on Page Update

---
 .../Legacy/PageEditor/QstsQuestionPage.php    | 20 -------------
 .../Questions/src/Persistence/Repository.php  |  6 +---
 .../classes/class.ilAssQuestionPage.php       | 30 +++++++++++++++++++
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
index 09d5a51e28e5..9e23acb982f2 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
@@ -40,24 +40,4 @@ public function setQuestion(
     ): void {
         $this->question = $question;
     }
-
-    public function migrateQuestionElementToAnswerForm(): void
-    {
-        global $DIC;
-        $dom_util = $DIC->copage()->internal()->domain()->domUtil();
-
-        $answer_forms = $this->question->getAnswerForms();
-
-        $answer_form_node = new ilPCAnswerForm($this);
-        $answer_form_node->createPageContentNode();
-        $answer_form_node->writePCId($this->generatePCId());
-        $answer_form_node->create(
-            array_shift($answer_forms)->getAnswerFormId()
-        );
-
-        $dom_util->path($this->getDomDoc(), '//Question')
-            ->item(0)->parentNode->replaceWith($answer_form_node->getDomNode());
-
-        $this->update();
-    }
 }
diff --git a/components/ILIAS/Questions/src/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
index 8a8c8a5689c8..7bea0e758777 100644
--- a/components/ILIAS/Questions/src/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -398,13 +398,9 @@ private function migrateQuestionPage(
 
         $new_page_id = $this->getNextAvailableQuestionPageId();
         $old_qsts_page = new \ilAssQuestionPage($old_page_id);
+        $old_qsts_page->setQuestion($question);
         $old_qsts_page->copyToAnswerForm($new_page_id, $question);
 
-        $new_qsts_page = new \QstsQuestionPage($new_page_id);
-        $new_qsts_page->setQuestion($question);
-        $new_qsts_page->buildDom();
-        $new_qsts_page->migrateQuestionElementToAnswerForm();
-
         $new_question = $question->withPageId($new_page_id);
 
         $this->update([$new_question]);
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php b/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
index 78787cd9dbc1..72c456ba3bab 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
@@ -22,6 +22,8 @@
 
 class ilAssQuestionPage extends ilPageObject
 {
+    private readonly QuestionImplementation $question;
+
     /**
      * Get parent type
      * @return string parent type
@@ -31,10 +33,19 @@ public function getParentType(): string
         return "qpl";
     }
 
+    public function setQuestion(
+        QuestionImplementation $question
+    ): void {
+        $this->question = $question;
+    }
+
     public function copyToAnswerForm(
         int $new_id,
         QuestionImplementation $question
     ): void {
+        $this->buildDom();
+        $this->migrateQuestionElementToAnswerForm();
+
         $new_page_object = new QstsQuestionPage();
         $new_page_object->setParentId($this->getParentId());
         $new_page_object->setId($new_id);
@@ -45,4 +56,23 @@ public function copyToAnswerForm(
         $new_page_object->setQuestion($question);
         $new_page_object->create(false);
     }
+
+    private function migrateQuestionElementToAnswerForm(): void
+    {
+        global $DIC;
+        $dom_util = $DIC->copage()->internal()->domain()->domUtil();
+
+        $answer_forms = $this->question->getAnswerForms();
+
+        $answer_form_node = new ilPCAnswerForm($this);
+        $answer_form_node->createPageContentNode();
+        $answer_form_node->writePCId($this->generatePCId());
+        $answer_form_node->create(
+            array_shift($answer_forms)->getAnswerFormId()
+        );
+
+        $dom_util->path($this->getDomDoc(), '//Question')
+            ->item(0)->parentNode->replaceWith($answer_form_node->getDomNode());
+        $this->xml = $this->getXMLFromDom();
+    }
 }

From 30a0ea9bbf2c906f0ec36b786a1b81734c907f80 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 2 Feb 2026 10:06:03 +0100
Subject: [PATCH 111/141] Questions: Fix Cloze Migrations

---
 .../Migration/BasicMigrationFunctions.php     | 159 +++++++++++---
 .../Cloze/Migration/MigrationCloze.php        | 201 ++++++++++--------
 .../Cloze/Migration/MigrationLongMenu.php     |  55 ++---
 .../Cloze/Migration/MigrationNumeric.php      |   2 +
 .../Cloze/Migration/MigrationTextSubset.php   |  48 +++--
 5 files changed, 300 insertions(+), 165 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
index c5b9d830b705..58b6ce7d69fc 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
@@ -35,6 +35,7 @@ trait BasicMigrationFunctions
     private function buildGapInsertStatement(
         Persistence $persistence,
         TableNameBuilder $table_name_builder,
+        ?Insert $gaps_insert,
         Uuid $answer_input_id,
         Uuid $answer_form_id,
         int $position,
@@ -45,28 +46,69 @@ private function buildGapInsertStatement(
         ?int $min_autocomplete,
         ?int $shuffle
     ): Insert {
-        return new Insert(
-            $persistence->getColumns(
-                $table_name_builder,
-                TableTypes::AnswerInputs
-            ),
-            [
-                new Value(\ilDBConstants::T_TEXT, $answer_input_id->toString()),
-                new Value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
-                new Value(\ilDBConstants::T_INTEGER, $position),
-                new Value(\ilDBConstants::T_TEXT, $gap_type),
-                new Value(\ilDBConstants::T_INTEGER, $max_chars),
-                new Value(\ilDBConstants::T_FLOAT, $step_size),
-                new Value(\ilDBConstants::T_INTEGER, $matching_options?->value),
-                new Value(\ilDBConstants::T_INTEGER, $min_autocomplete),
-                new Value(\ilDBConstants::T_INTEGER, $shuffle)
-            ]
+        if ($gaps_insert === null) {
+            return new Insert(
+                $persistence->getColumns(
+                    $table_name_builder,
+                    TableTypes::AnswerInputs
+                ),
+                $this->buildGapValuesForInsert(
+                    $answer_input_id,
+                    $answer_form_id,
+                    $position,
+                    $gap_type,
+                    $max_chars,
+                    $step_size,
+                    $matching_options,
+                    $min_autocomplete,
+                    $shuffle
+                )
+            );
+        }
+
+        return $gaps_insert->withAdditionalValues(
+            $this->buildGapValuesForInsert(
+                $answer_input_id,
+                $answer_form_id,
+                $position,
+                $gap_type,
+                $max_chars,
+                $step_size,
+                $matching_options,
+                $min_autocomplete,
+                $shuffle
+            )
         );
     }
 
+    private function buildGapValuesForInsert(
+        Uuid $answer_input_id,
+        Uuid $answer_form_id,
+        int $position,
+        string $gap_type,
+        ?int $max_chars,
+        ?float $step_size,
+        ?TextMatchingOptions $matching_options,
+        ?int $min_autocomplete,
+        ?int $shuffle
+    ): array {
+        return [
+            new Value(\ilDBConstants::T_TEXT, $answer_input_id->toString()),
+            new Value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
+            new Value(\ilDBConstants::T_INTEGER, $position),
+            new Value(\ilDBConstants::T_TEXT, $gap_type),
+            new Value(\ilDBConstants::T_INTEGER, $max_chars),
+            new Value(\ilDBConstants::T_FLOAT, $step_size),
+            new Value(\ilDBConstants::T_INTEGER, $matching_options?->value),
+            new Value(\ilDBConstants::T_INTEGER, $min_autocomplete),
+            new Value(\ilDBConstants::T_INTEGER, $shuffle)
+        ];
+    }
+
     private function buildAnswerOptionInsertStatement(
         Persistence $persistence,
         TableNameBuilder $table_name_builder,
+        ?Insert $options_insert,
         Uuid $answer_option_id,
         Uuid $answer_input_id,
         int $position,
@@ -75,29 +117,62 @@ private function buildAnswerOptionInsertStatement(
         ?float $lower_limit,
         ?float $upper_limit
     ): Insert {
-
-        return new Insert(
-            $persistence->getColumns(
-                $table_name_builder,
-                TableTypes::AnswerOptions
-            ),
-            [
-                new Value(\ilDBConstants::T_TEXT, $answer_option_id->toString()),
-                new Value(\ilDBConstants::T_TEXT, $answer_input_id->toString()),
-                new Value(\ilDBConstants::T_INTEGER, $position),
-                new Value(\ilDBConstants::T_TEXT, $text_value),
-                new Value(\ilDBConstants::T_FLOAT, $points),
-                new Value(\ilDBConstants::T_FLOAT, $lower_limit),
-                new Value(
-                    \ilDBConstants::T_FLOAT,
-                    $lower_limit !== $upper_limit
-                        ? $upper_limit
-                        : null
+        if ($options_insert === null) {
+            return new Insert(
+                $persistence->getColumns(
+                    $table_name_builder,
+                    TableTypes::AnswerOptions
+                ),
+                $this->buildOptionValuesForInsert(
+                    $answer_option_id,
+                    $answer_input_id,
+                    $position,
+                    $text_value,
+                    $points,
+                    $lower_limit,
+                    $upper_limit
                 )
-            ]
+            );
+        }
+
+        return $options_insert->withAdditionalValues(
+            $this->buildOptionValuesForInsert(
+                $answer_option_id,
+                $answer_input_id,
+                $position,
+                $text_value,
+                $points,
+                $lower_limit,
+                $upper_limit
+            )
         );
     }
 
+    private function buildOptionValuesForInsert(
+        Uuid $answer_option_id,
+        Uuid $answer_input_id,
+        int $position,
+        string $text_value,
+        float $points,
+        ?float $lower_limit,
+        ?float $upper_limit
+    ): array {
+        return [
+            new Value(\ilDBConstants::T_TEXT, $answer_option_id->toString()),
+            new Value(\ilDBConstants::T_TEXT, $answer_input_id->toString()),
+            new Value(\ilDBConstants::T_INTEGER, $position),
+            new Value(\ilDBConstants::T_TEXT, $text_value),
+            new Value(\ilDBConstants::T_FLOAT, $points),
+            new Value(\ilDBConstants::T_FLOAT, $lower_limit),
+            new Value(
+                \ilDBConstants::T_FLOAT,
+                $lower_limit !== $upper_limit
+                    ? $upper_limit
+                    : null
+            )
+        ];
+    }
+
     private function buildAnswerFormInsertStatement(
         Persistence $persistence,
         TableNameBuilder $table_name_builder,
@@ -128,6 +203,20 @@ private function buildScoringIdenticalFromOld(
         return ScoringIdentical::OnlyScoreDistinct;
     }
 
+    private function buildNewTextRatingFromOld(
+        string $old_text_rating
+    ): TextMatchingOptions {
+        return match($old_text_rating) {
+            \assClozeGap::TEXTGAP_RATING_CASEINSENSITIVE => TextMatchingOptions::CaseInsensitive,
+            \assClozeGap::TEXTGAP_RATING_CASESENSITIVE => TextMatchingOptions::CaseSensitive,
+            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN1 => TextMatchingOptions::Levenstein1,
+            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN2 => TextMatchingOptions::Levenstein2,
+            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN3 => TextMatchingOptions::Levenstein3,
+            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN4 => TextMatchingOptions::Levenstein4,
+            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN5 => TextMatchingOptions::Levenstein5
+        };
+    }
+
     private function replaceGapsAndSantizeLegacyClozeText(
         string $gap_replace_regex,
         string $text,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
index fed99b2ddaaf..db0cd67c13a4 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
@@ -25,11 +25,12 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations\InRange;
-use ILIAS\Questions\Definitions\TextMatchingOptions;
 use ILIAS\Questions\Persistence\Insert;
+use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableNameSpace;
 use ILIAS\Questions\Persistence\TableTypes;
 use ILIAS\Questions\Persistence\Value;
+use ILIAS\Data\UUID\Uuid;
 use ILIAS\Setup\Environment;
 
 class MigrationCloze implements Migration
@@ -67,6 +68,8 @@ public function completeMigrationInsert(
     ): ?MigrationInsert {
         $answer_input_mapping = [];
         $answer_options_mapping = [];
+        $gaps_insert = null;
+        $answer_options_insert = null;
 
         foreach ($this->fetchDBValues(
             $migration_insert->getDb(),
@@ -76,20 +79,19 @@ public function completeMigrationInsert(
             if (!isset($answer_input_mapping[$db_row->gap_id])) {
                 $answer_input_mapping[$db_row->gap_id] = $migration_insert->getUuid();
                 $answer_options_mapping[$db_row->gap_id] = [];
-                $migration_insert = $migration_insert->withAdditionalInsert(
-                    $this->buildGapInsertStatement(
-                        $this->persistence,
-                        $migration_insert->getTableNameBuilder(),
-                        $answer_input_mapping[$db_row->gap_id],
-                        $answer_form_id,
-                        $db_row->gap_id,
-                        $this->buildNewGapTypeIdentifierFromOld((int) $db_row->cloze_type),
-                        null,
-                        null,
-                        $this->buildNewTextRatingFromOld($db_row->textgap_rating),
-                        null,
-                        $db_row->shuffle === '1' ? 1 : 0
-                    )
+                $gaps_insert = $this->buildGapInsertStatement(
+                    $this->persistence,
+                    $migration_insert->getTableNameBuilder(),
+                    $gaps_insert,
+                    $answer_input_mapping[$db_row->gap_id],
+                    $answer_form_id,
+                    $db_row->gap_id,
+                    $this->buildNewGapTypeIdentifierFromOld((int) $db_row->cloze_type),
+                    null,
+                    null,
+                    $this->buildNewTextRatingFromOld($db_row->textgap_rating),
+                    null,
+                    $db_row->shuffle === '1' ? 1 : 0
                 );
             }
 
@@ -99,18 +101,17 @@ public function completeMigrationInsert(
                 'answer_option_id' => $answer_option_id
             ];
 
-            $migration_insert = $migration_insert->withAdditionalInsert(
-                $this->buildAnswerOptionInsertStatement(
-                    $this->persistence,
-                    $migration_insert->getTableNameBuilder(),
-                    $answer_option_id,
-                    $answer_input_mapping[$db_row->gap_id],
-                    $db_row->aorder,
-                    $db_row->answertext,
-                    $db_row->points,
-                    $this->limitToFloat($this->math, $db_row->lowerlimit),
-                    $this->limitToFloat($this->math, $db_row->upperlimit)
-                )
+            $answer_options_insert = $this->buildAnswerOptionInsertStatement(
+                $this->persistence,
+                $migration_insert->getTableNameBuilder(),
+                $answer_options_insert,
+                $answer_option_id,
+                $answer_input_mapping[$db_row->gap_id],
+                $db_row->aorder,
+                $db_row->answertext,
+                $db_row->points,
+                $this->limitToFloat($this->math, $db_row->lowerlimit),
+                $this->limitToFloat($this->math, $db_row->upperlimit)
             );
         }
 
@@ -119,7 +120,7 @@ public function completeMigrationInsert(
         }
 
         if ($db_row->combinations_enabled) {
-            $migration_insert = $this->addCombinationInserStatements(
+            $migration_insert = $this->addCombinationInsertStatements(
                 $migration_insert,
                 $answer_input_mapping,
                 $answer_options_mapping
@@ -135,6 +136,10 @@ public function completeMigrationInsert(
                     $this->buildScoringIdenticalFromOld((int) $db_row->identical_scoring),
                     $db_row->combinations_enabled
                 )
+            )->withAdditionalInsert(
+                $gaps_insert
+            )->withAdditionalInsert(
+                $answer_options_insert
             )->withAdditionalTextLegacy(
                 $this->replaceGapsAndSantizeLegacyClozeText(
                     '\[gap\].+?\[\/gap\]',
@@ -179,12 +184,14 @@ private function fetchCombinationsDBValues(
         }
     }
 
-    private function addCombinationInserStatements(
+    private function addCombinationInsertStatements(
         MigrationInsert $migration_insert,
         array $answer_input_mapping,
         array $answer_options_mapping
     ): MigrationInsert {
         $combination_mapping = [];
+        $combinations_insert = null;
+        $combinations_to_answer_options_insert = null;
         foreach ($this->fetchCombinationsDBValues(
             $migration_insert->getDb(),
             $migration_insert->getOldQuestionId()
@@ -200,58 +207,88 @@ private function addCombinationInserStatements(
 
             if (!isset($combination_mapping[$db_row->combination_id . $db_row->row_id])) {
                 $combination_mapping[$db_row->combination_id . $db_row->row_id] = $migration_insert->getUuid();
-                $migration_insert = $migration_insert->withAdditionalInsert(
-                    new Insert(
-                        $this->persistence->getColumns(
-                            $migration_insert->getTableNameBuilder(),
-                            TableTypes::Additional,
-                            $this->persistence->getCombinationsTableIdentifier()
-                        ),
-                        [
-                            new Value(
-                                \ilDBConstants::T_TEXT,
-                                $combination_mapping[$db_row->combination_id . $db_row->row_id]->toString()
-                            ),
-                            new Value(
-                                \ilDBConstants::T_TEXT,
-                                $migration_insert->getAnswerFormId()->toString()
-                            ),
-                            new Value(\ilDBConstants::T_FLOAT, $db_row->points),
-                        ]
-                    )
+                $combinations_insert = $this->buildCombinationsInsert(
+                    $migration_insert->getTableNameBuilder(),
+                    $combinations_insert,
+                    $combination_mapping[$db_row->combination_id . $db_row->row_id]->toString(),
+                    $migration_insert->getAnswerFormId()->toString(),
+                    $db_row->points
                 );
             }
 
-            $migration_insert = $migration_insert->withAdditionalInsert(
-                new Insert(
-                    $this->persistence->getColumns(
-                        $migration_insert->getTableNameBuilder(),
-                        TableTypes::Additional,
-                        $this->persistence->getCombinationToAnswerOptionsTableIdentifier()
-                    ),
-                    [
-                        new Value(
-                            \ilDBConstants::T_TEXT,
-                            $combination_mapping[$db_row->combination_id . $db_row->row_id]->toString()
-                        ),
-                        new Value(
-                            \ilDBConstants::T_TEXT,
-                            $answer_input_mapping[$db_row->gap_fi]->toString()
-                        ),
-                        new Value(
-                            \ilDBConstants::T_TEXT,
-                            $answer_option['answer_option_id']->toString()
-                        ),
-                        new Value(
-                            \ilDBConstants::T_TEXT,
-                            $this->buildRangeValue($answer_option['is_numeric'], $db_row->answer)
-                        ),
-                    ]
-                )
+            $combinations_to_answer_options_insert = $this->buildCombinationsToAnswerOptionsInsert(
+                $migration_insert->getTableNameBuilder(),
+                $combinations_to_answer_options_insert,
+                $combination_mapping[$db_row->combination_id . $db_row->row_id]->toString(),
+                $answer_input_mapping[$db_row->gap_fi]->toString(),
+                $answer_option['answer_option_id']->toString(),
+                $this->buildRangeValue($answer_option['is_numeric'], $db_row->answer)
             );
         }
 
-        return $migration_insert;
+        return $migration_insert->withAdditionalInsert($combinations_insert)
+            ->withAdditionalInsert($combinations_to_answer_options_insert);
+    }
+
+    private function buildCombinationsInsert(
+        TableNameBuilder $table_name_builder,
+        ?Insert $combinations_insert,
+        Uuid $combination_id,
+        Uuid $answer_form_id,
+        float $points
+    ): Insert {
+        if ($combinations_insert === null) {
+            return new Insert(
+                $this->persistence->getColumns(
+                    $table_name_builder,
+                    TableTypes::Additional,
+                    $this->persistence->getCombinationsTableIdentifier()
+                ),
+                [
+                    new Value(\ilDBConstants::T_TEXT, $combination_id),
+                    new Value(\ilDBConstants::T_TEXT, $answer_form_id),
+                    new Value(\ilDBConstants::T_FLOAT, $points),
+                ]
+            );
+        }
+
+        return $combinations_insert->withAdditionalValues([
+            new Value(\ilDBConstants::T_TEXT, $combination_id),
+            new Value(\ilDBConstants::T_TEXT, $answer_form_id),
+            new Value(\ilDBConstants::T_FLOAT, $points),
+        ]);
+    }
+
+    private function buildCombinationsToAnswerOptionsInsert(
+        TableNameBuilder $table_name_builder,
+        ?Insert $combinations_to_answer_options_insert,
+        Uuid $combination_id,
+        Uuid $gap_id,
+        Uuid $answer_option_id,
+        InRange $in_range
+    ): Insert {
+        if ($combinations_to_answer_options_insert === null) {
+            return new Insert(
+                $this->persistence->getColumns(
+                    $table_name_builder,
+                    TableTypes::Additional,
+                    $this->persistence->getCombinationToAnswerOptionsTableIdentifier()
+                ),
+                [
+                    new Value(\ilDBConstants::T_TEXT, $combination_id),
+                    new Value(\ilDBConstants::T_TEXT, $gap_id),
+                    new Value(\ilDBConstants::T_TEXT, $answer_option_id),
+                    new Value(\ilDBConstants::T_TEXT, $in_range)
+                ]
+            );
+        }
+
+        return $combinations_to_answer_options_insert->withAdditionalValues([
+            new Value(\ilDBConstants::T_TEXT, $combination_id),
+            new Value(\ilDBConstants::T_TEXT, $gap_id),
+            new Value(\ilDBConstants::T_TEXT, $answer_option_id),
+            new Value(\ilDBConstants::T_TEXT, $in_range)
+        ]);
     }
 
     private function buildNewGapTypeIdentifierFromOld(
@@ -264,20 +301,6 @@ private function buildNewGapTypeIdentifierFromOld(
         };
     }
 
-    private function buildNewTextRatingFromOld(
-        string $old_text_rating
-    ): TextMatchingOptions {
-        return match($old_text_rating) {
-            \assClozeGap::TEXTGAP_RATING_CASEINSENSITIVE => TextMatchingOptions::CaseInsensitive,
-            \assClozeGap::TEXTGAP_RATING_CASESENSITIVE => TextMatchingOptions::CaseSensitive,
-            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN1 => TextMatchingOptions::Levenstein1,
-            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN2 => TextMatchingOptions::Levenstein2,
-            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN3 => TextMatchingOptions::Levenstein3,
-            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN4 => TextMatchingOptions::Levenstein4,
-            \assClozeGap::TEXTGAP_RATING_LEVENSHTEIN5 => TextMatchingOptions::Levenstein5
-        };
-    }
-
     private function buildRangeValue(
         bool $is_numeric,
         string $value
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
index 842d9f8d6b4d..f7ce89c023dc 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
@@ -60,6 +60,8 @@ public function completeMigrationInsert(
         MigrationInsert $migration_insert
     ): ?MigrationInsert {
         $answer_input_mapping = [];
+        $gaps_insert = null;
+        $answer_options_insert = null;
 
         foreach ($this->fetchDBValues(
             $migration_insert->getDb(),
@@ -69,20 +71,19 @@ public function completeMigrationInsert(
             if (!isset($answer_input_mapping[$db_row->gap_number])) {
                 $answer_input_mapping[$db_row->gap_number] = $migration_insert->getUuid();
 
-                $migration_insert = $migration_insert->withAdditionalInsert(
-                    $this->buildGapInsertStatement(
-                        $this->persistence,
-                        $migration_insert->getTableNameBuilder(),
-                        $answer_input_mapping[$db_row->gap_number],
-                        $answer_form_id,
-                        $db_row->gap_number,
-                        $this->buildNewGapTypeIdentifierFromOld($db_row->type),
-                        null,
-                        null,
-                        null,
-                        $db_row->min_auto_complete,
-                        $db_row->shuffle_answers === '1' ? 1 : 0
-                    )
+                $gaps_insert = $this->buildGapInsertStatement(
+                    $this->persistence,
+                    $migration_insert->getTableNameBuilder(),
+                    $gaps_insert,
+                    $answer_input_mapping[$db_row->gap_number],
+                    $answer_form_id,
+                    $db_row->gap_number,
+                    $this->buildNewGapTypeIdentifierFromOld($db_row->type),
+                    null,
+                    null,
+                    null,
+                    $db_row->min_auto_complete,
+                    $db_row->shuffle_answers === '1' ? 1 : 0
                 );
 
                 $answers = array_map(
@@ -111,18 +112,17 @@ public function completeMigrationInsert(
         }
 
         foreach ($answers as $position => $answer) {
-            $migration_insert = $migration_insert->withAdditionalInsert(
-                $this->buildAnswerOptionInsertStatement(
-                    $this->persistence,
-                    $migration_insert->getTableNameBuilder(),
-                    $answer['answer_input_id'],
-                    $answer_input_mapping[$db_row->gap_number],
-                    $position,
-                    $answer['text'],
-                    $answer['points'],
-                    null,
-                    null
-                )
+            $answer_options_insert = $this->buildAnswerOptionInsertStatement(
+                $this->persistence,
+                $migration_insert->getTableNameBuilder(),
+                $answer_options_insert,
+                $answer['answer_input_id'],
+                $answer_input_mapping[$db_row->gap_number],
+                $position,
+                $answer['text'],
+                $answer['points'],
+                null,
+                null
             );
         }
 
@@ -141,7 +141,8 @@ public function completeMigrationInsert(
                     $db_row->long_menu_text,
                     $answer_input_mapping
                 )
-            );
+            )->withAdditionalInsert($gaps_insert)
+            ->withAdditionalInsert($answer_options_insert);
     }
 
     private function fetchDBValues(
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
index babc3bfe10eb..f11a705ef52a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
@@ -78,6 +78,7 @@ public function completeMigrationInsert(
             $this->buildGapInsertStatement(
                 $this->persistence,
                 $migration_insert->getTableNameBuilder(),
+                null,
                 $gap_id,
                 $answer_form_id,
                 0,
@@ -92,6 +93,7 @@ public function completeMigrationInsert(
             $this->buildAnswerOptionInsertStatement(
                 $this->persistence,
                 $migration_insert->getTableNameBuilder(),
+                null,
                 $migration_insert->getUuid(),
                 $gap_id,
                 0,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
index 26b67999b624..2217e30ec2cb 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
@@ -61,33 +61,51 @@ public function completeMigrationInsert(
         Environment $environment,
         MigrationInsert $migration_insert
     ): ?MigrationInsert {
+        $answer_form_id = $migration_insert->getAnswerFormId();
+        $answer_options_insert = null;
         $gaps = [];
 
         foreach ($this->fetchDBValues(
             $migration_insert->getDb(),
             $migration_insert->getOldQuestionId()
         ) as $db_row) {
-            $answer_form_id = $migration_insert->getAnswerFormId();
-
             if ($gaps === []) {
+                $gaps_insert = null;
                 for ($i = 0; $i < $db_row->correctanswers; $i++) {
-                    $gaps[] = $migration_insert->getUuid();
-                }
-            }
+                    $gap_id = $migration_insert->getUuid();
+                    $gaps[] = $gap_id;
 
-            foreach ($gaps as $gap_id) {
-                $migration_insert = $migration_insert->withAdditionalInsert(
-                    $this->buildAnswerOptionInsertStatement(
+                    $gaps_insert = $this->buildGapInsertStatement(
                         $this->persistence,
                         $migration_insert->getTableNameBuilder(),
-                        $migration_insert->getUuid(),
+                        $gaps_insert,
                         $gap_id,
-                        $db_row->aorder,
-                        $db_row->answertext,
-                        $db_row->points,
+                        $answer_form_id,
+                        $i,
+                        'text',
                         null,
-                        null
-                    )
+                        null,
+                        $this->buildNewTextRatingFromOld($db_row->textgap_rating),
+                        null,
+                        0
+                    );
+                }
+
+                $migration_insert = $migration_insert->withAdditionalInsert($gaps_insert);
+            }
+
+            foreach ($gaps as $gap_id) {
+                $answer_options_insert = $this->buildAnswerOptionInsertStatement(
+                    $this->persistence,
+                    $migration_insert->getTableNameBuilder(),
+                    $answer_options_insert,
+                    $migration_insert->getUuid(),
+                    $gap_id,
+                    $db_row->aorder,
+                    $db_row->answertext,
+                    $db_row->points,
+                    null,
+                    null
                 );
             }
         }
@@ -105,6 +123,8 @@ public function completeMigrationInsert(
                     ScoringIdentical::OnlyScoreDistinct,
                     0
                 )
+            )->withAdditionalInsert(
+                $answer_options_insert
             )->withAdditionalText(
                 implode(
                     "\n\n",

From b9566d7805dbabd095925ffb799c3a276de9bc0c Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 2 Feb 2026 18:23:26 +0100
Subject: [PATCH 112/141] Question: Add Page Component for Legacy Text

---
 .../PageEditor/QstsQuestionPageConfig.php     |  1 +
 .../class.ilPCLegacyAnswerFormText.php        | 59 +++++++++++++++++++
 .../class.ilPCLegacyAnswerFormTextGUI.php     | 33 +++++++++++
 components/ILIAS/Questions/service.xml        |  1 +
 .../classes/class.ilAssQuestionPage.php       | 59 +++++++++++++++++--
 lang/ilias_de.lang                            |  1 +
 lang/ilias_en.lang                            |  1 +
 7 files changed, 149 insertions(+), 6 deletions(-)
 create mode 100644 components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormText.php
 create mode 100644 components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormTextGUI.php

diff --git a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPageConfig.php b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPageConfig.php
index 0f811288baa8..5a671e51ae45 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPageConfig.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPageConfig.php
@@ -24,6 +24,7 @@ public function init(): void
     {
         $this->setEnablePCType('Tabs', true);
         $this->setEnablePCType('AnswerForm', true);
+        $this->setEnablePCType('LegacyAnswerFormText', true);
         $this->setEnableInternalLinks(false);
         $this->setEnablePageToc(true);
     }
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormText.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormText.php
new file mode 100644
index 000000000000..19c9c39495a3
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormText.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+class ilPCLegacyAnswerFormText extends ilPageContent
+{
+    private const string ELEMENT_TAG = 'LegacyAnswerFormText';
+    private const string TEXT_ATTRIBUTE = 'Text';
+    private const string TEXT_PLACEHOLDER = '\[\[\[LEGACY_ANSWER_FORM_TEXT_((?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?)\]\]\]';
+
+    public function init(): void
+    {
+        $this->setType('laft');
+    }
+
+    #[\Override]
+    public function modifyPageContentPostXsl(
+        string $output,
+        string $mode,
+        bool $abstract_only = false
+    ): string {
+        if ($this->pg_obj::class !== QstsQuestionPage::class) {
+            return $output;
+        }
+
+        return mb_ereg_replace_callback(
+            self::TEXT_PLACEHOLDER,
+            static fn(array $matches): string => base64_decode($matches[1]),
+            $output
+        );
+    }
+
+    public function create(
+        string $legacy_answer_form_text
+    ): void {
+        $this->createInitialChildNode(
+            $this->hier_id,
+            '',
+            self::ELEMENT_TAG,
+            [self::TEXT_ATTRIBUTE => $legacy_answer_form_text]
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormTextGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormTextGUI.php
new file mode 100644
index 000000000000..ba24c634cdc7
--- /dev/null
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormTextGUI.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+use ILIAS\UI\Component\MessageBox\MessageBox;
+
+/**
+ * @ilCtrl_isCalledBy ilPCLegacyAnswerFormTextGUI: ilPageEditorGUI
+ */
+class ilPCLegacyAnswerFormTextGUI extends ilPageContentGUI
+{
+    public function executeCommand()
+    {
+        $this->tpl->setOnScreenMessage(MessageBox::FAILURE, $this->lng->txt('legacy_text_cannot_be_edited'), true);
+        $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
+    }
+}
diff --git a/components/ILIAS/Questions/service.xml b/components/ILIAS/Questions/service.xml
index 4f310194a537..2f7a463b3da2 100644
--- a/components/ILIAS/Questions/service.xml
+++ b/components/ILIAS/Questions/service.xml
@@ -8,6 +8,7 @@
 	</objects>
     <copage>
         <pagecontent pc_type="answf" name="AnswerForm" directory="PageEditor" int_links="0" style_classes="1" xsl="0" def_enabled="0" top_item="1" order_nr="0" />
+        <pagecontent pc_type="laft" name="LegacyAnswerFormText" directory="PageEditor" int_links="0" style_classes="1" xsl="0" def_enabled="0" top_item="0" order_nr="0" />
         <pageobject parent_type="qsts" class_name="QstsQuestionPage" directory="Legacy/PageEditor" />
     </copage>
     <logging />
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php b/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
index 72c456ba3bab..4a86f5482d2e 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
@@ -19,6 +19,7 @@
 declare(strict_types=1);
 
 use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Data\UUID\Uuid;
 
 class ilAssQuestionPage extends ilPageObject
 {
@@ -62,17 +63,63 @@ private function migrateQuestionElementToAnswerForm(): void
         global $DIC;
         $dom_util = $DIC->copage()->internal()->domain()->domUtil();
 
-        $answer_forms = $this->question->getAnswerForms();
+        /** @var \ILIAS\Questions\AnswerForm\Properties $answer_form_properties */
+        $answer_form_properties = $this->question->getAnswerForms();
 
+        $dom_util->path($this->getDomDoc(), '//Question')
+            ->item(0)->parentNode->replaceWith(
+                $this->buildLegacyAnswerFormTextNode(),
+                $this->buildAnswerFormNode(
+                    reset($answer_form_properties)->getAnswerFormId()
+                )
+            );
+        $this->xml = $this->getXMLFromDom();
+    }
+
+    private function buildLegacyAnswerFormTextNode(): DOMNode
+    {
+        $legacy_answer_form_text_node = new ilPCLegacyAnswerFormText($this);
+        $legacy_answer_form_text_node->createPageContentNode();
+        $legacy_answer_form_text_node->writePCId($this->generatePCId());
+        $legacy_answer_form_text_node->create(
+            $this->retrieveLegacyPageElementContent()
+        );
+
+        return $legacy_answer_form_text_node->getDomNode();
+    }
+
+    private function buildAnswerFormNode(
+        Uuid $answer_form_id
+    ): DOMNode {
         $answer_form_node = new ilPCAnswerForm($this);
         $answer_form_node->createPageContentNode();
         $answer_form_node->writePCId($this->generatePCId());
-        $answer_form_node->create(
-            array_shift($answer_forms)->getAnswerFormId()
+        $answer_form_node->create($answer_form_id);
+
+        return $answer_form_node->getDomNode();
+    }
+
+    private function retrieveLegacyPageElementContent(): string
+    {
+        $question_info = $this->db->fetchObject(
+            $this->db->query(
+                "SELECT add_cont_edit_mode, question_text FROM qpl_questions WHERE question_id = {$this->id}"
+            )
         );
 
-        $dom_util->path($this->getDomDoc(), '//Question')
-            ->item(0)->parentNode->replaceWith($answer_form_node->getDomNode());
-        $this->xml = $this->getXMLFromDom();
+        $purified_content = ilHtmlPurifierFactory::getInstanceByType('qpl_usersolution')
+            ->purify($question_info->question_text);
+
+        if ($question_info->add_cont_edit_mode === assQuestion::ADDITIONAL_CONTENT_EDITING_MODE_IPE
+            || !(new ilSetting('advanced_editing'))->get('advanced_editing_javascript_editor') === 'tinymce') {
+            $purified_content = nl2br($purified_content);
+        }
+        return base64_encode(
+            ilLegacyFormElementsUtil::prepareTextareaOutput(
+                $purified_content,
+                true,
+                true
+            )
+        );
     }
 }
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index e780c27cd7f8..71579edb7fb3 100644
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -14048,6 +14048,7 @@ qsts#:#cloze_enable_combinations#:#Enable Gap Combination
 qsts#:#cont_ed_insert_answf#:#Antwortformular einfügen
 qsts#:#create_answer_form#:#Antwortformular erstellen
 qsts#:#edit_basic_form_properties#:#Grundeinstellungen der Frage bearbeiten
+qsts#:#legacy_text_cannot_be_edited#:#Der Text stammt aus einer überführten Frage und kann nicht geändert werden.
 qsts#:#qst_lifecycle#:#Lebenszyklus
 qsts#:#qst_lifecycle_draft#:#Entwurf
 qsts#:#qst_lifecycle_filter_all#:#Alle Lebenszyklen
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index f8d7c6567aae..3aad51aced17 100644
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -14021,6 +14021,7 @@ qsts#:#cloze_enable_combinations#:#Lückenkombinationen aktivieren
 qsts#:#cont_ed_insert_answf#:#Insert Answer Form
 qsts#:#create_answer_form#:#Create Answer Form
 qsts#:#edit_basic_form_properties#:#Edit Basic Form Properties
+qsts#:#legacy_text_cannot_be_edited#:#This text was migrated from the previous question implementation and cannot be edited.
 qsts#:#qst_lifecycle#:#Lifecycle
 qsts#:#qst_lifecycle_draft#:#Draft
 qsts#:#qst_lifecycle_filter_all#:#All Lifecycles

From 4a97f2d5ccdd23c007611466311503ad6b36e1fd Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 2 Feb 2026 18:28:07 +0100
Subject: [PATCH 113/141] COPage/Export: Add LegacyTextElement

---
 components/ILIAS/COPage/xsl/page.xsl        | 3 +++
 components/ILIAS/Export/xml/ilias_pg_12.dtd | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/components/ILIAS/COPage/xsl/page.xsl b/components/ILIAS/COPage/xsl/page.xsl
index a37c7780498e..bdc9412fbd0b 100755
--- a/components/ILIAS/COPage/xsl/page.xsl
+++ b/components/ILIAS/COPage/xsl/page.xsl
@@ -3736,6 +3736,9 @@
 	</div>
 </xsl:template>
 
+<xsl:template match="LegacyAnswerFormText">
+    [[[LEGACY_ANSWER_FORM_TEXT_<xsl:value-of select="@Text"/>]]]
+</xsl:template>
 <xsl:template match="AnswerForm">
 	[[[ANSWER_FORM_<xsl:value-of select="@Uuid"/>]]]
 </xsl:template>
diff --git a/components/ILIAS/Export/xml/ilias_pg_12.dtd b/components/ILIAS/Export/xml/ilias_pg_12.dtd
index 0071822931b3..64e6145fe231 100755
--- a/components/ILIAS/Export/xml/ilias_pg_12.dtd
+++ b/components/ILIAS/Export/xml/ilias_pg_12.dtd
@@ -23,7 +23,7 @@
 <!-- PageObjects are comparable to LOM LearningObjects of aggregation level 2 -->
 <!ELEMENT PageObject (PageContent*, Layout?, InitOpenedContent?)>
 
-<!ELEMENT PageContent ((Paragraph | MediaObject | Table | List | FileList | Question | AnswerForm | PlaceHolder | Section | Resources | LoginPageElement | Map | Plugged | Tabs | ContentInclude | InteractiveImage | Profile | Verification | Blog | QuestionOverview | Skills | LearningHistory | ConsultationHours | MyCourses | AMDPageList | AMDForm | Grid | Curriculum | Launcher | PRGStatusInfo | PRGActionNote), BibItemIdentifier*)>
+<!ELEMENT PageContent ((Paragraph | MediaObject | Table | List | FileList | Question | LegacyAnswerFormText | AnswerForm | PlaceHolder | Section | Resources | LoginPageElement | Map | Plugged | Tabs | ContentInclude | InteractiveImage | Profile | Verification | Blog | QuestionOverview | Skills | LearningHistory | ConsultationHours | MyCourses | AMDPageList | AMDForm | Grid | Curriculum | Launcher | PRGStatusInfo | PRGActionNote), BibItemIdentifier*)>
 
 <!-- enable/disable paragraph elements -->
 <!ATTLIST PageContent
@@ -318,6 +318,12 @@ col or row span. -->
 	QRef CDATA #REQUIRED
 >
 
+<!-- LegacyAnswerFormText -->
+<!ELEMENT LegacyAnswerFormText EMPTY>
+<!ATTLIST LegacyAnswerFormText
+	Text CDATA #REQUIRED
+>
+
 <!-- AnswerForm -->
 <!ELEMENT AnswerForm EMPTY>
 <!ATTLIST AnswerForm

From 0a2d7466caa5546809fca16754bad9461950f6bb Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 2 Feb 2026 18:36:57 +0100
Subject: [PATCH 114/141] Questions: Little Improvement in SubText Migration

---
 .../Cloze/Migration/MigrationTextSubset.php   | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
index 2217e30ec2cb..ab57e0f4d3c3 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
@@ -126,13 +126,7 @@ public function completeMigrationInsert(
             )->withAdditionalInsert(
                 $answer_options_insert
             )->withAdditionalText(
-                implode(
-                    "\n\n",
-                    array_map(
-                        fn(Uuid $v) => "{{GAP_{$v->toString()}}}",
-                        $gaps,
-                    )
-                )
+                $this->buildAdditionalTextFromGapsArray($gaps)
             );
     }
 
@@ -150,4 +144,19 @@ private function fetchDBValues(
             yield $row;
         }
     }
+
+    private function buildAdditionalTextFromGapsArray(
+        array $gaps
+    ): string {
+        $text_array = [];
+        foreach ($gaps as $index => $gap) {
+            $position = $index + 1;
+            $text_array[] = "{$position}. {{GAP_{$gap->toString()}}}";
+        }
+
+        return implode(
+            "\n\n",
+            $text_array
+        );
+    }
 }

From d2dcc00411a4d5ebe256722a13fa1d5d3a09be93 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Mon, 2 Feb 2026 18:50:02 +0100
Subject: [PATCH 115/141] Questions: Rename Function for More Clarity

---
 components/ILIAS/Questions/src/Presentation/Views/Edit.php  | 4 ++--
 .../ILIAS/Questions/src/Question/QuestionImplementation.php | 4 ++--
 .../ILIAS/Questions/src/Question/Views/Participant.php      | 6 +++---
 .../TestQuestionPool/classes/class.ilAssQuestionPage.php    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index d35f0adf2fbb..792466fc2e14 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -243,7 +243,7 @@ public function editAnswerForm(
         }
 
         $this->questions_repository->update(
-            [$question->withAnswerForm($next)]
+            [$question->withAnswerFormProperties($next)]
         );
 
         $this->ctrl->redirectToURL(
@@ -423,7 +423,7 @@ private function forwardCreateAnswerFormCmd(
         }
 
         $this->questions_repository->create(
-            [$question->withAnswerForm($create)]
+            [$question->withAnswerFormProperties($create)]
         );
 
         $content_object->create($create->getAnswerFormId());
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index dc53fde12789..94c0861d2b3c 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -203,7 +203,7 @@ public function getCreated(): ?\DateTimeImmutable
         return $this->created;
     }
 
-    public function getAnswerForms(): array
+    public function getAnswerFormProperties(): array
     {
         return $this->answer_forms;
     }
@@ -214,7 +214,7 @@ public function getAnswerFormPropertiesByIdString(
         return $this->answer_forms[$form_id] ?? null;
     }
 
-    public function withAnswerForm(
+    public function withAnswerFormProperties(
         AnswerFormProperties $answer_form
     ): self {
         $clone = clone $this;
diff --git a/components/ILIAS/Questions/src/Question/Views/Participant.php b/components/ILIAS/Questions/src/Question/Views/Participant.php
index 775aff19fd8e..f36881863239 100644
--- a/components/ILIAS/Questions/src/Question/Views/Participant.php
+++ b/components/ILIAS/Questions/src/Question/Views/Participant.php
@@ -37,7 +37,7 @@ public function __construct(
     public function withIsAsync(
         bool $async
     ): self {
-        foreach ($this->question->getAnswerForms() as $form) {
+        foreach ($this->question->getAnswerFormProperties() as $form) {
             if (!$form->getType()->isAsyncPresentationAvailable()) {
                 throw \Exception('This QuestionType has no async presentation.');
             }
@@ -58,7 +58,7 @@ public function withIsInteractive(
     public function withShowMarks(
         bool $show_marks
     ): self {
-        foreach ($this->question->getAnswerForms() as $form) {
+        foreach ($this->question->getAnswerFormProperties() as $form) {
             if (!$form->getType()->isMarkable()) {
                 throw \Exception('This QuestionType cannot be marked.');
             }
@@ -72,7 +72,7 @@ public function withShowMarks(
     public function withShowCorrectSolution(
         bool $show_correct_solution
     ): self {
-        foreach ($this->question->getAnswerForms() as $form) {
+        foreach ($this->question->getAnswerFormProperties() as $form) {
             if (!$form->getType()->isMarkable()) {
                 throw \Exception('This QuestionType cannot be marked.');
             }
diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php b/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
index 4a86f5482d2e..8f3a80954dea 100755
--- a/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
+++ b/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPage.php
@@ -64,7 +64,7 @@ private function migrateQuestionElementToAnswerForm(): void
         $dom_util = $DIC->copage()->internal()->domain()->domUtil();
 
         /** @var \ILIAS\Questions\AnswerForm\Properties $answer_form_properties */
-        $answer_form_properties = $this->question->getAnswerForms();
+        $answer_form_properties = $this->question->getAnswerFormProperties();
 
         $dom_util->path($this->getDomDoc(), '//Question')
             ->item(0)->parentNode->replaceWith(

From d5175589354829e0a933969bb11498447404c689 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Tue, 3 Feb 2026 10:56:23 +0100
Subject: [PATCH 116/141] UI: Add Icon For Questions

---
 .../src/UserSettings/EditingMode.php          | 136 ++++++++++++++++++
 .../src/UserSettings/EditingModes.php         | 136 ++++++++++++++++++
 .../Questions/src/UserSettings/Settings.php   |  33 +++++
 .../resources/images/standard/icon_qsts.svg   |  41 ++++++
 .../UI/src/Component/Symbol/Icon/Standard.php |   2 +-
 .../Component/Symbol/Icon/Standard.php        |   2 +-
 6 files changed, 348 insertions(+), 2 deletions(-)
 create mode 100644 components/ILIAS/Questions/src/UserSettings/EditingMode.php
 create mode 100644 components/ILIAS/Questions/src/UserSettings/EditingModes.php
 create mode 100644 components/ILIAS/Questions/src/UserSettings/Settings.php
 create mode 100755 components/ILIAS/UI/resources/images/standard/icon_qsts.svg

diff --git a/components/ILIAS/Questions/src/UserSettings/EditingMode.php b/components/ILIAS/Questions/src/UserSettings/EditingMode.php
new file mode 100644
index 000000000000..7dc14af45b20
--- /dev/null
+++ b/components/ILIAS/Questions/src/UserSettings/EditingMode.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Calendar\UserSettings;
+
+use ILIAS\User\Settings\SettingDefinition;
+use ILIAS\User\Settings\AvailablePages;
+use ILIAS\User\Settings\AvailableSections;
+use ILIAS\Language\Language;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Input;
+use ILIAS\Refinery\Factory as Refinery;
+
+class DateFormat implements SettingDefinition
+{
+    public function getIdentifier(): string
+    {
+        return 'date_format';
+    }
+
+    public function isAvailable(): bool
+    {
+        return true;
+    }
+
+    public function getLabel(Language $lng): string
+    {
+        return $lng->txt('cal_user_date_format');
+    }
+
+    public function getSettingsPage(): AvailablePages
+    {
+        return AvailablePages::MainSettings;
+    }
+
+    public function getSection(): AvailableSections
+    {
+        return AvailableSections::DateTime;
+    }
+
+    public function getInput(
+        FieldFactory $field_factory,
+        Language $lng,
+        Refinery $refinery,
+        \ilSetting $settings,
+        ?\ilObjUser $user = null
+    ): Input {
+        $lng->loadLanguageModule('dateplaner');
+        return $field_factory->select(
+            $lng->txt('cal_user_date_format'),
+            $this->buildOptions(),
+            $lng->txt('cal_date_format_info')
+        )->withRequired(true)
+        ->withValue(
+            $user !== null
+                ? $this->retrieveValueFromUser($user)
+                : \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
+        );
+    }
+
+    public function getLegacyInput(
+        Language $lng,
+        \ilSetting $settings,
+        ?\ilObjUser $user = null
+    ): \ilFormPropertyGUI {
+        $lng->loadLanguageModule('dateplaner');
+        $input = new \ilSelectInputGUI($lng->txt('cal_user_date_format'));
+        $input->setOptions($this->buildOptions());
+        $input->setInfo($lng->txt('cal_date_format_info'));
+        $input->setValue(
+            $user !== null
+                ? $this->retrieveValueFromUser($user)
+                : \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
+        );
+        return $input;
+    }
+
+    public function getDefaultValueForDisplay(
+        Language $lng,
+        \ilSetting $settings
+    ): string {
+        return $this->buildOptions()[\ilCalendarSettings::_getInstance()->getDefaultDateFormat()];
+    }
+
+    private function buildOptions(): array
+    {
+        $year = date('Y');
+        return [
+            \ilCalendarSettings::DATE_FORMAT_DMY => '31.10.' . $year,
+            \ilCalendarSettings::DATE_FORMAT_YMD => $year . '-10-31',
+            \ilCalendarSettings::DATE_FORMAT_MDY => '10/31/' . $year
+        ];
+    }
+
+    public function hasUserPersonalizedSetting(
+        \ilSetting $settings,
+        \ilObjUser $user
+    ): bool {
+        return $this->retrieveValueFromUser($user)
+            !== \ilCalendarSettings::_getInstance()->getDefaultDateFormat();
+    }
+
+    public function persistUserInput(
+        \ilObjUser $user,
+        mixed $input
+    ): \ilObjUser {
+        $user->setPref(
+            'date_format',
+            $input !== null ? $input : (string) \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
+        );
+        return $user;
+    }
+
+    public function retrieveValueFromUser(\ilObjUser $user): int
+    {
+        return (int) ($user->getPref('date_format')
+            ?? \ilCalendarSettings::_getInstance()->getDefaultDateFormat());
+    }
+}
diff --git a/components/ILIAS/Questions/src/UserSettings/EditingModes.php b/components/ILIAS/Questions/src/UserSettings/EditingModes.php
new file mode 100644
index 000000000000..7dc14af45b20
--- /dev/null
+++ b/components/ILIAS/Questions/src/UserSettings/EditingModes.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Calendar\UserSettings;
+
+use ILIAS\User\Settings\SettingDefinition;
+use ILIAS\User\Settings\AvailablePages;
+use ILIAS\User\Settings\AvailableSections;
+use ILIAS\Language\Language;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Input;
+use ILIAS\Refinery\Factory as Refinery;
+
+class DateFormat implements SettingDefinition
+{
+    public function getIdentifier(): string
+    {
+        return 'date_format';
+    }
+
+    public function isAvailable(): bool
+    {
+        return true;
+    }
+
+    public function getLabel(Language $lng): string
+    {
+        return $lng->txt('cal_user_date_format');
+    }
+
+    public function getSettingsPage(): AvailablePages
+    {
+        return AvailablePages::MainSettings;
+    }
+
+    public function getSection(): AvailableSections
+    {
+        return AvailableSections::DateTime;
+    }
+
+    public function getInput(
+        FieldFactory $field_factory,
+        Language $lng,
+        Refinery $refinery,
+        \ilSetting $settings,
+        ?\ilObjUser $user = null
+    ): Input {
+        $lng->loadLanguageModule('dateplaner');
+        return $field_factory->select(
+            $lng->txt('cal_user_date_format'),
+            $this->buildOptions(),
+            $lng->txt('cal_date_format_info')
+        )->withRequired(true)
+        ->withValue(
+            $user !== null
+                ? $this->retrieveValueFromUser($user)
+                : \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
+        );
+    }
+
+    public function getLegacyInput(
+        Language $lng,
+        \ilSetting $settings,
+        ?\ilObjUser $user = null
+    ): \ilFormPropertyGUI {
+        $lng->loadLanguageModule('dateplaner');
+        $input = new \ilSelectInputGUI($lng->txt('cal_user_date_format'));
+        $input->setOptions($this->buildOptions());
+        $input->setInfo($lng->txt('cal_date_format_info'));
+        $input->setValue(
+            $user !== null
+                ? $this->retrieveValueFromUser($user)
+                : \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
+        );
+        return $input;
+    }
+
+    public function getDefaultValueForDisplay(
+        Language $lng,
+        \ilSetting $settings
+    ): string {
+        return $this->buildOptions()[\ilCalendarSettings::_getInstance()->getDefaultDateFormat()];
+    }
+
+    private function buildOptions(): array
+    {
+        $year = date('Y');
+        return [
+            \ilCalendarSettings::DATE_FORMAT_DMY => '31.10.' . $year,
+            \ilCalendarSettings::DATE_FORMAT_YMD => $year . '-10-31',
+            \ilCalendarSettings::DATE_FORMAT_MDY => '10/31/' . $year
+        ];
+    }
+
+    public function hasUserPersonalizedSetting(
+        \ilSetting $settings,
+        \ilObjUser $user
+    ): bool {
+        return $this->retrieveValueFromUser($user)
+            !== \ilCalendarSettings::_getInstance()->getDefaultDateFormat();
+    }
+
+    public function persistUserInput(
+        \ilObjUser $user,
+        mixed $input
+    ): \ilObjUser {
+        $user->setPref(
+            'date_format',
+            $input !== null ? $input : (string) \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
+        );
+        return $user;
+    }
+
+    public function retrieveValueFromUser(\ilObjUser $user): int
+    {
+        return (int) ($user->getPref('date_format')
+            ?? \ilCalendarSettings::_getInstance()->getDefaultDateFormat());
+    }
+}
diff --git a/components/ILIAS/Questions/src/UserSettings/Settings.php b/components/ILIAS/Questions/src/UserSettings/Settings.php
new file mode 100644
index 000000000000..712899fd1073
--- /dev/null
+++ b/components/ILIAS/Questions/src/UserSettings/Settings.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Authentication\UserSettings;
+
+use ILIAS\User\Settings\UserSettings;
+
+class Settings implements UserSettings
+{
+    public function getSettingConfigurations(): array
+    {
+        return [
+            Password::class
+        ];
+    }
+}
diff --git a/components/ILIAS/UI/resources/images/standard/icon_qsts.svg b/components/ILIAS/UI/resources/images/standard/icon_qsts.svg
new file mode 100755
index 000000000000..a47443e9b27c
--- /dev/null
+++ b/components/ILIAS/UI/resources/images/standard/icon_qsts.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 320 320" style="enable-background:new 0 0 320 320;" xml:space="preserve">
+<style type="text/css">
+	.st0{clip-path:url(#SVGID_00000140736345361847505430000017898688850676249222_);fill:#4C6586;}
+</style>
+<g>
+	<g>
+		<defs>
+			<rect id="SVGID_1_" y="0" width="320" height="320"/>
+		</defs>
+		<clipPath id="SVGID_00000099631938914626412460000005911421579149799315_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<path style="clip-path:url(#SVGID_00000099631938914626412460000005911421579149799315_);fill:#4C6586;" d="M229.1,257.9h-33.6
+			V288h33.6V257.9z M245.4,85.3c3.2-3.4,4.8-8.1,4.5-13.3c-0.6-8.5-6.1-17.5-15.1-24.7c-13.8-11-31.4-12.4-39.4-3.2
+			c-2.8,3.2-3.7,8.2-4.8,13.9c-0.6,3.1-1.7,9.2-3.1,11.3c-0.4-0.2-1.1-0.5-2-1c-2.6-3.2-11.4-14.4-16.7-21l-1.1-1.4
+			C161.8,38.4,155.2,30,143,30c-1.9,0-3.7,0.7-5,1.9l-17.2,15.5c-3.1,2.4-20.4,16.9-17.9,34.9c1.1,7.8,8.9,9.9,15.9,11.8
+			c4,1.1,9.4,2.5,11.2,4.6c1.4,1.6,2.1,3.9,1.9,6.6c-0.4,5-3.8,10.5-9.3,14.9c-10.3,8.4-21.6,6.3-23.7,4.1c-0.9-1.1-1.9-5.6-2.6-8.5
+			c-1.7-7.3-3.6-15.6-9.9-20.5c-12.3-9.6-25.7,3.9-30.1,8.4l-0.5,0.5c-3.9,3.9-15.9,18.5-20.4,27.2c-3.7,7.1,0.1,14.9,11.4,23.2
+			c5.4,4,11.2,7.2,12.8,8.1c5.3,3.7,10.5,8.6,12.3,11.5c-1.6,1.1-4.1,2.1-6.7,3.1c-4.7,1.8-10.1,3.8-14.4,8.2
+			c-10.5,10.6-4.1,31.7,1.5,40.1c7.5,11.3,29.7,13.2,40.8,6.4c11.4-7,12.5-17.2,13.1-23.3c0.1-1,0.2-2.3,0.4-3
+			c0.3-0.2,0.4-0.3,0.4-0.3c0.1,0,1.2,0.2,3.4,2.4c5.2,5.2,19.1,20.4,21.1,22.6c4.6,6.1,10,9.1,15.8,9.1c1.3,0,2.5-0.1,3.8-0.4
+			c5.8-1.2,11.2-5.1,17.4-9.5l0.3-0.2c13.6-9.7,21.6-27,17.6-37.7c-2.7-7.1-10.5-9-17.4-10.6c-4.5-1.1-9.5-2.3-11.7-4.4
+			c-0.3-0.3-0.6-1.1-0.6-2.6c0-2.4,0.8-5.4,1.9-8.4l-10.4-12.9c-3.7,6.5-6.5,14.5-6.5,21.3s2.7,11,5,13.2c5.2,5.1,12.7,6.9,18.8,8.4
+			c2.2,0.5,5.5,1.3,6.9,2c0.2,3.3-3.2,13-12.4,19.5l-0.3,0.2c-12.7,9-13,8.5-16.6,3.7c-0.1-0.2-0.3-0.4-0.5-0.6
+			c-0.6-0.7-15.9-17.5-21.8-23.3c-4.9-4.9-9.7-6.7-14-6.7c-4.6,0-8.6,2.1-11.6,5.1c-3.4,3.4-3.8,7.8-4.2,11.7
+			c-0.6,5.5-1.2,9.1-6,12.1c-5.2,3.2-18.2,1.5-20.5-1.9c-4.2-6.3-6.1-18.4-3.3-21.2c2-2,5.4-3.4,9.1-4.7c5.1-1.9,10.9-4.1,14.7-9.3
+			c1.9-2.5,2.6-5.7,2.1-8.9c-1.5-9.3-14.2-19.1-19.5-22.9c-0.3-0.2-0.5-0.3-0.8-0.5c-7.6-4-15.4-9.8-17.6-12.8
+			c4.3-7.4,14.3-19.4,16.9-22.1l0.6-0.6c7.3-7.4,9.7-7.3,10.1-7.2c0,0,0.1,0,0.2,0.1c2.1,1.6,3.5,7.7,4.5,12.1
+			c1.4,5.9,2.6,11.4,6.1,15.2c8.3,9.1,28.5,10.3,44.2-2.5c8.8-7.1,14-16.1,14.8-25.4c0.6-6.8-1.4-13.1-5.6-17.7
+			c-4.8-5.4-12.4-7.5-18.5-9.1c-1.5-0.4-3.6-1-5-1.5c0.4-8,9-16.3,12.5-19.1c0.2-0.1,0.3-0.3,0.5-0.4l14.8-13.4
+			c3.4,1.1,6.2,4.5,10.4,9.8l1.1,1.5c6.2,7.9,17.4,22,17.4,22c0.4,0.6,1,1,1.5,1.4c6.2,4.4,12,5.6,17.1,3.6
+			c8.6-3.4,10.6-14.1,12.2-22.8c0.4-2.3,1.1-5.8,1.6-7.1c1.7-1.3,10-1.5,18.4,5.3c6.7,5.4,9.3,10.7,9.5,14c0.1,1.2-0.2,1.7-0.3,1.9
+			c-2.9,3.1-5.5,3.9-9.1,5c-4.9,1.5-11.1,3.4-16.5,11.2c-1.1,1.7-1.9,3.4-2.3,5.2l15.5,2.2c2.1-2.6,4.2-3.2,7.7-4.3
+			C234.3,92.9,239.8,91.2,245.4,85.3 M270,159.7c0-29.9-28.6-41.7-55-41.7c-16.3,0-28.9,3-42.9,7.3l1.5,26.1c10.8-4,22.6-7,34.1-7
+			c12.8,0,26.4,5.8,26.4,20.1c0,28.4-36.7,28.4-36.7,72.1v3.3H227V236C227.1,200.9,270,197.4,270,159.7"/>
+	</g>
+</g>
+</svg>
diff --git a/components/ILIAS/UI/src/Component/Symbol/Icon/Standard.php b/components/ILIAS/UI/src/Component/Symbol/Icon/Standard.php
index f27efd55ac11..c405aacc3452 100755
--- a/components/ILIAS/UI/src/Component/Symbol/Icon/Standard.php
+++ b/components/ILIAS/UI/src/Component/Symbol/Icon/Standard.php
@@ -184,7 +184,7 @@ interface Standard extends Icon
     public const GCON = 'gcon';	    //Group Conversaion
     public const FILS = 'fils';	    //File System Service
     public const TALA = 'tala';	    //Employee Talk Template Admin
-    public const QST = 'ques';     //Question
+    public const QSTS = 'qsts';     //Question Component
     public const GSFO = 'gsfo';     //Footer Administration
     public const STUS = 'stus';     //Shortlink
     public const ADMA = 'adma';     //Administration - General Settings
diff --git a/components/ILIAS/UI/src/Implementation/Component/Symbol/Icon/Standard.php b/components/ILIAS/UI/src/Implementation/Component/Symbol/Icon/Standard.php
index ae2788bb5693..134cb392eba1 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Symbol/Icon/Standard.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Symbol/Icon/Standard.php
@@ -152,7 +152,7 @@ class Standard extends Icon implements C\Symbol\Icon\Standard
         self::CON,
         self::FILS,
         self::TALA,
-        self::QST,
+        self::QSTS,
         self::STUS,
         self::GSFO,
         self::ADMA,

From b683ac4f6e185059cc77901c6ada35cfb2d006a0 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Tue, 3 Feb 2026 10:57:53 +0100
Subject: [PATCH 117/141] UI: Add Icon For Questions

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       |   4 +-
 components/ILIAS/Questions/Questions.php      |   2 +
 .../Questions/src/Presentation/Views/Edit.php |   8 ++
 .../src/Question/QuestionImplementation.php   |   5 +
 .../Questions/src/Question/Views/Edit.php     | 107 +++++++++++-----
 .../src/UserSettings/EditingMode.php          |  87 +++++++------
 .../src/UserSettings/EditingModes.php         | 116 ++----------------
 .../Questions/src/UserSettings/Settings.php   |   5 +-
 8 files changed, 162 insertions(+), 172 deletions(-)

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 926462a6ab37..589dc481c4f9 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -82,7 +82,9 @@ protected static function buildDIC(ILIASContainer $DIC): self
             );
         $dic[Edit::class] = static fn($c): Edit => new Edit(
             $DIC['lng'],
-            $DIC['ilUser'],
+            $DIC['ilSetting'],
+            $DIC['user']->getSettings(),
+            $DIC['user']->getLoggedInUser(),
             $DIC['refinery'],
             $DIC['ui.factory'],
             $DIC['ui.renderer'],
diff --git a/components/ILIAS/Questions/Questions.php b/components/ILIAS/Questions/Questions.php
index 0354c1e3430b..5f1ce88139e0 100644
--- a/components/ILIAS/Questions/Questions.php
+++ b/components/ILIAS/Questions/Questions.php
@@ -64,6 +64,8 @@ public function init(
         );
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
             new Component\Resource\ComponentJS($this, 'js/dist/ParticipantViewLongMenu.js');
+        $contribute[User\Settings\UserSettings::class] = fn() =>
+            new Questions\UserSettings\Settings();
 
         $internal[Persistence::class] = static fn() => new Persistence(
             new TableNameSpaceCore('cloze')
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 792466fc2e14..bb4423b1301b 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -45,6 +45,7 @@
 use ILIAS\UI\Renderer as UIRenderer;
 use ILIAS\UI\Component\Item\Group as ItemGroup;
 use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
+use ILIAS\User\Settings\Settings as UserSettings;
 use ILIAS\Style\Content\Service as ContentStyle;
 use ILIAS\GlobalScreen\Services as GlobalScreen;
 
@@ -64,6 +65,8 @@ class Edit
 
     public function __construct(
         private readonly Language $lng,
+        private readonly \ilSetting $settings,
+        private readonly UserSettings $user_settings,
         private readonly \ilObjUser $current_user,
         private readonly Refinery $refinery,
         private readonly UIFactory $ui_factory,
@@ -260,6 +263,8 @@ private function createQuestion(
             $environment->getObjId()
         )->getEditView(
             $this->lng,
+            $this->settings,
+            $this->user_settings,
             $this->current_user,
             $this->ui_factory,
             $this->refinery,
@@ -298,6 +303,7 @@ private function editQuestion(
 
         $edit = $question->getEditView(
             $this->lng,
+            $this->user_settings,
             $this->current_user,
             $this->ui_factory,
             $this->refinery,
@@ -505,6 +511,8 @@ private function buildEditStartView(
     ): EditForm {
         return $question->getEditView(
             $this->lng,
+            $this->settings,
+            $this->user_settings,
             $this->current_user,
             $this->ui_factory,
             $this->refinery,
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index 94c0861d2b3c..a607cd490046 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -39,6 +39,7 @@
 use ILIAS\UI\Component\Link\Standard as StandardLink;
 use ILIAS\UI\Component\Table\DataRowBuilder;
 use ILIAS\UI\Component\Table\DataRow;
+use ILIAS\User\Settings\Settings as UserSettings;
 use ILIAS\Refinery\Factory as Refinery;
 use Psr\Http\Message\RequestInterface;
 
@@ -247,6 +248,8 @@ public function isClone(): bool
 
     public function getEditView(
         Language $lng,
+        \ilSetting $settings,
+        UserSettings $user_settings,
         \ilObjUser $current_user,
         UIFactory $ui_factory,
         Refinery $refinery,
@@ -255,6 +258,8 @@ public function getEditView(
     ): Views\Edit {
         return new Views\Edit(
             $lng,
+            $settings,
+            $user_settings,
             $current_user,
             $ui_factory,
             $refinery,
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index 5a21f551dbc4..8cccb9cc4ae3 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -25,10 +25,12 @@
 use ILIAS\Questions\Question\Question;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
+use ILIAS\Questions\UserSettings\EditingMode;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\Component\Panel\Standard as StandardPanel;
+use ILIAS\User\Settings\Settings as UserSettings;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
 use Psr\Http\Message\RequestInterface;
@@ -39,6 +41,8 @@ class Edit
 
     public function __construct(
         private readonly Language $lng,
+        private readonly \ilSetting $settings,
+        private readonly UserSettings $user_settings,
         private readonly \ilObjUser $current_user,
         private readonly UIFactory $ui_factory,
         private readonly Refinery $refinery,
@@ -53,8 +57,11 @@ public function create(
         EnvironmentImplementation $environment
     ): EditForm|Question {
         return match ($environment->getStep()) {
-            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm($environment),
-            default => $this->buildBasicPropertiesForm($environment)
+            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm(
+                $environment,
+                true
+            ),
+            default => $this->buildBasicPropertiesForm($environment, true)
         };
     }
 
@@ -63,28 +70,37 @@ public function edit(
         Participant $participant_view
     ): EditForm|Question {
         return match ($environment->getStep()) {
-            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm($environment),
-            default => $this->buildBasicPropertiesForm($environment)->withContentAfterForm(
+            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm(
+                $environment,
+                false
+            ),
+            default => $this->buildBasicPropertiesForm(
+                $environment,
+                false
+            )->withContentAfterForm(
                 $this->buildPreviewPanel($environment, $participant_view)
             )
         };
     }
 
     private function buildBasicPropertiesForm(
-        EnvironmentImplementation $environment
+        EnvironmentImplementation $environment,
+        bool $is_context_create
     ): EditForm {
         return $environment->getPresentationFactory()->getEditForm(
             $environment->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION),
-            $this->buildBasicPropertiesInputs(),
+            $this->buildBasicPropertiesSection($is_context_create),
             true
         );
     }
 
     private function processBasicPropertiesForm(
-        EnvironmentImplementation $environment
+        EnvironmentImplementation $environment,
+        bool $is_context_create
     ): EditForm|Question {
         $form = $this->buildBasicPropertiesForm(
-            $environment
+            $environment,
+            $is_context_create
         )->withRequest($this->request);
 
         $data = $form->getData();
@@ -93,38 +109,69 @@ private function processBasicPropertiesForm(
             : $data;
     }
 
-    private function buildBasicPropertiesInputs(): Section
-    {
+    private function buildBasicPropertiesSection(
+        bool $needs_create_mode_input
+    ): Section {
         $ff = $this->ui_factory->input()->field();
+
+        $inputs = $this->buildBasicPropertiesInputs();
+        $values = $this->buildBasicPropertiesBasicValuesArray();
+
+        if ($needs_create_mode_input) {
+            $user_settings = $this->user_settings
+                ->getSettingByDefinitionClass(EditingMode::class);
+            $inputs['create_mode'] = $user_settings->getInput(
+                $ff,
+                $this->lng,
+                $this->refinery,
+                $this->settings
+            );
+            $values['create_mode'] = $user_settings->retrieveValueFromUser(
+                $this->current_user
+            );
+        }
+
         $section = $ff->section(
-            [
-                'title' => $ff->text($this->lng->txt('title'))
-                    ->withRequired(true),
-                'author' => $ff->text($this->lng->txt('author')),
-                'lifecycle' => $ff->select(
-                    $this->lng->txt('qst_lifecycle'),
-                    array_reduce(
-                        Lifecycle::cases(),
-                        function (array $c, Lifecycle $v): array {
-                            $c[$v->value] = $this->lng->txt("qst_lifecycle_{$v->value}");
-                            return $c;
-                        },
-                        []
-                    )
-                )->withRequired(true),
-                'remarks' => $ff->textarea($this->lng->txt('qst_remarks'))
-            ],
+            $inputs,
             $this->lng->txt('edit_basic_form_properties')
         )->withAdditionalTransformation($this->buildAddBasicPropertiesToQuestionTrafo());
 
-        return $section->withValue([
+        return $section->withValue($values);
+    }
+
+    private function buildBasicPropertiesInputs(): array
+    {
+        $ff = $this->ui_factory->input()->field();
+
+        return [
+            'title' => $ff->text($this->lng->txt('title'))
+                ->withRequired(true),
+            'author' => $ff->text($this->lng->txt('author')),
+            'lifecycle' => $ff->select(
+                $this->lng->txt('qst_lifecycle'),
+                array_reduce(
+                    Lifecycle::cases(),
+                    function (array $c, Lifecycle $v): array {
+                        $c[$v->value] = $this->lng->txt("qst_lifecycle_{$v->value}");
+                        return $c;
+                    },
+                    []
+                )
+            )->withRequired(true),
+            'remarks' => $ff->textarea($this->lng->txt('qst_remarks'))
+        ];
+    }
+
+    private function buildBasicPropertiesBasicValuesArray(): array
+    {
+        return [
             'title' => $this->question->getTitle(),
             'author' => $this->question->getAuthor() !== ''
                 ? $this->question->getAuthor()
                 : $this->current_user->getFullname(),
             'lifecycle' => $this->question->getLifecycle()->value,
             'remarks' => $this->question->getRemarks()
-        ]);
+        ];
     }
 
     private function buildAddBasicPropertiesToQuestionTrafo(): Transformation
diff --git a/components/ILIAS/Questions/src/UserSettings/EditingMode.php b/components/ILIAS/Questions/src/UserSettings/EditingMode.php
index 7dc14af45b20..8da6be0068d9 100644
--- a/components/ILIAS/Questions/src/UserSettings/EditingMode.php
+++ b/components/ILIAS/Questions/src/UserSettings/EditingMode.php
@@ -18,43 +18,50 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Calendar\UserSettings;
+namespace ILIAS\Questions\UserSettings;
 
 use ILIAS\User\Settings\SettingDefinition;
 use ILIAS\User\Settings\AvailablePages;
 use ILIAS\User\Settings\AvailableSections;
 use ILIAS\Language\Language;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Field\Radio;
 use ILIAS\UI\Component\Input\Input;
 use ILIAS\Refinery\Factory as Refinery;
 
-class DateFormat implements SettingDefinition
+class EditingMode implements SettingDefinition
 {
+    #[\Override]
     public function getIdentifier(): string
     {
-        return 'date_format';
+        return 'question_editing_mode';
     }
 
+    #[\Override]
     public function isAvailable(): bool
     {
         return true;
     }
 
+    #[\Override]
     public function getLabel(Language $lng): string
     {
-        return $lng->txt('cal_user_date_format');
+        return $lng->txt('question_editing_mode');
     }
 
+    #[\Override]
     public function getSettingsPage(): AvailablePages
     {
         return AvailablePages::MainSettings;
     }
 
+    #[\Override]
     public function getSection(): AvailableSections
     {
-        return AvailableSections::DateTime;
+        return AvailableSections::Additional;
     }
 
+    #[\Override]
     public function getInput(
         FieldFactory $field_factory,
         Language $lng,
@@ -62,75 +69,83 @@ public function getInput(
         \ilSetting $settings,
         ?\ilObjUser $user = null
     ): Input {
-        $lng->loadLanguageModule('dateplaner');
-        return $field_factory->select(
-            $lng->txt('cal_user_date_format'),
-            $this->buildOptions(),
-            $lng->txt('cal_date_format_info')
-        )->withRequired(true)
-        ->withValue(
+        $lng->loadLanguageModule('questions');
+        return array_reduce(
+            EditingModes::cases(),
+            fn(Radio $c, EditingModes $v): Radio => $c->withOption(
+                $v->value,
+                $v->getLabelForInput($lng),
+                $v->getBylineForInput($lng)
+            ),
+            $field_factory->radio(
+                $lng->txt('create_mode')
+            )
+        )->withValue(
             $user !== null
                 ? $this->retrieveValueFromUser($user)
-                : \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
+                : EditingModes::getDefaultMode()->value
         );
     }
 
+    #[\Override]
     public function getLegacyInput(
         Language $lng,
         \ilSetting $settings,
         ?\ilObjUser $user = null
     ): \ilFormPropertyGUI {
-        $lng->loadLanguageModule('dateplaner');
-        $input = new \ilSelectInputGUI($lng->txt('cal_user_date_format'));
-        $input->setOptions($this->buildOptions());
-        $input->setInfo($lng->txt('cal_date_format_info'));
+        $lng->loadLanguageModule('questions');
+        $input = new \ilRadioGroupInputGUI($lng->txt('create_mode'));
+        $input->setOptions(
+            array_map(
+                fn(EditingModes $v): \ilRadioOption => new \ilRadioOption(
+                    $v->getLabelForInput($lng),
+                    $v->value,
+                    $v->getBylineForInput($lng)
+                ),
+                EditingModes::cases()
+            )
+        );
         $input->setValue(
             $user !== null
                 ? $this->retrieveValueFromUser($user)
-                : \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
+                : EditingModes::getDefaultMode()->value
         );
         return $input;
     }
 
+    #[\Override]
     public function getDefaultValueForDisplay(
         Language $lng,
         \ilSetting $settings
     ): string {
-        return $this->buildOptions()[\ilCalendarSettings::_getInstance()->getDefaultDateFormat()];
-    }
-
-    private function buildOptions(): array
-    {
-        $year = date('Y');
-        return [
-            \ilCalendarSettings::DATE_FORMAT_DMY => '31.10.' . $year,
-            \ilCalendarSettings::DATE_FORMAT_YMD => $year . '-10-31',
-            \ilCalendarSettings::DATE_FORMAT_MDY => '10/31/' . $year
-        ];
+        return EditingModes::getDefaultMode()->getLabelForInput($lng);
     }
 
+    #[\Override]
     public function hasUserPersonalizedSetting(
         \ilSetting $settings,
         \ilObjUser $user
     ): bool {
-        return $this->retrieveValueFromUser($user)
-            !== \ilCalendarSettings::_getInstance()->getDefaultDateFormat();
+        return EditingModes::tryFrom($this->retrieveValueFromUser($user))
+            !== EditingModes::getDefaultMode();
     }
 
+    #[\Override]
     public function persistUserInput(
         \ilObjUser $user,
         mixed $input
     ): \ilObjUser {
         $user->setPref(
-            'date_format',
-            $input !== null ? $input : (string) \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
+            'question_editing_mode',
+            $input !== null ? $input : EditingModes::getDefaultMode()->value
         );
         return $user;
     }
 
-    public function retrieveValueFromUser(\ilObjUser $user): int
+    #[\Override]
+    public function retrieveValueFromUser(\ilObjUser $user): string
     {
-        return (int) ($user->getPref('date_format')
-            ?? \ilCalendarSettings::_getInstance()->getDefaultDateFormat());
+        return $user->getPref('question_editing_mode')
+            ?? EditingModes::getDefaultMode()->value;
     }
 }
diff --git a/components/ILIAS/Questions/src/UserSettings/EditingModes.php b/components/ILIAS/Questions/src/UserSettings/EditingModes.php
index 7dc14af45b20..286520c460a5 100644
--- a/components/ILIAS/Questions/src/UserSettings/EditingModes.php
+++ b/components/ILIAS/Questions/src/UserSettings/EditingModes.php
@@ -18,119 +18,29 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Calendar\UserSettings;
+namespace ILIAS\Questions\UserSettings;
 
-use ILIAS\User\Settings\SettingDefinition;
-use ILIAS\User\Settings\AvailablePages;
-use ILIAS\User\Settings\AvailableSections;
 use ILIAS\Language\Language;
-use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
-use ILIAS\UI\Component\Input\Input;
-use ILIAS\Refinery\Factory as Refinery;
 
-class DateFormat implements SettingDefinition
+enum EditingModes: string
 {
-    public function getIdentifier(): string
-    {
-        return 'date_format';
-    }
-
-    public function isAvailable(): bool
-    {
-        return true;
-    }
-
-    public function getLabel(Language $lng): string
-    {
-        return $lng->txt('cal_user_date_format');
-    }
-
-    public function getSettingsPage(): AvailablePages
-    {
-        return AvailablePages::MainSettings;
-    }
-
-    public function getSection(): AvailableSections
-    {
-        return AvailableSections::DateTime;
-    }
-
-    public function getInput(
-        FieldFactory $field_factory,
-        Language $lng,
-        Refinery $refinery,
-        \ilSetting $settings,
-        ?\ilObjUser $user = null
-    ): Input {
-        $lng->loadLanguageModule('dateplaner');
-        return $field_factory->select(
-            $lng->txt('cal_user_date_format'),
-            $this->buildOptions(),
-            $lng->txt('cal_date_format_info')
-        )->withRequired(true)
-        ->withValue(
-            $user !== null
-                ? $this->retrieveValueFromUser($user)
-                : \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
-        );
-    }
-
-    public function getLegacyInput(
-        Language $lng,
-        \ilSetting $settings,
-        ?\ilObjUser $user = null
-    ): \ilFormPropertyGUI {
-        $lng->loadLanguageModule('dateplaner');
-        $input = new \ilSelectInputGUI($lng->txt('cal_user_date_format'));
-        $input->setOptions($this->buildOptions());
-        $input->setInfo($lng->txt('cal_date_format_info'));
-        $input->setValue(
-            $user !== null
-                ? $this->retrieveValueFromUser($user)
-                : \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
-        );
-        return $input;
-    }
+    case Simple = 'simple';
+    case Full = 'full';
 
-    public function getDefaultValueForDisplay(
-        Language $lng,
-        \ilSetting $settings
+    public function getLabelForInput(
+        Language $lng
     ): string {
-        return $this->buildOptions()[\ilCalendarSettings::_getInstance()->getDefaultDateFormat()];
+        return $lng->txt("editing_mode_{$this->value}");
     }
 
-    private function buildOptions(): array
-    {
-        $year = date('Y');
-        return [
-            \ilCalendarSettings::DATE_FORMAT_DMY => '31.10.' . $year,
-            \ilCalendarSettings::DATE_FORMAT_YMD => $year . '-10-31',
-            \ilCalendarSettings::DATE_FORMAT_MDY => '10/31/' . $year
-        ];
-    }
-
-    public function hasUserPersonalizedSetting(
-        \ilSetting $settings,
-        \ilObjUser $user
-    ): bool {
-        return $this->retrieveValueFromUser($user)
-            !== \ilCalendarSettings::_getInstance()->getDefaultDateFormat();
-    }
-
-    public function persistUserInput(
-        \ilObjUser $user,
-        mixed $input
-    ): \ilObjUser {
-        $user->setPref(
-            'date_format',
-            $input !== null ? $input : (string) \ilCalendarSettings::_getInstance()->getDefaultDateFormat()
-        );
-        return $user;
+    public function getBylineForInput(
+        Language $lng
+    ): string {
+        return $lng->txt("byline_editing_mode_{$this->value}");
     }
 
-    public function retrieveValueFromUser(\ilObjUser $user): int
+    public static function getDefaultMode(): self
     {
-        return (int) ($user->getPref('date_format')
-            ?? \ilCalendarSettings::_getInstance()->getDefaultDateFormat());
+        return self::Simple;
     }
 }
diff --git a/components/ILIAS/Questions/src/UserSettings/Settings.php b/components/ILIAS/Questions/src/UserSettings/Settings.php
index 712899fd1073..898dfd5e41aa 100644
--- a/components/ILIAS/Questions/src/UserSettings/Settings.php
+++ b/components/ILIAS/Questions/src/UserSettings/Settings.php
@@ -18,16 +18,17 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Authentication\UserSettings;
+namespace ILIAS\Questions\UserSettings;
 
 use ILIAS\User\Settings\UserSettings;
 
 class Settings implements UserSettings
 {
+    #[\Override]
     public function getSettingConfigurations(): array
     {
         return [
-            Password::class
+            EditingMode::class
         ];
     }
 }

From 51b5c807771cd931c80f75d970c4aa9e91c8d7cc Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 5 Feb 2026 11:06:11 +0100
Subject: [PATCH 118/141] Question: Add Simple Create Mode

---
 .../class.ilObjQuestionsGUI.php               |  50 ++++-
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  14 +-
 .../ConfigurationRepository.php               |  85 +++++++
 .../Administration/class.ConfigurationGUI.php | 116 ++++++++++
 .../Definitions/EnvironmentImplementation.php | 131 ++++++++---
 .../Presentation/Layout/QuestionsTable.php    |   6 +-
 .../Questions/src/Presentation/Views/Edit.php | 208 ++++++++++++------
 .../src/Question/QuestionImplementation.php   |  23 +-
 .../Questions/src/Question/Views/Edit.php     | 135 +++++++-----
 .../{EditingMode.php => CreateMode.php}       |  54 +++--
 .../{EditingModes.php => CreateModes.php}     |   6 +-
 .../Questions/src/UserSettings/Settings.php   |   2 +-
 12 files changed, 634 insertions(+), 196 deletions(-)
 create mode 100755 components/ILIAS/Questions/src/Administration/ConfigurationRepository.php
 create mode 100755 components/ILIAS/Questions/src/Administration/class.ConfigurationGUI.php
 rename components/ILIAS/Questions/src/UserSettings/{EditingMode.php => CreateMode.php} (68%)
 rename components/ILIAS/Questions/src/UserSettings/{EditingModes.php => CreateModes.php} (86%)

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
index 42d810d1497c..f4d487b4c4e3 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -18,6 +18,8 @@
 
 declare(strict_types=1);
 
+use ILIAS\Questions\Administration\ConfigurationGUI;
+use ILIAS\Questions\Administration\ConfigurationRepository;
 use ILIAS\Questions\Legacy\LocalDIC;
 use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Units\GlobalConfigurationGUI;
@@ -29,12 +31,19 @@
 /**
  * @ilCtrl_isCalledBy ilObjQuestionsGUI: ilAdministrationGUI
  * @ilCtrl_Calls ilObjQuestionsGUI: ilPermissionGUI, ILIAS\Questions\Units\GlobalConfigurationGUI
+ * @ilCtrl_Calls ilObjQuestionsGUI: ILIAS\Questions\Administration\ConfigurationGUI
  * @ilCtrl_Calls ilObjQuestionsGUI: QstsQuestionPageGUI
  */
 class ilObjQuestionsGUI extends ilObjectGUI
 {
-    private readonly Edit $edit_view;
+    private const string TAB_IDENTIFIER_QUESTIONS = 'questions';
+    private const string TAB_IDENTIFIER_SETTINGS = 'settings';
+    private const string TAB_IDENTIFIER_UNITS = 'units';
+    private const string TAB_IDENTIFIER_PERMISSIONS = 'perm_settings';
+
     private readonly UnitsRepository $units_repository;
+    private readonly Edit $edit_view;
+    private readonly ConfigurationRepository $configurations_repository;
 
     private readonly ilHelpGUI $help;
     private readonly DataFactory $data_factory;
@@ -53,6 +62,7 @@ public function __construct(
         $local_dic = LocalDIC::dic();
         $this->units_repository = $local_dic[UnitsRepository::class];
         $this->edit_view = $local_dic[Edit::class];
+        $this->configurations_repository = $local_dic[ConfigurationRepository::class];
 
         $this->type = 'qsts';
 
@@ -78,7 +88,7 @@ public function executeCommand(): void
                 break;
 
             case strtolower(ilPermissionGUI::class):
-                $this->tabs_gui->activateTab('perm_settings');
+                $this->tabs_gui->activateTab(self::TAB_IDENTIFIER_PERMISSIONS);
                 $this->ctrl->forwardCommand(new \ilPermissionGUI($this));
                 break;
 
@@ -91,8 +101,24 @@ public function executeCommand(): void
                 );
                 break;
 
+            case strtolower(ConfigurationGUI::class):
+                $this->tabs_gui->activateTab(self::TAB_IDENTIFIER_SETTINGS);
+                $this->ctrl->forwardCommand(
+                    new ConfigurationGUI(
+                        $this->ctrl,
+                        $this->http,
+                        $this->lng,
+                        $this->refinery,
+                        $this->tpl,
+                        $this->ui_factory,
+                        $this->ui_renderer,
+                        $this->configuration_repository
+                    )
+                );
+                break;
+
             case strtolower(GlobalConfigurationGUI::class):
-                $this->tabs_gui->activateTab('units');
+                $this->tabs_gui->activateTab(self::TAB_IDENTIFIER_UNITS);
                 $this->ctrl->forwardCommand(
                     new GlobalConfigurationGUI(
                         $this->units_repository,
@@ -140,22 +166,28 @@ protected function getTabs(): void
     {
         if ($this->rbac_system->checkAccess('read', $this->object->getRefId())) {
             $this->tabs_gui->addTab(
-                'questions',
-                $this->lng->txt('questions'),
+                self::TAB_IDENTIFIER_QUESTIONS,
+                $this->lng->txt(self::TAB_IDENTIFIER_QUESTIONS),
                 $this->ctrl->getLinkTargetByClass(self::class, 'viewQuestions')
             );
 
             $this->tabs_gui->addTab(
-                'units',
-                $this->lng->txt('units'),
+                self::TAB_IDENTIFIER_SETTINGS,
+                $this->lng->txt(self::TAB_IDENTIFIER_SETTINGS),
+                $this->ctrl->getLinkTargetByClass(ConfigurationGUI::class, ''),
+            );
+
+            $this->tabs_gui->addTab(
+                self::TAB_IDENTIFIER_UNITS,
+                $this->lng->txt(self::TAB_IDENTIFIER_UNITS),
                 $this->ctrl->getLinkTargetByClass(GlobalConfigurationGUI::class, ''),
             );
         }
 
         if ($this->rbac_system->checkAccess('edit_permission', $this->object->getRefId())) {
             $this->tabs_gui->addTab(
-                'perm_settings',
-                $this->lng->txt('perm_settings'),
+                self::TAB_IDENTIFIER_PERMISSIONS,
+                $this->lng->txt(self::TAB_IDENTIFIER_PERMISSIONS),
                 $this->ctrl->getLinkTargetByClass([self::class, ilPermissionGUI::class], 'perm'),
             );
         }
diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 589dc481c4f9..1336bf124e0a 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\Legacy;
 
+use ILIAS\Questions\Administration\ConfigurationRepository;
 use ILIAS\Questions\Persistence\Repository as QuestionsRepository;
 use ILIAS\Questions\AnswerFormTypes\Cloze;
 use ILIAS\Questions\Persistence\TableNameSpaceCore;
@@ -27,9 +28,11 @@
 use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Presentation\Layout\Factory as LayoutFactory;
 use ILIAS\Questions\Units\Repository as UnitsRepository;
+use ILIAS\Questions\UserSettings\CreateMode;
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\DI\Container as ILIASContainer;
+use ILIAS\User\Settings\Settings as UserSettings;
 use Mustache\Engine as MustacheEngine;
 use Pimple\Container as PimpleContainer;
 
@@ -59,6 +62,14 @@ protected static function buildDIC(ILIASContainer $DIC): self
             $DIC['ilDB']
         );
 
+        $dic[ConfigurationRepository::class] = static fn($c): ConfigurationRepository
+            => new ConfigurationRepository(
+                $DIC['ilSetting'],
+                $DIC['user']->getSettings()->getSettingByDefinitionClass(
+                    CreateMode::class
+                ),
+                new \ilSetting('questions')
+            );
         $dic[AnswerFormFactory::class] = static fn($c): AnswerFormFactory
             => new AnswerFormFactory(
                 $c[UuidFactory::class],
@@ -82,8 +93,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
             );
         $dic[Edit::class] = static fn($c): Edit => new Edit(
             $DIC['lng'],
-            $DIC['ilSetting'],
-            $DIC['user']->getSettings(),
+            $c[ConfigurationRepository::class],
             $DIC['user']->getLoggedInUser(),
             $DIC['refinery'],
             $DIC['ui.factory'],
diff --git a/components/ILIAS/Questions/src/Administration/ConfigurationRepository.php b/components/ILIAS/Questions/src/Administration/ConfigurationRepository.php
new file mode 100755
index 000000000000..34ddc3dd9a1a
--- /dev/null
+++ b/components/ILIAS/Questions/src/Administration/ConfigurationRepository.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Administration;
+
+use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
+use ILIAS\Questions\UserSettings\CreateModes;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
+use ILIAS\UI\Component\Input\Input;
+use ILIAS\User\Settings\Setting as UserSetting;
+
+class ConfigurationRepository
+{
+    private const string SETTINGS_KEY_CREATE_MODE = 'default_create_mode';
+
+    public function __construct(
+        private readonly \ilSetting $common_settings,
+        private readonly UserSetting $user_setting_create_mode,
+        private readonly \ilSetting $questions_settings
+    ) {
+    }
+
+    public function isCreateModeChangeableByUser(): bool
+    {
+        return $this->user_setting_create_mode->isChangeableByUser();
+    }
+
+    public function getGlobalCreateMode(): CreateModes
+    {
+        return CreateModes::tryFrom(
+            $this->questions_settings->get(
+                self::SETTINGS_KEY_CREATE_MODE,
+                ''
+            )
+        ) ?? CreateModes::getDefaultMode();
+    }
+
+    public function isCreateModeSimple(
+        EnvironmentImplementation $environment
+    ): bool {
+        return $this->isCreateModeChangeableByUser() && $environment->isCreateModeSimple()
+            || $this->getGlobalCreateMode() === CreateModes::Simple;
+    }
+
+    public function persistCreateMode(
+        CreateModes $create_mode
+    ): void {
+        $this->questions_settings->set(
+            self::SETTINGS_KEY_CREATE_MODE,
+            $create_mode->value
+        );
+    }
+
+    public function getInputForCreateMode(
+        FieldFactory $field_factory,
+        Language $lng,
+        Refinery $refinery
+    ): Input {
+        return $this->user_setting_create_mode->getInput(
+            $field_factory,
+            $lng,
+            $refinery,
+            $this->common_settings
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Administration/class.ConfigurationGUI.php b/components/ILIAS/Questions/src/Administration/class.ConfigurationGUI.php
new file mode 100755
index 000000000000..763ff5f0ae82
--- /dev/null
+++ b/components/ILIAS/Questions/src/Administration/class.ConfigurationGUI.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Administration;
+
+use ILIAS\Questions\UserSettings\CreateMode;
+use ILIAS\Questions\UserSettings\CreateModes;
+use ILIAS\HTTP\Services as HTTP;
+use ILIAS\Language\Language;
+use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Renderer as UIRenderer;
+use ILIAS\Refinery\Factory as Refinery;
+
+class ConfigurationGUI
+{
+    private const string CMD_DEFAULT = 'view';
+    private const string CMD_SAVE = 'save';
+
+    public function __construct(
+        private readonly \ilCtrl $ctrl,
+        private readonly HTTP $http,
+        private readonly Language $lng,
+        private readonly Refinery $refinery,
+        private readonly \ilGlobalTemplateInterface $tpl,
+        private readonly UIFactory $ui_factory,
+        private readonly UIRenderer $ui_renderer,
+        private readonly ConfigurationRepository $repository
+    ) {
+    }
+
+    public function executeCommand(): void
+    {
+        $cmd = $this->ctrl->getCmd(self::CMD_DEFAULT) . 'Cmd';
+        $this->$cmd();
+    }
+
+    private function viewCmd(
+        ?StandardForm $form = null
+    ): void {
+        $this->tpl->setContent(
+            $this->ui_renderer->render(
+                $form ?? $this->buildSettingsForm()
+            )
+        );
+    }
+
+    private function saveCmd(): void
+    {
+        $form = $this->buildSettingsForm()->withRequest($this->http->request());
+        $data = $form->getData();
+        if ($data === null) {
+            $this->viewCmd($form);
+        }
+
+        $this->repository->persistCreateMode(
+            $data['default_user_settings']['create_mode']
+        );
+
+        $this->ctrl->redirectByClass(
+            [
+                \ilAdministrationGUI::class,
+                \ilObjQuestionsGUI::class,
+                self::class
+            ]
+        );
+    }
+
+    private function buildSettingsForm(): StandardForm
+    {
+        return $this->ui_factory->input()->container()->form()->standard(
+            $this->ctrl->getLinkTargetByClass(
+                [
+                    \ilAdministrationGUI::class,
+                    \ilObjQuestionsGUI::class,
+                    self::class
+                ],
+                self::CMD_SAVE
+            ),
+            [
+                'default_user_settings' => $this->ui_factory->input()->field()->section(
+                    [
+                        'create_mode' => $this->repository->getInputForCreateMode(
+                            $this->ui_factory->input()->field(),
+                            $this->lng,
+                            $this->refinery
+                        )
+                    ],
+                    $this->lng->txt('default_user_settings')
+                )->withAdditionalTransformation(
+                    $this->refinery->custom()->transformation(
+                        static fn(string $v): CreateModes => CreateModes::tryFrom($v)
+                            ?? CreateModes::getDefaultMode()
+                    )
+                )
+            ]
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
index f4baf4d425e7..acb7da1230ca 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
@@ -40,10 +40,12 @@ class EnvironmentImplementation implements Environment
     private const string TOKEN_STRING_ACTION = 'a';
     private const string TOKEN_STRING_STEP = 's';
     private const string TOKEN_STRING_QUESTION_ID = 'q';
-    private const string TOKEN_STRING_QUESTION_IDS = 'qs';
-    private const string TOKEN_TYPE_HASH = 't';
-    private const string TOKEN_TABLE_ROW_ID = 'r';
-    private const string TOKEN_CARRY_ID = 'c';
+    private const string TOKEN_STRING_TYPE_HASH = 't';
+    private const string TOKEN_STRING_TABLE_ROW_ID = 'r';
+    private const string TOKEN_STRING_CARRY_ID = 'c';
+    private const string TOKEN_STRING_CREATE_MODE = 'cm';
+
+    private const string PARAMETER_STRING_HIER_ID = 'hier_id';
 
     private const string INTERRUPTIVE_ITEMS_KEY = 'interruptive_items';
 
@@ -57,10 +59,7 @@ class EnvironmentImplementation implements Environment
     private readonly URLBuilderToken $action_token;
     private readonly URLBuilderToken $step_token;
     private readonly URLBuilderToken $question_id_token;
-    private readonly URLBuilderToken $question_ids_token;
-    private readonly URLBuilderToken $type_hash_token;
     private readonly URLBuilderToken $table_row_token;
-    private readonly URLBuilderToken $carry_token;
 
     private ?array $table_row_ids = null;
 
@@ -215,11 +214,6 @@ public function getObjId(): int
         return $this->obj_id;
     }
 
-    public function getQuestionIdsToken(): URLBuilderToken
-    {
-        return $this->question_ids_token;
-    }
-
     public function getAction(): string
     {
         return $this->retrieveStringValueForToken($this->action_token);
@@ -246,18 +240,50 @@ public function withQuestionIdParameter(
     public function withAnswerFormTypeHashParameter(
         string $type_hash
     ): self {
+        [
+            $url_builder,
+            $type_hash_token
+        ] = $this->url_builder->acquireParameter(
+            self::QUERY_PARAMETER_NAME_SPACE,
+            self::TOKEN_STRING_TYPE_HASH
+        );
+
         $clone = clone $this;
-        $clone->url_builder = $this->url_builder
-            ->withParameter($this->type_hash_token, $type_hash);
+        $clone->url_builder = $url_builder
+            ->withParameter($type_hash_token, $type_hash);
         return $clone;
     }
 
     public function withCarryParameter(
         string $carry
     ): self {
+        [
+            $url_builder,
+            $carry_token
+        ] = $this->url_builder->acquireParameter(
+            self::QUERY_PARAMETER_NAME_SPACE,
+            self::TOKEN_STRING_CARRY_ID
+        );
+
         $clone = clone $this;
-        $clone->url_builder = $this->url_builder
-            ->withParameter($this->carry_token, $carry);
+        $clone->url_builder = $url_builder
+            ->withParameter($carry_token, $carry);
+        return $clone;
+    }
+
+    public function withCreateModeParameter(): self
+    {
+        [
+            $url_builder,
+            $create_mode_token
+        ] = $this->url_builder->acquireParameter(
+            self::QUERY_PARAMETER_NAME_SPACE,
+            self::TOKEN_STRING_CREATE_MODE
+        );
+
+        $clone = clone $this;
+        $clone->url_builder = $url_builder
+            ->withParameter($create_mode_token, '1');
         return $clone;
     }
 
@@ -275,14 +301,14 @@ public function getQuestionId(): ?Uuid
     }
 
     /**
-     * This function will either return the QuestionIds from the corresponding
-     * $_GET parameter OR from an InterruptiveItems $_POST value.
+     * This function will either return the QuestionIds from the $_GET parameter
+     * for row ids OR from an InterruptiveItems $_POST value.
      * @return array<\ILIAS\Data\UUID\Uuid>|string|null
      */
     public function getQuestionIds(): array|string|null
     {
         return $this->http->wrapper()->query()->retrieve(
-            $this->question_ids_token->getName(),
+            $this->table_row_token->getName(),
             $this->refinery->byTrying([
                 $this->refinery->custom()->transformation(
                     fn($v): string => $v === ['ALL_OBJECTS']
@@ -309,18 +335,38 @@ public function getQuestionIds(): array|string|null
 
     public function getTypeClassHash(): string
     {
-        return $this->retrieveStringValueForToken($this->type_hash_token);
+        [,$type_hash_token] = $this->url_builder->acquireParameter(
+            self::QUERY_PARAMETER_NAME_SPACE,
+            self::TOKEN_STRING_TYPE_HASH
+        );
+        return $this->retrieveStringValueForToken($type_hash_token);
     }
 
     public function getCarry(
         Transformation $to_form_transformation
     ): Input|array|string|null {
+        [, $carry_token] = $this->url_builder->acquireParameter(
+            self::QUERY_PARAMETER_NAME_SPACE,
+            self::TOKEN_STRING_CARRY_ID
+        );
         return $this->http->wrapper()->query()->retrieve(
-            $this->carry_token->getName(),
+            $carry_token->getName(),
             $to_form_transformation
         );
     }
 
+    public function isCreateModeSimple(): bool
+    {
+        [, $create_mode_token] = $this->url_builder->acquireParameter(
+            self::QUERY_PARAMETER_NAME_SPACE,
+            self::TOKEN_STRING_CREATE_MODE
+        );
+
+        return $this->http->wrapper()->query()->has(
+            $create_mode_token->getName()
+        );
+    }
+
     public function setEditAnswerFormTabs(
         string $cmd_feedback,
         string $cmd_content_for_repetition
@@ -359,12 +405,41 @@ public function setEditAnswerFormTabs(
         $this->tabs_gui->activateSubTab(self::TAB_ID_ANSWER_FORM);
     }
 
-    public function setParametersForQuestionCmds(): void
+    public function preserveParametersForPageEditorCmds(): void
     {
+        $this->setQuestionIdParamterForPageEditorCmds($this->getQuestionId());
+    }
+
+    public function setParamtersForSimpleCreateCmd(
+        Uuid $question_id
+    ): void {
+        $this->setQuestionIdParamterForPageEditorCmds($question_id);
+
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            self::PARAMETER_STRING_HIER_ID,
+            '1'
+        );
+
+        [, $create_mode_token] = $this->url_builder->acquireParameter(
+            self::QUERY_PARAMETER_NAME_SPACE,
+            self::TOKEN_STRING_CREATE_MODE
+        );
+
+        $this->ctrl->setParameterByClass(
+            \QstsQuestionPageGUI::class,
+            $create_mode_token->getName(),
+            '1'
+        );
+    }
+
+    private function setQuestionIdParamterForPageEditorCmds(
+        Uuid $question_id
+    ): void {
         $this->ctrl->setParameterByClass(
             \QstsQuestionPageGUI::class,
             $this->question_id_token->getName(),
-            $this->getQuestionId()->toString()
+            $question_id->toString()
         );
     }
 
@@ -376,20 +451,14 @@ private function acquireURLBuilderAndParameters(
             $this->action_token,
             $this->step_token,
             $this->question_id_token,
-            $this->question_ids_token,
-            $this->type_hash_token,
-            $this->table_row_token,
-            $this->carry_token
+            $this->table_row_token
         ] = (new URLBuilder($base_uri))
             ->acquireParameters(
                 self::QUERY_PARAMETER_NAME_SPACE,
                 self::TOKEN_STRING_ACTION,
                 self::TOKEN_STRING_STEP,
                 self::TOKEN_STRING_QUESTION_ID,
-                self::TOKEN_STRING_QUESTION_IDS,
-                self::TOKEN_TYPE_HASH,
-                self::TOKEN_TABLE_ROW_ID,
-                self::TOKEN_CARRY_ID
+                self::TOKEN_STRING_TABLE_ROW_ID
             );
     }
 
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php b/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
index 9e46ea64fa40..b2f5bde3687c 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/QuestionsTable.php
@@ -65,7 +65,7 @@ public function getRows(
         mixed $additional_parameters
     ): \Generator {
         $environment_with_action = $this->environment->withActionParameter(
-            Edit::CMD_EDIT_QUESTION
+            Edit::ACTION_EDIT_QUESTION
         );
         foreach ($this->questions_repository->getQuestionDataOnlyForAllQuestions() as $question) {
             yield $question->toTableRow(
@@ -144,9 +144,9 @@ private function getActions(): array
         return [
             'delete' => $this->ui_factory->table()->action()->standard(
                 $this->lng->txt('delete'),
-                $this->environment->withActionParameter(Edit::CMD_DELETE_QUESTIONS)
+                $this->environment->withActionParameter(Edit::ACTION_DELETE_QUESTIONS)
                     ->getUrlBuilder(),
-                $this->environment->getQuestionIdsToken()
+                $this->environment->getTableRowIdToken()
             )->withAsync(true)
         ];
     }
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index bb4423b1301b..a443fab75035 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\Presentation\Views;
 
+use ILIAS\Questions\Administration\ConfigurationRepository;
 use ILIAS\Questions\Presentation\Layout\Async;
 use ILIAS\Questions\Presentation\Layout\EditForm;
 use ILIAS\Questions\Presentation\Layout\Factory as LayoutFactory;
@@ -35,8 +36,11 @@
 use ILIAS\Questions\AnswerForm\Views\Edit as AnswerFormEditView;
 use ILIAS\Questions\Persistence\Repository;
 use ILIAS\Questions\Question\QuestionImplementation;
+use ILIAS\Questions\UserSettings\CreateMode;
+use ILIAS\Questions\UserSettings\CreateModes;
 use ILIAS\Data\URI;
 use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Data\UUID\Uuid;
 use ILIAS\UICore\GlobalTemplate;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -51,13 +55,13 @@
 
 class Edit
 {
-    private const string CMD_CREATE_QUESTION = 'create';
-    public const string CMD_EDIT_QUESTION = 'edit';
-    public const string CMD_DELETE_QUESTIONS = 'delete';
-    private const string CMD_CREATE_ANSWER_FORM = 'create_af';
-    public const string CMD_OTHER_ANSWER_FORM = 'other_af';
-    private const string CMD_EDIT_FEEDBACK = 'edit_f';
-    private const string CMD_EDIT_CONTENT_FOR_REPETITION = 'edit_cfr';
+    private const string ACTION_CREATE_QUESTION = 'create';
+    public const string ACTION_EDIT_QUESTION = 'edit';
+    public const string ACTION_DELETE_QUESTIONS = 'delete';
+    private const string ACTION_CREATE_ANSWER_FORM = 'create_af';
+    public const string ACTION_OTHER_ANSWER_FORM = 'other_af';
+    private const string ACTION_EDIT_FEEDBACK = 'edit_f';
+    private const string ACTION_EDIT_CONTENT_FOR_REPETITION = 'edit_cfr';
 
     private array $required_capabilities = [];
     private Editability $editability = Editability::Full;
@@ -65,8 +69,7 @@ class Edit
 
     public function __construct(
         private readonly Language $lng,
-        private readonly \ilSetting $settings,
-        private readonly UserSettings $user_settings,
+        private readonly ConfigurationRepository $configuration_repository,
         private readonly \ilObjUser $current_user,
         private readonly Refinery $refinery,
         private readonly UIFactory $ui_factory,
@@ -127,9 +130,9 @@ public function show(
         );
 
         return match($environment->getAction()) {
-            self::CMD_CREATE_QUESTION => $this->createQuestion($environment),
-            self::CMD_EDIT_QUESTION => $this->editQuestion($environment),
-            self::CMD_DELETE_QUESTIONS => $this->deleteQuestions($environment),
+            self::ACTION_CREATE_QUESTION => $this->createQuestion($environment),
+            self::ACTION_EDIT_QUESTION => $this->editQuestion($environment),
+            self::ACTION_DELETE_QUESTIONS => $this->deleteQuestions($environment),
             default => $this->showTable($toolbar, $environment)
         };
     }
@@ -145,7 +148,7 @@ public function forwardPageCmds(
             $obj_id
         );
         $this->initializeEditMode($environment);
-        $environment->setParametersForQuestionCmds();
+        $environment->preserveParametersForPageEditorCmds();
 
         $this->content_style->gui()->addCss(
             $tpl,
@@ -161,7 +164,7 @@ public function forwardPageCmds(
                     $obj_id
                 )->withReturnURI(
                     $environment
-                            ->withActionParameter(self::CMD_EDIT_QUESTION)
+                            ->withActionParameter(self::ACTION_EDIT_QUESTION)
                             ->withQuestionIdParameter($environment->getQuestionId())
                             ->getUrlBuilder()
                             ->buildURI()
@@ -179,7 +182,7 @@ public function createAnswerForm(
         $environment = $this->buildEnvironment(
             $base_uri,
             $obj_id
-        )->withActionParameter(self::CMD_CREATE_ANSWER_FORM)
+        )->withActionParameter(self::ACTION_CREATE_ANSWER_FORM)
         ->withQuestionIdParameter($question->getId());
 
         $answer_form_type_class_hash = $environment->getTypeClassHash();
@@ -205,7 +208,7 @@ public function createAnswerForm(
         }
 
         return match($environment->getAction()) {
-            self::CMD_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
+            self::ACTION_CREATE_ANSWER_FORM => $this->processCreateAnswerForm(
                 $environment,
                 $question,
                 $content_object
@@ -228,14 +231,14 @@ public function editAnswerForm(
         ->withQuestionIdParameter($question->getId());
 
         $environment->setEditAnswerFormTabs(
-            self::CMD_EDIT_FEEDBACK,
-            self::CMD_EDIT_CONTENT_FOR_REPETITION
+            self::ACTION_EDIT_FEEDBACK,
+            self::ACTION_EDIT_CONTENT_FOR_REPETITION
         );
 
         $edit_view = $type->getEditView();
 
-        if ($environment->getAction() === self::CMD_OTHER_ANSWER_FORM) {
-            $environment = $environment->withActionParameter(self::CMD_OTHER_ANSWER_FORM);
+        if ($environment->getAction() === self::ACTION_OTHER_ANSWER_FORM) {
+            $environment = $environment->withActionParameter(self::ACTION_OTHER_ANSWER_FORM);
             $next = $edit_view->other($environment);
         } else {
             $next = $edit_view->edit($environment);
@@ -263,15 +266,14 @@ private function createQuestion(
             $environment->getObjId()
         )->getEditView(
             $this->lng,
-            $this->settings,
-            $this->user_settings,
+            $this->configuration_repository,
             $this->current_user,
             $this->ui_factory,
             $this->refinery,
             $this->http->request(),
             $this->ctrl
         )->create(
-            $environment->withActionParameter(self::CMD_CREATE_QUESTION)
+            $environment->withActionParameter(self::ACTION_CREATE_QUESTION)
         );
 
         if ($create instanceof EditForm) {
@@ -280,13 +282,11 @@ private function createQuestion(
 
         $this->questions_repository->create([$create]);
         return $this->ctrl->redirectToURL(
-            $environment
-                ->withDefaultStep()
-                ->withActionParameter(self::CMD_EDIT_QUESTION)
-                ->withQuestionIdParameter($create->getId())
-                ->getUrlBuilder()
-                ->buildURI()
-                ->__toString()
+            $this->buildAfterQuestionCreationRedirectUri(
+                $environment,
+                $create->getCreateMode(),
+                $create->getId()
+            )
         );
 
     }
@@ -303,7 +303,7 @@ private function editQuestion(
 
         $edit = $question->getEditView(
             $this->lng,
-            $this->user_settings,
+            $this->configuration_repository,
             $this->current_user,
             $this->ui_factory,
             $this->refinery,
@@ -311,7 +311,7 @@ private function editQuestion(
             $this->ctrl
         )->edit(
             $environment_with_question_parameter
-                ->withActionParameter(self::CMD_EDIT_QUESTION),
+                ->withActionParameter(self::ACTION_EDIT_QUESTION),
             $question->getParticipantView()
         );
 
@@ -323,7 +323,7 @@ private function editQuestion(
         return $this->buildEditStartView(
             $environment_with_question_parameter
                 ->withDefaultStep()
-                ->withActionParameter(self::CMD_EDIT_QUESTION),
+                ->withActionParameter(self::ACTION_EDIT_QUESTION),
             $edit
         );
     }
@@ -341,7 +341,7 @@ private function deleteQuestions(
             );
         }
 
-        if ($environment->getStep() === self::CMD_DELETE_QUESTIONS) {
+        if ($environment->getStep() === self::ACTION_DELETE_QUESTIONS) {
             $this->deleteSelectedQuestions($question_ids);
             $this->ctrl->redirectToURL(
                 $environment->getUrlBuilder()->buildURI()->__toString()
@@ -353,9 +353,9 @@ private function deleteQuestions(
                 $this->lng->txt('confirm'),
                 $this->lng->txt('qpl_confirm_delete_questions'),
                 $environment->withActionParameter(
-                    self::CMD_DELETE_QUESTIONS
+                    self::ACTION_DELETE_QUESTIONS
                 )->getUrlBuilderWithStepParameter(
-                    self::CMD_DELETE_QUESTIONS
+                    self::ACTION_DELETE_QUESTIONS
                 )->buildURI()->__toString()
             )->withAffectedItems(
                 $this->buildAffectedItems($question_ids)
@@ -370,7 +370,7 @@ private function showTable(
         $toolbar->addComponent(
             $this->ui_factory->button()->standard(
                 $this->lng->txt('create'),
-                $environment->withActionParameter(self::CMD_CREATE_QUESTION)
+                $environment->withActionParameter(self::ACTION_CREATE_QUESTION)
                     ->getUrlBuilder()
                     ->buildURI()
                     ->__toString()
@@ -396,24 +396,34 @@ private function processCreateAnswerForm(
         $form = $this->buildCreateAnswerForm($environment)->withRequest($this->http->request());
 
         $data = $form->getData();
-        return $data === null
-            ? $form
-            : $this->forwardCreateAnswerFormCmd(
-                $environment->withAnswerFormProperties(
-                    $data->buildProperties(
-                        $this->answer_form_factory->getDefaultTypeGenericProperties(
-                            $question->getId(),
-                            $data
-                        ),
-                        null
-                    )
-                )->withAnswerFormTypeHashParameter(
-                    $this->answer_form_factory->getHashedClass($data::class)
-                ),
+        if ($data === null) {
+            return $form;
+        }
+
+        if ($this->configuration_repository->isCreateModeSimple($environment)) {
+            $this->addQuestionTextToPage(
                 $question,
-                $content_object,
-                $data->getEditView()
+                $data['question_text']
             );
+        }
+
+        $type_definition = $data['type'];
+        return $this->forwardCreateAnswerFormCmd(
+            $environment->withAnswerFormProperties(
+                $type_definition->buildProperties(
+                    $this->answer_form_factory->getDefaultTypeGenericProperties(
+                        $question->getId(),
+                        $type_definition
+                    ),
+                    null
+                )
+            )->withAnswerFormTypeHashParameter(
+                $this->answer_form_factory->getHashedClass($type_definition::class)
+            ),
+            $question,
+            $content_object,
+            $type_definition->getEditView()
+        );
     }
 
     private function forwardCreateAnswerFormCmd(
@@ -456,7 +466,7 @@ private function initializeEditMode(
         $this->global_screen->tool()->context()->current()->addAdditionalData(
             LayoutProvider::URL_CREATE_QUESTION,
             $environment
-            ->withActionParameter(self::CMD_CREATE_QUESTION)
+            ->withActionParameter(self::ACTION_CREATE_QUESTION)
             ->getUrlBuilder()
             ->buildURI()
         );
@@ -498,7 +508,7 @@ private function builEditLinksForQuestionListSlate(
             $links[] = $this->ui_factory->item()->standard(
                 $question->toEditLink(
                     $this->ui_factory->link(),
-                    $environment->withActionParameter(self::CMD_EDIT_QUESTION)
+                    $environment->withActionParameter(self::ACTION_EDIT_QUESTION)
                 )
             );
         }
@@ -511,8 +521,7 @@ private function buildEditStartView(
     ): EditForm {
         return $question->getEditView(
             $this->lng,
-            $this->settings,
-            $this->user_settings,
+            $this->configuration_repository,
             $this->current_user,
             $this->ui_factory,
             $this->refinery,
@@ -525,23 +534,34 @@ private function buildEditStartView(
     }
 
     private function buildCreateAnswerForm(
-        EnvironmentImplementation $environemt
+        EnvironmentImplementation $environment
     ): EditForm {
         $if = $this->ui_factory->input();
-        return $environemt->getPresentationFactory()->getEditForm(
-            $environemt->getUrlBuilder(),
+
+        $inputs = [];
+        if ($this->configuration_repository->isCreateModeSimple($environment)) {
+            $inputs['question_text'] = $if->field()->textarea(
+                $this->lng->txt('question_text')
+            );
+            $environment = $environment->withCreateModeParameter();
+        }
+
+        return $environment->getPresentationFactory()->getEditForm(
+            $environment->getUrlBuilder(),
             $if->field()->section(
-                [
-                        $if->field()->select(
-                            $this->lng->txt('select_answer_form_type'),
-                            $this->answer_form_factory->getAnswerFormTypesArrayForSelect($this->lng)
-                        )->withRequired(true)
-                    ],
+                $inputs + [
+                    'type' => $if->field()->select(
+                        $this->lng->txt('select_answer_form_type'),
+                        $this->answer_form_factory->getAnswerFormTypesArrayForSelect($this->lng)
+                    )->withRequired(true)
+                    ->withAdditionalTransformation(
+                        $this->refinery->custom()->transformation(
+                            fn(string $v): ?Definition => $this->answer_form_factory
+                                ->buildTypeDefinitionFromSelectValue($v)
+                        )
+                    )
+                ],
                 $this->lng->txt('create_answer_form')
-            )->withAdditionalTransformation(
-                $this->refinery->custom()->transformation(
-                    fn(array $vs): ?Definition => $this->answer_form_factory->buildTypeDefinitionFromSelectValue($vs[0])
-                )
             ),
             false
         );
@@ -598,6 +618,27 @@ private function deleteSelectedQuestions(
         $this->questions_repository->delete($questions_to_delete);
     }
 
+    private function addQuestionTextToPage(
+        QuestionImplementation $question,
+        string $text
+    ): void {
+        $page = new \QstsQuestionPage(
+            $question->getPageId()
+        );
+        $page->setQuestion($question);
+        $page->buildDom();
+
+        $page_element = new \ilPCParagraph(
+            $page
+        );
+
+        $page_element->create($page, 'pg');
+        $page_element->setLanguage($this->current_user->getLanguage());
+        $page_element->setText($text);
+
+        $page->update();
+    }
+
     private function buildEnvironment(
         URI $base_uri,
         int $obj_id
@@ -615,4 +656,31 @@ private function buildEnvironment(
             $obj_id
         );
     }
+
+    private function buildAfterQuestionCreationRedirectUri(
+        EnvironmentImplementation $environment,
+        CreateModes $create_mode,
+        Uuid $question_uuid
+    ): string {
+        if ($create_mode !== CreateModes::Simple) {
+            return $environment
+                ->withDefaultStep()
+                ->withActionParameter(self::ACTION_EDIT_QUESTION)
+                ->withQuestionIdParameter($question_uuid)
+                ->getUrlBuilder()
+                ->buildURI()
+                ->__toString();
+        }
+
+        $environment->setParamtersForSimpleCreateCmd($question_uuid);
+
+        return $this->ctrl->getLinkTargetByClass(
+            [
+                \QstsQuestionPageGUI::class,
+                \ilPageEditorGUI::class,
+                \ilPCAnswerFormGUI::class
+            ],
+            'insert'
+        );
+    }
 }
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index a607cd490046..0532d6e491ab 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\Question;
 
+use ILIAS\Questions\Administration\ConfigurationRepository;
 use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
 use ILIAS\Questions\Persistence\CoreTables;
 use ILIAS\Questions\Persistence\Column;
@@ -32,6 +33,7 @@
 use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
+use ILIAS\Questions\UserSettings\CreateModes;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
@@ -39,12 +41,12 @@
 use ILIAS\UI\Component\Link\Standard as StandardLink;
 use ILIAS\UI\Component\Table\DataRowBuilder;
 use ILIAS\UI\Component\Table\DataRow;
-use ILIAS\User\Settings\Settings as UserSettings;
 use ILIAS\Refinery\Factory as Refinery;
 use Psr\Http\Message\RequestInterface;
 
 class QuestionImplementation implements Question
 {
+    private ?CreateModes $create_mode = null;
     private bool $linking_information_updated = false;
     private bool $self_updated = false;
     private bool $page_id_updated = false;
@@ -246,10 +248,22 @@ public function isClone(): bool
         return $this->original_id !== null;
     }
 
+    public function getCreateMode(): ?CreateModes
+    {
+        return $this->create_mode;
+    }
+
+    public function withCreateMode(
+        CreateModes $create_mode
+    ): self {
+        $clone = clone $this;
+        $clone->create_mode = $create_mode;
+        return $clone;
+    }
+
     public function getEditView(
         Language $lng,
-        \ilSetting $settings,
-        UserSettings $user_settings,
+        ConfigurationRepository $configuration_repository,
         \ilObjUser $current_user,
         UIFactory $ui_factory,
         Refinery $refinery,
@@ -258,8 +272,7 @@ public function getEditView(
     ): Views\Edit {
         return new Views\Edit(
             $lng,
-            $settings,
-            $user_settings,
+            $configuration_repository,
             $current_user,
             $ui_factory,
             $refinery,
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index 8cccb9cc4ae3..72ddeb484e2e 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -20,17 +20,17 @@
 
 namespace ILIAS\Questions\Question\Views;
 
+use ILIAS\Questions\Administration\ConfigurationRepository;
 use ILIAS\Questions\Presentation\Layout\EditForm;
 use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Question\Question;
 use ILIAS\Questions\Question\QuestionImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
-use ILIAS\Questions\UserSettings\EditingMode;
+use ILIAS\Questions\UserSettings\CreateMode;
+use ILIAS\Questions\UserSettings\CreateModes;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
-use ILIAS\User\Settings\Settings as UserSettings;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
 use Psr\Http\Message\RequestInterface;
@@ -41,8 +41,7 @@ class Edit
 
     public function __construct(
         private readonly Language $lng,
-        private readonly \ilSetting $settings,
-        private readonly UserSettings $user_settings,
+        private readonly ConfigurationRepository $configuration_repository,
         private readonly \ilObjUser $current_user,
         private readonly UIFactory $ui_factory,
         private readonly Refinery $refinery,
@@ -57,11 +56,10 @@ public function create(
         EnvironmentImplementation $environment
     ): EditForm|Question {
         return match ($environment->getStep()) {
-            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm(
-                $environment,
-                true
+            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesCreateForm(
+                $environment
             ),
-            default => $this->buildBasicPropertiesForm($environment, true)
+            default => $this->buildBasicPropertiesCreateForm($environment)
         };
     }
 
@@ -70,73 +68,98 @@ public function edit(
         Participant $participant_view
     ): EditForm|Question {
         return match ($environment->getStep()) {
-            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesForm(
-                $environment,
-                false
+            self::CMD_SAVE_QUESTION => $this->processBasicPropertiesEditingForm(
+                $environment
             ),
-            default => $this->buildBasicPropertiesForm(
-                $environment,
-                false
-            )->withContentAfterForm(
-                $this->buildPreviewPanel($environment, $participant_view)
-            )
+            default => $this->buildBasicPropertiesEditingForm($environment)
+                ->withContentAfterForm(
+                    $this->buildPreviewPanel($environment, $participant_view)
+                )
         };
     }
 
-    private function buildBasicPropertiesForm(
-        EnvironmentImplementation $environment,
-        bool $is_context_create
+    private function buildBasicPropertiesCreateForm(
+        EnvironmentImplementation $environment
     ): EditForm {
+        $ff = $this->ui_factory->input()->field();
+
+        $inputs = [
+            'question' => $ff->group(
+                $this->buildBasicPropertiesInputs()
+            )->withAdditionalTransformation(
+                $this->buildAddBasicPropertiesToQuestionTrafo()
+            )->withValue(
+                $this->buildBasicPropertiesBasicValuesArray()
+            )
+        ];
+
+        if ($this->configuration_repository->isCreateModeChangeableByUser()) {
+            $inputs['create_mode'] = $this->configuration_repository->getInputForCreateMode(
+                $ff,
+                $this->lng,
+                $this->refinery
+            )->withAdditionalTransformation(
+                $this->refinery->custom()->transformation(
+                    fn(string $v): CreateModes => CreateModes::tryFrom($v)
+                        ?? $this->configuration_repository->getGlobalCreateMode()
+                )
+            );
+        }
+
         return $environment->getPresentationFactory()->getEditForm(
             $environment->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION),
-            $this->buildBasicPropertiesSection($is_context_create),
+            $ff->section(
+                $inputs,
+                $this->lng->txt('edit_basic_form_properties')
+            ),
             true
         );
     }
 
-    private function processBasicPropertiesForm(
-        EnvironmentImplementation $environment,
-        bool $is_context_create
+    private function processBasicPropertiesCreateForm(
+        EnvironmentImplementation $environment
     ): EditForm|Question {
-        $form = $this->buildBasicPropertiesForm(
-            $environment,
-            $is_context_create
+        $form = $this->buildBasicPropertiesCreateForm(
+            $environment
         )->withRequest($this->request);
 
         $data = $form->getData();
+
+        $mode = $data['create_mode'];
+
         return $data === null
             ? $form
-            : $data;
+            : $data['question']->withCreateMode($mode);
     }
 
-    private function buildBasicPropertiesSection(
-        bool $needs_create_mode_input
-    ): Section {
-        $ff = $this->ui_factory->input()->field();
-
-        $inputs = $this->buildBasicPropertiesInputs();
-        $values = $this->buildBasicPropertiesBasicValuesArray();
-
-        if ($needs_create_mode_input) {
-            $user_settings = $this->user_settings
-                ->getSettingByDefinitionClass(EditingMode::class);
-            $inputs['create_mode'] = $user_settings->getInput(
-                $ff,
-                $this->lng,
-                $this->refinery,
-                $this->settings
-            );
-            $values['create_mode'] = $user_settings->retrieveValueFromUser(
-                $this->current_user
-            );
-        }
+    private function buildBasicPropertiesEditingForm(
+        EnvironmentImplementation $environment
+    ): EditForm {
+        return $environment->getPresentationFactory()->getEditForm(
+            $environment->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION),
+            $this->ui_factory->input()->field()->section(
+                $this->buildBasicPropertiesInputs(),
+                $this->lng->txt('edit_basic_form_properties')
+            )->withAdditionalTransformation(
+                $this->buildAddBasicPropertiesToQuestionTrafo()
+            )->withValue(
+                $this->buildBasicPropertiesBasicValuesArray()
+            ),
+            true
+        );
+    }
 
-        $section = $ff->section(
-            $inputs,
-            $this->lng->txt('edit_basic_form_properties')
-        )->withAdditionalTransformation($this->buildAddBasicPropertiesToQuestionTrafo());
+    private function processBasicPropertiesEditingForm(
+        EnvironmentImplementation $environment
+    ): EditForm|Question {
+        $form = $this->buildBasicPropertiesEditingForm(
+            $environment
+        )->withRequest($this->request);
 
-        return $section->withValue($values);
+        $data = $form->getData();
+        return $data === null
+            ? $form
+            : $data;
     }
 
     private function buildBasicPropertiesInputs(): array
@@ -197,7 +220,7 @@ private function buildPreviewPanel(
         EnvironmentImplementation $environment,
         Participant $participant_view
     ): StandardPanel {
-        $environment->setParametersForQuestionCmds();
+        $environment->preserveParametersForPageEditorCmds();
         return $this->ui_factory->panel()->standard(
             $this->lng->txt('preview'),
             $this->ui_factory->legacy()->content(
diff --git a/components/ILIAS/Questions/src/UserSettings/EditingMode.php b/components/ILIAS/Questions/src/UserSettings/CreateMode.php
similarity index 68%
rename from components/ILIAS/Questions/src/UserSettings/EditingMode.php
rename to components/ILIAS/Questions/src/UserSettings/CreateMode.php
index 8da6be0068d9..d21d22e745f1 100644
--- a/components/ILIAS/Questions/src/UserSettings/EditingMode.php
+++ b/components/ILIAS/Questions/src/UserSettings/CreateMode.php
@@ -29,12 +29,17 @@
 use ILIAS\UI\Component\Input\Input;
 use ILIAS\Refinery\Factory as Refinery;
 
-class EditingMode implements SettingDefinition
+class CreateMode implements SettingDefinition
 {
+    private \ilSetting $settings;
+    public function __construct()
+    {
+        $this->settings = new \ilSetting('questions');
+    }
     #[\Override]
     public function getIdentifier(): string
     {
-        return 'question_editing_mode';
+        return 'question_create_mode';
     }
 
     #[\Override]
@@ -46,7 +51,7 @@ public function isAvailable(): bool
     #[\Override]
     public function getLabel(Language $lng): string
     {
-        return $lng->txt('question_editing_mode');
+        return $lng->txt('question_create_mode');
     }
 
     #[\Override]
@@ -71,8 +76,8 @@ public function getInput(
     ): Input {
         $lng->loadLanguageModule('questions');
         return array_reduce(
-            EditingModes::cases(),
-            fn(Radio $c, EditingModes $v): Radio => $c->withOption(
+            CreateModes::cases(),
+            fn(Radio $c, CreateModes $v): Radio => $c->withOption(
                 $v->value,
                 $v->getLabelForInput($lng),
                 $v->getBylineForInput($lng)
@@ -83,7 +88,10 @@ public function getInput(
         )->withValue(
             $user !== null
                 ? $this->retrieveValueFromUser($user)
-                : EditingModes::getDefaultMode()->value
+                : $this->settings->get(
+                    'default_create_mode',
+                    CreateModes::getDefaultMode()->value
+                )
         );
     }
 
@@ -97,18 +105,21 @@ public function getLegacyInput(
         $input = new \ilRadioGroupInputGUI($lng->txt('create_mode'));
         $input->setOptions(
             array_map(
-                fn(EditingModes $v): \ilRadioOption => new \ilRadioOption(
+                fn(CreateModes $v): \ilRadioOption => new \ilRadioOption(
                     $v->getLabelForInput($lng),
                     $v->value,
                     $v->getBylineForInput($lng)
                 ),
-                EditingModes::cases()
+                CreateModes::cases()
             )
         );
         $input->setValue(
             $user !== null
                 ? $this->retrieveValueFromUser($user)
-                : EditingModes::getDefaultMode()->value
+                : $this->settings->get(
+                    'default_create_mode',
+                    CreateModes::getDefaultMode()->value
+                )
         );
         return $input;
     }
@@ -118,7 +129,7 @@ public function getDefaultValueForDisplay(
         Language $lng,
         \ilSetting $settings
     ): string {
-        return EditingModes::getDefaultMode()->getLabelForInput($lng);
+        return CreateModes::getDefaultMode()->getLabelForInput($lng);
     }
 
     #[\Override]
@@ -126,8 +137,11 @@ public function hasUserPersonalizedSetting(
         \ilSetting $settings,
         \ilObjUser $user
     ): bool {
-        return EditingModes::tryFrom($this->retrieveValueFromUser($user))
-            !== EditingModes::getDefaultMode();
+        return $this->retrieveValueFromUser($user)
+            !== $this->settings->get(
+                'default_create_mode',
+                CreateModes::getDefaultMode()->value
+            );
     }
 
     #[\Override]
@@ -136,8 +150,13 @@ public function persistUserInput(
         mixed $input
     ): \ilObjUser {
         $user->setPref(
-            'question_editing_mode',
-            $input !== null ? $input : EditingModes::getDefaultMode()->value
+            'question_create_mode',
+            $input !== null
+                ? $input
+                : $this->settings->get(
+                    'default_create_mode',
+                    CreateModes::getDefaultMode()->value
+                )
         );
         return $user;
     }
@@ -145,7 +164,10 @@ public function persistUserInput(
     #[\Override]
     public function retrieveValueFromUser(\ilObjUser $user): string
     {
-        return $user->getPref('question_editing_mode')
-            ?? EditingModes::getDefaultMode()->value;
+        return $user->getPref('question_create_mode')
+            ?? $this->settings->get(
+                'default_create_mode',
+                CreateModes::getDefaultMode()->value
+            );
     }
 }
diff --git a/components/ILIAS/Questions/src/UserSettings/EditingModes.php b/components/ILIAS/Questions/src/UserSettings/CreateModes.php
similarity index 86%
rename from components/ILIAS/Questions/src/UserSettings/EditingModes.php
rename to components/ILIAS/Questions/src/UserSettings/CreateModes.php
index 286520c460a5..ee6e8c97169f 100644
--- a/components/ILIAS/Questions/src/UserSettings/EditingModes.php
+++ b/components/ILIAS/Questions/src/UserSettings/CreateModes.php
@@ -22,7 +22,7 @@
 
 use ILIAS\Language\Language;
 
-enum EditingModes: string
+enum CreateModes: string
 {
     case Simple = 'simple';
     case Full = 'full';
@@ -30,13 +30,13 @@ enum EditingModes: string
     public function getLabelForInput(
         Language $lng
     ): string {
-        return $lng->txt("editing_mode_{$this->value}");
+        return $lng->txt("create_mode_{$this->value}");
     }
 
     public function getBylineForInput(
         Language $lng
     ): string {
-        return $lng->txt("byline_editing_mode_{$this->value}");
+        return $lng->txt("byline_create_mode_{$this->value}");
     }
 
     public static function getDefaultMode(): self
diff --git a/components/ILIAS/Questions/src/UserSettings/Settings.php b/components/ILIAS/Questions/src/UserSettings/Settings.php
index 898dfd5e41aa..959f42df91b3 100644
--- a/components/ILIAS/Questions/src/UserSettings/Settings.php
+++ b/components/ILIAS/Questions/src/UserSettings/Settings.php
@@ -28,7 +28,7 @@ class Settings implements UserSettings
     public function getSettingConfigurations(): array
     {
         return [
-            EditingMode::class
+            CreateMode::class
         ];
     }
 }

From 72100ad1e1e767474d110499b83606d3517957fc Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 5 Feb 2026 18:17:36 +0100
Subject: [PATCH 119/141] Questions: Add Add Legacy Button

---
 .../Cloze/Properties/Properties.php           | 21 +++++--
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 57 ++++++++++++++++---
 .../src/Presentation/Layout/EditForm.php      | 33 +++++++++--
 .../src/Presentation/Layout/Factory.php       | 10 +++-
 .../Questions/src/Presentation/Views/Edit.php |  2 +-
 .../Questions/src/Question/Views/Edit.php     |  8 ++-
 6 files changed, 104 insertions(+), 27 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index 6a4fb96cd06f..235a53e25314 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -210,15 +210,24 @@ public function buildBasicEditingInputs(
         FieldFactory $ff,
         Refinery $refinery,
         Factory $propteries_factory,
-        ClozeTextFactory $cloze_text_factory
+        ClozeTextFactory $cloze_text_factory,
+        bool $add_legacy_cloze_text_to_input
     ): Section {
+        $cloze_text_input = $this->getClozeText()->getInput(
+            $lng,
+            $ff,
+            $cloze_text_factory
+        );
+
+        if ($add_legacy_cloze_text_to_input) {
+            $cloze_text_input = $cloze_text_input->withValue(
+                strip_tags($this->legacy_cloze_text)
+            );
+        }
+
         return $ff->section(
             [
-                self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getInput(
-                    $lng,
-                    $ff,
-                    $cloze_text_factory
-                ),
+                self::FORM_KEY_CLOZE_TEXT => $cloze_text_input,
                 self::FORM_KEY_IDENTICAL_SCORING => ScoringIdentical::buildInput(
                     $lng,
                     $ff,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 7f4acf5ed02e..c2c018a0f1ff 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -42,6 +42,7 @@
 class Edit implements EditViewInterface
 {
     private const string STEP_EDIT_BASIC_PROPERTIES = 'ebp';
+    private const string STEP_ADD_LEGACY_TEXT_BASIC_PROPERTIES = 'altbp';
     private const string STEP_CONFIRMED_GAP_REMOVAL = 'cgr';
     private const string STEP_SET_GAP_TYPES = 'sgt';
     public const string STEP_JUMP_TO_SET_GAP_TYPES = 'jsgt';
@@ -103,7 +104,10 @@ public function edit(
         $environment->setEditAnswerFormBackTarget();
 
         return match ($step) {
-            self::STEP_EDIT_BASIC_PROPERTIES => $this->buildBasicEditingForm($environment),
+            self::STEP_EDIT_BASIC_PROPERTIES =>
+                $this->buildBasicEditingForm($environment, false),
+            self::STEP_ADD_LEGACY_TEXT_BASIC_PROPERTIES =>
+                $this->addLegacyTextToBasicProperties($environment),
             default => $this->callIntermediateStep($environment, $step)
         };
     }
@@ -178,19 +182,48 @@ private function callIntermediateStep(
     }
 
     private function buildBasicEditingForm(
-        Environment $environment
+        Environment $environment,
+        bool $add_legacy_cloze_text_to_input
     ): EditForm {
-        return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_GAP_TYPES),
-            $environment->getAnswerFormProperties()->buildBasicEditingInputs(
+
+        /** @var \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties $answer_form_properties */
+        $answer_form_properties = $environment->getAnswerFormProperties();
+
+        $editing_form = $environment->getPresentationFactory()->getEditForm(
+            $environment
+                ->getUrlBuilderWithStepParameter(self::STEP_SET_GAP_TYPES)
+                ->buildURI(),
+            $answer_form_properties->buildBasicEditingInputs(
                 $this->lng,
                 $this->ui_factory->input()->field(),
                 $this->refinery,
                 $this->properties_factory,
-                $this->cloze_text_factory
+                $this->cloze_text_factory,
+                $add_legacy_cloze_text_to_input
             ),
             false
         );
+
+        if (!$add_legacy_cloze_text_to_input
+            && $answer_form_properties->getLegacyClozeText() !== ''
+            && $answer_form_properties->getClozeText()->getRawRepresentationForPersistence() === '') {
+            return $editing_form->withInsertLegacyTextsButton(
+                $environment->getUrlBuilderWithStepParameter(
+                    self::STEP_ADD_LEGACY_TEXT_BASIC_PROPERTIES
+                )->buildURI()
+            );
+        }
+
+        return $editing_form;
+    }
+
+    private function addLegacyTextToBasicProperties(
+        Environment $environment
+    ): EditForm {
+        return $this->buildBasicEditingForm(
+            $environment,
+            true
+        );
     }
 
     private function processBasicEditingForm(
@@ -235,7 +268,9 @@ private function buildGapTypesForm(
         $properties = $environment->getAnswerFormProperties();
         $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_ANSWER_OPTIONS),
+            $environment
+                ->getUrlBuilderWithStepParameter(self::STEP_SET_ANSWER_OPTIONS)
+                ->buildURI(),
             $properties->getGaps()->buildGapsTypeInputs(
                 $this->lng,
                 $ff,
@@ -278,7 +313,9 @@ private function buildAnswerOptionsForm(
         $properties = $environment->getAnswerFormProperties();
         $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilderWithStepParameter(self::STEP_SET_POINTS),
+            $environment
+                ->getUrlBuilderWithStepParameter(self::STEP_SET_POINTS)
+                ->buildURI(),
             $properties->getGaps()->buildAnswerOptionsInputs(
                 $this->lng,
                 $ff,
@@ -319,7 +356,9 @@ private function buildAssignPointsForm(
         $properties = $environment->getAnswerFormProperties();
         $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilderWithStepParameter(self::STEP_SAVE),
+            $environment
+                ->getUrlBuilderWithStepParameter(self::STEP_SAVE)
+                ->buildURI(),
             $properties->getGaps()->buildPointInputs(
                 $this->lng,
                 $ff,
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
index 3b6dfbd7c8b1..acf632d20f97 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
@@ -20,14 +20,15 @@
 
 namespace ILIAS\Questions\Presentation\Layout;
 
+use ILIAS\Data\URI;
 use ILIAS\Language\Language;
-use ILIAS\UI\Component\Input\Container\Form\Factory as FormFactory;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\MessageBox\MessageBox;
 use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
 use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
-use ILIAS\UI\URLBuilder;
 use ILIAS\UI\Renderer as UIRenderer;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -41,11 +42,12 @@ class EditForm implements Renderable
     private ?StandardPanel $content_before_form = null;
     private ?StandardPanel $content_after_form = null;
     private ?InterruptiveModal $confirmation = null;
+    private ?MessageBox $insert_legacy_text_button = null;
 
     public function __construct(
-        private readonly FormFactory $form_factory,
+        private readonly UIFactory $ui_factory,
         private readonly Language $lng,
-        private readonly URLBuilder $url_builder,
+        private readonly URI $form_target_uri,
         private readonly Section $main_section_inputs,
         private readonly bool $is_final_step,
         private readonly ?Group $carry_inputs
@@ -77,6 +79,21 @@ public function withConfirmation(
         return $clone;
     }
 
+    public function withInsertLegacyTextsButton(
+        URI $target_uri
+    ): self {
+        $clone = clone $this;
+        $clone->insert_legacy_text_button = $this->ui_factory->messageBox()->info(
+            $this->lng->txt('insert_legacy_texts_info')
+        )->withButtons([
+            $this->ui_factory->button()->standard(
+                $this->lng->txt('insert_legacy_texts'),
+                $target_uri->__toString()
+            )
+        ]);
+        return $clone;
+    }
+
     public function render(
         UIRenderer $ui_renderer
     ): string {
@@ -119,6 +136,10 @@ function ($id) {
             );
         }
 
+        if ($this->insert_legacy_text_button !== null) {
+            $content[] = $this->insert_legacy_text_button;
+        }
+
         $content[] = $this->form;
 
         if ($this->content_after_form !== null) {
@@ -130,8 +151,8 @@ function ($id) {
 
     private function buildForm(): StandardForm
     {
-        $form = $this->form_factory->standard(
-            $this->url_builder->buildURI()->__toString(),
+        $form = $this->ui_factory->input()->container()->form()->standard(
+            $this->form_target_uri->__toString(),
             $this->buildFormInputs()
         );
 
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
index 77a0b02922a8..8dc459e4caef 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
@@ -61,16 +61,20 @@ public function getEditOverview(
         );
     }
 
+    /**
+     * @param URLBuilder $url_builder The url_builder MUST have the step set,
+     * to which the form shall be sent.
+     */
     public function getEditForm(
-        URLBuilder $url_builder,
+        URI $form_target_uri,
         Section $main_section_inputs,
         bool $is_final_step,
         ?Group $carry_inputs = null
     ): EditForm {
         return new EditForm(
-            $this->ui_factory->input()->container()->form(),
+            $this->ui_factory,
             $this->lng,
-            $url_builder,
+            $form_target_uri,
             $main_section_inputs,
             $is_final_step,
             $carry_inputs
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index a443fab75035..4aed1c8c0c6d 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -547,7 +547,7 @@ private function buildCreateAnswerForm(
         }
 
         return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilder(),
+            $environment->getUrlBuilder()->buildURI(),
             $if->field()->section(
                 $inputs + [
                     'type' => $if->field()->select(
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index 72ddeb484e2e..066579e2fd70 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -107,7 +107,9 @@ private function buildBasicPropertiesCreateForm(
         }
 
         return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION),
+            $environment
+                ->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION)
+                ->buildURI(),
             $ff->section(
                 $inputs,
                 $this->lng->txt('edit_basic_form_properties')
@@ -136,7 +138,9 @@ private function buildBasicPropertiesEditingForm(
         EnvironmentImplementation $environment
     ): EditForm {
         return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION),
+            $environment
+                ->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION)
+                ->buildURI(),
             $this->ui_factory->input()->field()->section(
                 $this->buildBasicPropertiesInputs(),
                 $this->lng->txt('edit_basic_form_properties')

From 508fe0b58a33ea549e0e8a32b0262fb1bb461666 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 5 Feb 2026 20:32:42 +0100
Subject: [PATCH 120/141] Questions: Proberly Escape Legacy Texts

---
 .../AnswerForm/Migration/MigrationInsert.php  |   8 +-
 .../Migration/MigrationPurifier.php           | 117 ++++++++++++++++++
 .../Migration/SanitizeLegacyText.php          |  60 +++++++++
 .../Migration/BasicMigrationFunctions.php     |  18 ++-
 .../Cloze/Migration/MigrationCloze.php        |   4 +-
 .../Cloze/Migration/MigrationLongMenu.php     |   4 +-
 .../Cloze/Properties/Properties.php           |   2 +-
 .../src/Setup/QuestionsMigration.php          |   3 +-
 8 files changed, 209 insertions(+), 7 deletions(-)
 create mode 100755 components/ILIAS/Questions/src/AnswerForm/Migration/MigrationPurifier.php
 create mode 100644 components/ILIAS/Questions/src/AnswerForm/Migration/SanitizeLegacyText.php

diff --git a/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php b/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
index 799e49ffcfc6..222adfdf1cc0 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
@@ -45,7 +45,8 @@ public function __construct(
         private readonly int $old_question_id,
         private readonly Uuid $new_question_id,
         private readonly Uuid $answer_form_id,
-        private readonly string $definition_class
+        private readonly string $definition_class,
+        private readonly bool $ilias_page_editor_used_for_additional_texts
     ) {
     }
 
@@ -79,6 +80,11 @@ public function getAnswerFormId(): Uuid
         return $this->answer_form_id;
     }
 
+    public function wasIliasPageEditorUsedForAdditionalTexts(): bool
+    {
+        return $this->ilias_page_editor_used_for_additional_texts;
+    }
+
     public function withAvailablePoints(
         float $available_points
     ): self {
diff --git a/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationPurifier.php b/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationPurifier.php
new file mode 100755
index 000000000000..2db2d50a90f7
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationPurifier.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm\Migration;
+
+class MigrationPurifier extends \ilHtmlPurifierAbstractLibWrapper
+{
+    private const DEFAULT_TAGS = [
+        'a',
+        'blockquote',
+        'br',
+        'cite',
+        'code',
+        'dd',
+        'div',
+        'dl',
+        'dt',
+        'em',
+        'h1',
+        'h2',
+        'h3',
+        'h4',
+        'h5',
+        'h6',
+        'hr',
+        'img',
+        'li',
+        'ol',
+        'p',
+        'pre',
+        'span',
+        'strike',
+        'strong',
+        'sub',
+        'sup',
+        'u',
+        'ul'
+    ];
+
+    public function __construct(
+        private readonly \ilDBInterface $db
+    ) {
+        parent::__construct();
+    }
+
+    /**
+     * @return	HTMLPurifier_Config Instance of HTMLPurifier_Config
+     */
+    protected function getPurifierConfigInstance(): \HTMLPurifier_Config
+    {
+        $config = \HTMLPurifier_Config::createDefault();
+        $config->set('HTML.DefinitionID', 'migration');
+        $config->set('HTML.DefinitionRev', 2);
+        $config->set('Cache.SerializerPath', sys_get_temp_dir());
+        $config->set('HTML.Doctype', 'XHTML 1.0 Strict');
+        $config->set('HTML.AllowedElements', $this->getAllowedElements());
+        $config->set('HTML.ForbiddenAttributes', 'div@style');
+        $config->autoFinalize = false;
+        $config->set(
+            'URI.AllowedSchemes',
+            array_merge(
+                $config->get('URI.AllowedSchemes'),
+                ['data' => true]
+            )
+        );
+        $config->autoFinalize = true;
+        if (($def = $config->maybeGetRawHTMLDefinition()) !== null) {
+            $def->addAttribute('img', 'data-id', 'Number');
+            $def->addAttribute('a', 'target', 'Enum#_blank,_self,_target,_top');
+        }
+
+        return $config;
+    }
+
+    private function getAllowedElements(): array
+    {
+        return $this->removeUnsupportedElements(
+            $this->makeElementListTinyMceCompliant(
+                $this->getElementsUsedForAdvancedEditing()
+            )
+        );
+    }
+
+    private function getElementsUsedForAdvancedEditing(): array
+    {
+        $tags = $this->db->fetchObject(
+            $this->db->query(
+                'SELECT value FROM settings' . PHP_EOL
+                . 'WHERE module = "advanced_editing"' . PHP_EOL
+                . 'AND keyword = "advanced_editing_used_html_tags_assessment"'
+            )
+        )?->value ?? '';
+
+        if ($tags === '') {
+            return self::DEFAULT_TAGS;
+        }
+
+        return unserialize($tags, ['allowed_classes' => false]);
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerForm/Migration/SanitizeLegacyText.php b/components/ILIAS/Questions/src/AnswerForm/Migration/SanitizeLegacyText.php
new file mode 100644
index 000000000000..ea64832261d8
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerForm/Migration/SanitizeLegacyText.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerForm\Migration;
+
+trait SanitizeLegacyText
+{
+    private ?MigrationPurifier $purifiery = null;
+    private readonly bool $rte_used;
+
+    private function sanitizeLegacyText(
+        \ilDBInterface $db,
+        string $text,
+        bool $ilias_page_editor_text
+    ): string {
+        if ($this->purifiery === null) {
+            $this->purifiery = new MigrationPurifier($db);
+            $this->rte_used = $this->fetchIsRteUsedFromDb($db);
+        }
+        $cleaned_text = $this->purifiery->purify($text);
+
+        if ($ilias_page_editor_text || !$this->rte_used) {
+            $cleaned_text = nl2br($cleaned_text);
+        }
+
+        return \ilLegacyFormElementsUtil::prepareTextareaOutput(
+            $cleaned_text,
+            true
+        );
+    }
+
+    private function fetchIsRteUsedFromDb(
+        \ilDBInterface $db
+    ): bool {
+        return $db->fetchObject(
+            $db->query(
+                'SELECT value FROM settings' . PHP_EOL
+                . 'WHERE module = "advanced_editing"' . PHP_EOL
+                . 'AND keyword = "advanced_editing_javascript_editor"'
+            )
+        )?->value === 'tinymce';
+    }
+}
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
index 58b6ce7d69fc..5a5bbc975948 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Migration;
 
+use ILIAS\Questions\AnswerForm\Migration\SanitizeLegacyText;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
@@ -32,6 +33,8 @@
 
 trait BasicMigrationFunctions
 {
+    use SanitizeLegacyText;
+
     private function buildGapInsertStatement(
         Persistence $persistence,
         TableNameBuilder $table_name_builder,
@@ -218,9 +221,11 @@ private function buildNewTextRatingFromOld(
     }
 
     private function replaceGapsAndSantizeLegacyClozeText(
+        \ilDBInterface $db,
         string $gap_replace_regex,
         string $text,
-        array $gaps_mapping
+        array $gaps_mapping,
+        bool $ilias_page_editor_text
     ): string {
         ksort($gaps_mapping);
 
@@ -229,7 +234,11 @@ private function replaceGapsAndSantizeLegacyClozeText(
             function (array $matches) use (&$gaps_mapping): string {
                 return '{{' . Gap::GAP_PLACEHOLDER_NAME . '_' . array_shift($gaps_mapping) . '}}';
             },
-            $text
+            $this->sanitizeLegacyText(
+                $db,
+                $text,
+                $ilias_page_editor_text
+            )
         );
     }
 
@@ -239,4 +248,9 @@ private function limitToFloat(
     ): float {
         return (float) $math->e($limit);
     }
+
+    private function getHtmlQuestionContentPurifier(): \ilHtmlPurifierInterface
+    {
+        return \ilHtmlPurifierFactory::getInstanceByType('qpl_usersolution');
+    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
index db0cd67c13a4..48442e2f7f82 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
@@ -142,9 +142,11 @@ public function completeMigrationInsert(
                 $answer_options_insert
             )->withAdditionalTextLegacy(
                 $this->replaceGapsAndSantizeLegacyClozeText(
+                    $migration_insert->getDb(),
                     '\[gap\].+?\[\/gap\]',
                     $db_row->cloze_text,
-                    $answer_input_mapping
+                    $answer_input_mapping,
+                    $migration_insert->wasIliasPageEditorUsedForAdditionalTexts()
                 )
             );
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
index f7ce89c023dc..f65f0a6e2a50 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
@@ -137,9 +137,11 @@ public function completeMigrationInsert(
                 )
             )->withAdditionalTextLegacy(
                 $this->replaceGapsAndSantizeLegacyClozeText(
+                    $migration_insert->getDb(),
                     '\[Longmenu \d+\]',
                     $db_row->long_menu_text,
-                    $answer_input_mapping
+                    $answer_input_mapping,
+                    $migration_insert->wasIliasPageEditorUsedForAdditionalTexts()
                 )
             )->withAdditionalInsert($gaps_insert)
             ->withAdditionalInsert($answer_options_insert);
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index 235a53e25314..4617fe9c272c 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -131,7 +131,7 @@ public function getLegacyClozeText(): string
     public function getClozeTextForPresentation(): string
     {
         return $this->cloze_text->getRawRepresentationForPersistence() === ''
-            ? $this->legacy_cloze_text
+            ? \ilRTE::_replaceMediaObjectImageSrc($this->legacy_cloze_text, 0)
             : $this->cloze_text->getRenderedMarkdownForParticipantPresentation();
     }
 
diff --git a/components/ILIAS/Questions/src/Setup/QuestionsMigration.php b/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
index 1ec6b1813e56..a02fcb248534 100644
--- a/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
+++ b/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
@@ -366,7 +366,8 @@ private function buildMigrationInsert(
             $db_values->question_id,
             $new_question_id,
             $this->uuid_factory->uuid4(),
-            $answer_form_migration->getDefinitionClass()
+            $answer_form_migration->getDefinitionClass(),
+            $db_values->add_cont_edit_mode === \assQuestion::ADDITIONAL_CONTENT_EDITING_MODE_IPE
         );
     }
 }

From f625ccb1a2a09a4eaeab81fafb1b608bf1986bcc Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 6 Feb 2026 11:11:18 +0100
Subject: [PATCH 121/141] Questions: Add forgotten Parameter

---
 .../ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index c2c018a0f1ff..011958951da6 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -71,7 +71,7 @@ public function create(
         $step = $environment->getStep();
 
         return match($step) {
-            '' => $this->buildBasicEditingForm($environment),
+            '' => $this->buildBasicEditingForm($environment, false),
             default => $this->callIntermediateStep($environment, $step)
         };
     }

From 7768097d9839bfebe28cff210320a5ef9e62cda7 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 6 Feb 2026 11:40:29 +0100
Subject: [PATCH 122/141] Questions: Fix Migration of LongMenu-Forms

---
 .../Cloze/Migration/MigrationLongMenu.php     | 59 ++++++++++++-------
 .../ILIAS/Questions/src/Persistence/Query.php |  5 +-
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
index f65f0a6e2a50..f88a3d445179 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
@@ -59,23 +59,25 @@ public function completeMigrationInsert(
         Environment $environment,
         MigrationInsert $migration_insert
     ): ?MigrationInsert {
+        $answer_form_id = $migration_insert->getAnswerFormId();
+
         $answer_input_mapping = [];
         $gaps_insert = null;
-        $answer_options_insert = null;
+        $answer_options_to_insert = [];
 
         foreach ($this->fetchDBValues(
             $migration_insert->getDb(),
             $migration_insert->getOldQuestionId()
         ) as $db_row) {
-            $answer_form_id = $migration_insert->getAnswerFormId();
             if (!isset($answer_input_mapping[$db_row->gap_number])) {
-                $answer_input_mapping[$db_row->gap_number] = $migration_insert->getUuid();
+                $answer_input_id = $migration_insert->getUuid();
+                $answer_input_mapping[$db_row->gap_number] = $answer_input_id;
 
                 $gaps_insert = $this->buildGapInsertStatement(
                     $this->persistence,
                     $migration_insert->getTableNameBuilder(),
                     $gaps_insert,
-                    $answer_input_mapping[$db_row->gap_number],
+                    $answer_input_id,
                     $answer_form_id,
                     $db_row->gap_number,
                     $this->buildNewGapTypeIdentifierFromOld($db_row->type),
@@ -86,39 +88,56 @@ public function completeMigrationInsert(
                     $db_row->shuffle_answers === '1' ? 1 : 0
                 );
 
-                $answers = array_map(
-                    fn(string $v) => [
-                        'answer_input_id' => $migration_insert->getUuid(),
-                        'text' => trim($v),
+                $answers_from_file = $this->loadAnswersFromFile(
+                    $environment->getResource(Environment::RESOURCE_ILIAS_INI),
+                    $environment->getResource(Environment::RESOURCE_CLIENT_ID),
+                    $migration_insert->getOldQuestionId(),
+                    $db_row->gap_number
+                );
+
+                $answer_options_to_insert[$answer_input_id->toString()] = array_map(
+                    fn(int $v) => [
+                        'answer_option_id' => $migration_insert->getUuid(),
+                        'answer_input_id' => $answer_input_id,
+                        'position' => $v,
+                        'text' => trim($answers_from_file[$v]),
                         'points' => 0.0
                     ],
-                    $this->loadAnswersFromFile(
-                        $environment->getResource(Environment::RESOURCE_ILIAS_INI),
-                        $environment->getResource(Environment::RESOURCE_CLIENT_ID),
-                        $migration_insert->getOldQuestionId(),
-                        $db_row->gap_number
-                    )
+                    array_keys($answers_from_file)
                 );
             }
 
-            if (isset($answers[$db_row->position])
-                && $answers[$db_row->position]['text'] === trim($db_row->answer_text)) {
-                $answers[$db_row->position]['points'] = $db_row->points;
+            $answer_input_id_string = $answer_input_mapping[$db_row->gap_number]->toString();
+            $position = array_find_key(
+                $answer_options_to_insert[$answer_input_id_string],
+                fn(array $v, int $k): bool => trim($v['text']) === trim($db_row->answer_text)
+            );
+
+            if ($position !== null) {
+                $answer_options_to_insert[$answer_input_id_string][$position]['points'] = $db_row->points;
+                ;
             }
+
+
         }
 
         if (!isset($db_row)) {
             return null;
         }
 
-        foreach ($answers as $position => $answer) {
+        $answer_options_insert = null;
+        foreach (array_reduce(
+            $answer_options_to_insert,
+            fn(array $c, array $v): array => [...$c, ...$v],
+            []
+        ) as $answer) {
             $answer_options_insert = $this->buildAnswerOptionInsertStatement(
                 $this->persistence,
                 $migration_insert->getTableNameBuilder(),
                 $answer_options_insert,
+                $answer['answer_option_id'],
                 $answer['answer_input_id'],
-                $answer_input_mapping[$db_row->gap_number],
-                $position,
+                $answer['position'],
                 $answer['text'],
                 $answer['points'],
                 null,
diff --git a/components/ILIAS/Questions/src/Persistence/Query.php b/components/ILIAS/Questions/src/Persistence/Query.php
index 54f04994b400..9588187b8a40 100644
--- a/components/ILIAS/Questions/src/Persistence/Query.php
+++ b/components/ILIAS/Questions/src/Persistence/Query.php
@@ -175,7 +175,10 @@ public function retrieveCurrentRecord(
         $table_name = $table->getName();
         $filtered_record = [];
         foreach ($this->current_record as $data_set) {
-            $filtered_record[] = $this->filterDataSetByTable($table_name, $data_set);
+            $filtered_dataset = $this->filterDataSetByTable($table_name, $data_set);
+            if (array_filter($filtered_dataset) !== []) {
+                $filtered_record[] = $filtered_dataset;
+            }
         }
 
         return $transformation->transform($filtered_record);

From 83b769887acaffe4022bc7bd8653f0f10a6cf289 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 6 Feb 2026 12:13:49 +0100
Subject: [PATCH 123/141] Questions: Show Legacy Text in Panel

---
 .../Cloze/Layout/CombinationsOverview.php     |  6 ++--
 .../Cloze/Properties/ClozeText/Text.php       | 35 +++++++++++--------
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 12 ++++---
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
index a0f344715a59..14c4240512c6 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
@@ -196,7 +196,8 @@ private function buildSetCombinationGapsModal(): RoundTripModal
             $properties->getClozeText()->buildPanelForEditing(
                 $this->ui_factory,
                 $this->lng,
-                $gaps
+                $gaps,
+                $properties->getLegacyClozeText()
             ),
             [
                 'combination' => $gaps->buildGapsMultiSelect(
@@ -256,7 +257,8 @@ private function buildSetCombinationValuesModal(
             $properties->getClozeText()->buildPanelForEditing(
                 $this->ui_factory,
                 $this->lng,
-                $gaps
+                $gaps,
+                $properties->getLegacyClozeText()
             ),
             [
                 'values_awarding_points' => $inputs
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index d6e9cfb092b9..3d85aff02311 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -88,29 +88,20 @@ public function getRenderedMarkdownForParticipantPresentation(): string
     public function buildPanelForEditing(
         UIFactory $ui_factory,
         Language $lng,
-        Gaps $gaps
+        Gaps $gaps,
+        string $legacy_cloze_text
     ): StandardPanel {
         return $ui_factory->panel()->standard(
             $lng->txt('cloze_text'),
-            $ui_factory->legacy()->content(
+            $ui_factory->legacy()->latexContent(
                 $this->getRenderedMarkdownForEditingPresentation(
-                    $gaps
+                    $gaps,
+                    $legacy_cloze_text
                 )
             )
         );
     }
 
-    public function getRenderedMarkdownForEditingPresentation(
-        Gaps $gaps
-    ): string {
-        return $this->mustache_engine->render(
-            $this->refinery->string()->markdown()->toHTML()->transform(
-                $this->cloze_text->getRawRepresentation()
-            ),
-            $gaps->getPlaceholderArrayForEditFormPanel()
-        );
-    }
-
     public function updateGapsFromMarkdown(
         Uuid $answer_form_id,
         Gaps $pre_existing_gaps
@@ -171,6 +162,22 @@ function (array $matches) use (&$new_gaps): string {
         return $clone;
     }
 
+    private function getRenderedMarkdownForEditingPresentation(
+        Gaps $gaps,
+        string $legacy_cloze_text
+    ): string {
+        $text = $this->cloze_text->getRawRepresentation() === ''
+            ? $legacy_cloze_text
+            : $this->refinery->string()->markdown()->toHTML()->transform(
+                $this->cloze_text->getRawRepresentation()
+            );
+
+        return $this->mustache_engine->render(
+            $text,
+            $gaps->getPlaceholderArrayForEditFormPanel()
+        );
+    }
+
     private function hasAtLeastOneGap(): bool
     {
         if ($this->cloze_text->getRawRepresentation() === '') {
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 011958951da6..2c9d69022feb 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -285,7 +285,8 @@ private function buildGapTypesForm(
             $properties->getClozeText()->buildPanelForEditing(
                 $this->ui_factory,
                 $this->lng,
-                $properties->getGaps()
+                $properties->getGaps(),
+                $properties->getLegacyClozeText()
             )
         );
     }
@@ -328,7 +329,8 @@ private function buildAnswerOptionsForm(
             $properties->getClozeText()->buildPanelForEditing(
                 $this->ui_factory,
                 $this->lng,
-                $properties->getGaps()
+                $properties->getGaps(),
+                $properties->getLegacyClozeText()
             )
         );
     }
@@ -371,7 +373,8 @@ private function buildAssignPointsForm(
             $properties->getClozeText()->buildPanelForEditing(
                 $this->ui_factory,
                 $this->lng,
-                $properties->getGaps()
+                $properties->getGaps(),
+                $properties->getLegacyClozeText()
             )
         );
     }
@@ -390,7 +393,8 @@ private function processAssignPointsForm(
                 $properties->getClozeText()->buildPanelForEditing(
                     $this->ui_factory,
                     $this->lng,
-                    $properties->getGaps()
+                    $properties->getGaps(),
+                    $properties->getLegacyClozeText()
                 )
             ) : $properties->withGaps($data);
     }

From f689e9d265c89f434f1b2b239943767fcc68080f Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 6 Feb 2026 13:33:36 +0100
Subject: [PATCH 124/141] Question: Move Adding Text to Page

---
 .../Legacy/PageEditor/QstsQuestionPage.php    | 18 ++++++++++++
 .../Questions/src/Presentation/Views/Edit.php | 28 ++-----------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
index 9e23acb982f2..cc8e263462ca 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/QstsQuestionPage.php
@@ -40,4 +40,22 @@ public function setQuestion(
     ): void {
         $this->question = $question;
     }
+
+    public function addQuestionText(
+        string $text
+    ): void {
+        $this->buildDom();
+
+        $lng = $this->user->getLanguage();
+        if ($lng === '') {
+            $lng = 'de';
+        }
+
+        $page_element = new \ilPCParagraph($this);
+        $page_element->create($this, 'pg');
+        $page_element->setLanguage($lng);
+        $page_element->setText($text);
+
+        $this->update();
+    }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 4aed1c8c0c6d..f96c9d373c73 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -401,10 +401,9 @@ private function processCreateAnswerForm(
         }
 
         if ($this->configuration_repository->isCreateModeSimple($environment)) {
-            $this->addQuestionTextToPage(
-                $question,
-                $data['question_text']
-            );
+            $question_page = new \QstsQuestionPage($question->getPageId());
+            $question_page->setQuestion($question);
+            $question_page->addQuestionText($data['question_text']);
         }
 
         $type_definition = $data['type'];
@@ -618,27 +617,6 @@ private function deleteSelectedQuestions(
         $this->questions_repository->delete($questions_to_delete);
     }
 
-    private function addQuestionTextToPage(
-        QuestionImplementation $question,
-        string $text
-    ): void {
-        $page = new \QstsQuestionPage(
-            $question->getPageId()
-        );
-        $page->setQuestion($question);
-        $page->buildDom();
-
-        $page_element = new \ilPCParagraph(
-            $page
-        );
-
-        $page_element->create($page, 'pg');
-        $page_element->setLanguage($this->current_user->getLanguage());
-        $page_element->setText($text);
-
-        $page->update();
-    }
-
     private function buildEnvironment(
         URI $base_uri,
         int $obj_id

From 7e50d0e4540d11e2dc982af3b45a566f6ac7fbd0 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 6 Feb 2026 13:48:05 +0100
Subject: [PATCH 125/141] Question: Function Needs to be Public

---
 .../class.ilPCLegacyAnswerFormText.php        |  4 ++-
 .../Cloze/Properties/ClozeText/Text.php       | 32 +++++++++----------
 .../Cloze/Properties/Properties.php           |  5 ++-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormText.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormText.php
index 19c9c39495a3..a5fdabc3cbfb 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormText.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCLegacyAnswerFormText.php
@@ -41,7 +41,9 @@ public function modifyPageContentPostXsl(
 
         return mb_ereg_replace_callback(
             self::TEXT_PLACEHOLDER,
-            static fn(array $matches): string => base64_decode($matches[1]),
+            static fn(array $matches): string => \ilRTE::_replaceMediaObjectImageSrc(
+                base64_decode($matches[1])
+            ),
             $output
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 3d85aff02311..17b414a3abfe 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -102,6 +102,22 @@ public function buildPanelForEditing(
         );
     }
 
+    public function getRenderedMarkdownForEditingPresentation(
+        Gaps $gaps,
+        string $legacy_cloze_text
+    ): string {
+        $text = $this->cloze_text->getRawRepresentation() === ''
+            ? $legacy_cloze_text
+            : $this->refinery->string()->markdown()->toHTML()->transform(
+                $this->cloze_text->getRawRepresentation()
+            );
+
+        return $this->mustache_engine->render(
+            $text,
+            $gaps->getPlaceholderArrayForEditFormPanel()
+        );
+    }
+
     public function updateGapsFromMarkdown(
         Uuid $answer_form_id,
         Gaps $pre_existing_gaps
@@ -162,22 +178,6 @@ function (array $matches) use (&$new_gaps): string {
         return $clone;
     }
 
-    private function getRenderedMarkdownForEditingPresentation(
-        Gaps $gaps,
-        string $legacy_cloze_text
-    ): string {
-        $text = $this->cloze_text->getRawRepresentation() === ''
-            ? $legacy_cloze_text
-            : $this->refinery->string()->markdown()->toHTML()->transform(
-                $this->cloze_text->getRawRepresentation()
-            );
-
-        return $this->mustache_engine->render(
-            $text,
-            $gaps->getPlaceholderArrayForEditFormPanel()
-        );
-    }
-
     private function hasAtLeastOneGap(): bool
     {
         if ($this->cloze_text->getRawRepresentation() === '') {
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index 4617fe9c272c..42f0d41c5a2a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -181,7 +181,10 @@ public function getBasicPropertiesForListing(
     ): array {
         return [
             $lng->txt('cloze_text') => $this->cloze_text
-                ->getRenderedMarkdownForEditingPresentation($this->gaps),
+                ->getRenderedMarkdownForEditingPresentation(
+                    $this->gaps,
+                    $this->getLegacyClozeText()
+                ),
             $lng->txt('score_identical') => $this->scoring_identical
                 ->getTranslatedOptionName($lng),
             $lng->txt('gap_combinations') => $this->combinations->areCombinationsEnabled()

From 313e5ea9364237fc30e603f45fb82dd569ab77c4 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 6 Feb 2026 14:19:33 +0100
Subject: [PATCH 126/141] Question: Update Method Call

---
 .../ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 2c9d69022feb..5bbd49213efc 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -230,7 +230,8 @@ private function processBasicEditingForm(
         Environment $environment
     ): EditForm|Properties {
         $form = $this->buildBasicEditingForm(
-            $environment
+            $environment,
+            false
         )->withRequest($this->http->request());
 
         $data = $form->getData();

From 09c0421073c5f7b944eafce656e74c268115082d Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Fri, 6 Feb 2026 16:31:09 +0100
Subject: [PATCH 127/141] Questions: Introduce Persistence Factory

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       |   6 +-
 components/ILIAS/Questions/Questions.php      |   3 +
 .../AnswerForm/Migration/MigrationInsert.php  |  52 ++-
 .../Questions/src/AnswerForm/Persistence.php  |   4 +
 .../src/AnswerForm/TypeGenericProperties.php  | 124 +++++---
 .../Migration/BasicMigrationFunctions.php     |  58 ++--
 .../Cloze/Migration/MigrationCloze.php        |  43 ++-
 .../Cloze/Migration/MigrationLongMenu.php     |   3 +
 .../Cloze/Migration/MigrationNumeric.php      |   3 +
 .../Cloze/Migration/MigrationTextSubset.php   |   3 +
 .../src/AnswerFormTypes/Cloze/Persistence.php | 114 +++++--
 .../Properties/Combinations/Combination.php   |  56 ++--
 .../Cloze/Properties/Combinations/Factory.php |   2 +
 .../Properties/Combinations/MatchingValue.php |  26 +-
 .../Cloze/Properties/Factory.php              |   1 +
 .../Gaps/AnswerOptions/AnswerOption.php       |  50 ++-
 .../Gaps/AnswerOptions/AnswerOptions.php      |  24 +-
 .../Properties/Gaps/AnswerOptions/Factory.php |   5 +-
 .../Cloze/Properties/Gaps/Factory.php         |   5 +-
 .../Cloze/Properties/Gaps/Gap.php             |  38 ++-
 .../Cloze/Properties/Gaps/Gaps.php            |  38 ++-
 .../Cloze/Properties/Properties.php           |  52 ++-
 .../Questions/src/Persistence/CoreTables.php  |  50 +--
 .../Questions/src/Persistence/Factory.php     | 125 ++++++++
 .../ILIAS/Questions/src/Persistence/Join.php  |   2 +-
 .../Questions/src/Persistence/Manipulate.php  |   6 +
 .../ILIAS/Questions/src/Persistence/Order.php |   2 +-
 .../ILIAS/Questions/src/Persistence/Query.php |  56 +++-
 .../Questions/src/Persistence/Repository.php  |  48 ++-
 .../ILIAS/Questions/src/Persistence/Table.php |   4 +-
 .../Questions/src/Persistence/TableTypes.php  |   5 +-
 .../ILIAS/Questions/src/Persistence/Where.php |   6 +-
 .../Questions/src/Presentation/Views/Edit.php |   1 -
 .../src/Question/QuestionImplementation.php   | 295 ++++++++++++------
 .../ILIAS/Questions/src/Setup/Agent.php       |   3 +
 .../src/Setup/QuestionsMigration.php          |  94 ++++--
 36 files changed, 1013 insertions(+), 394 deletions(-)
 create mode 100644 components/ILIAS/Questions/src/Persistence/Factory.php

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 1336bf124e0a..8f3cf59f63f5 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -25,6 +25,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze;
 use ILIAS\Questions\Persistence\TableNameSpaceCore;
 use ILIAS\Questions\AnswerForm\Factory as AnswerFormFactory;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Presentation\Views\Edit;
 use ILIAS\Questions\Presentation\Layout\Factory as LayoutFactory;
 use ILIAS\Questions\Units\Repository as UnitsRepository;
@@ -32,7 +33,6 @@
 use ILIAS\Data\Factory as DataFactory;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\DI\Container as ILIASContainer;
-use ILIAS\User\Settings\Settings as UserSettings;
 use Mustache\Engine as MustacheEngine;
 use Pimple\Container as PimpleContainer;
 
@@ -61,7 +61,6 @@ protected static function buildDIC(ILIASContainer $DIC): self
             $DIC['lng'],
             $DIC['ilDB']
         );
-
         $dic[ConfigurationRepository::class] = static fn($c): ConfigurationRepository
             => new ConfigurationRepository(
                 $DIC['ilSetting'],
@@ -81,7 +80,8 @@ protected static function buildDIC(ILIASContainer $DIC): self
             new QuestionsRepository(
                 $DIC['ilDB'],
                 $DIC['refinery'],
-                new UuidFactory(),
+                $c[UuidFactory::class],
+                new PersistenceFactory(),
                 $c[AnswerFormFactory::class]
             );
         $dic[LayoutFactory::class] = static fn($c): LayoutFactory =>
diff --git a/components/ILIAS/Questions/Questions.php b/components/ILIAS/Questions/Questions.php
index 5f1ce88139e0..00a64c0ca053 100644
--- a/components/ILIAS/Questions/Questions.php
+++ b/components/ILIAS/Questions/Questions.php
@@ -27,6 +27,7 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Migration\MigrationNumeric;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Migration\MigrationTextSubset;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\TableNameSpaceCore;
 use ILIAS\Questions\Setup\Agent;
 use ILIAS\Setup\Agent as AgentInterface;
@@ -46,6 +47,7 @@ public function init(
         $define[] = AnswerFormDefinition::class;
         $contribute[AgentInterface::class] = static fn() =>
             new Agent(
+                $internal[PersistenceFactory::class],
                 $seek[AnswerFormMigration::class]
             );
         $contribute[AnswerFormMigration::class] = static fn() => new MigrationCloze(
@@ -70,6 +72,7 @@ public function init(
         $internal[Persistence::class] = static fn() => new Persistence(
             new TableNameSpaceCore('cloze')
         );
+        $internal[PersistenceFactory::class] = static fn() => new PersistenceFactory();
         $internal[\EvalMath::class] = static fn() => new \EvalMath();
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php b/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
index 222adfdf1cc0..bf2ee1afeb80 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Migration/MigrationInsert.php
@@ -21,9 +21,9 @@
 namespace ILIAS\Questions\AnswerForm\Migration;
 
 use ILIAS\Questions\Persistence\CoreTables;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\TableNameBuilder;
-use ILIAS\Questions\Persistence\Value;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Setup\CLI\IOWrapper;
@@ -40,6 +40,7 @@ public function __construct(
         private readonly \ilDBInterface $db,
         private readonly IOWrapper $io,
         private readonly UuidFactory $uuid_factory,
+        private readonly PersistenceFactory $persistence_factory,
         private readonly TableNameBuilder $table_name_builder,
         private array $inserts,
         private readonly int $old_question_id,
@@ -65,6 +66,11 @@ public function getUuid(): Uuid
         return $this->uuid_factory->uuid4();
     }
 
+    public function getPersistenceFactory(): PersistenceFactory
+    {
+        return $this->persistence_factory;
+    }
+
     public function getTableNameBuilder(): TableNameBuilder
     {
         return $this->table_name_builder;
@@ -160,23 +166,45 @@ function (\ilDBInterface $db) use ($manipulates): void {
 
     private function buildCoreAnswerFormInsertStatement(): Insert
     {
-        return new Insert(
-            CoreTables::AnswerForms->getColumns(),
+        return $this->persistence_factory->insert(
+            CoreTables::AnswerForms->getColumns(
+                $this->persistence_factory
+            ),
             [
-                new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
-                new Value(\ilDBConstants::T_TEXT, $this->definition_class),
-                new Value(\ilDBConstants::T_TEXT, $this->new_question_id->toString()),
-                new Value(\ilDBConstants::T_FLOAT, $this->available_points),
-                new Value(\ilDBConstants::T_INTEGER, $this->image_size),
-                new Value(
+               $this->persistence_factory->value(
+                   \ilDBConstants::T_TEXT,
+                   $this->answer_form_id->toString()
+               ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->definition_class
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->new_question_id->toString()
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_FLOAT,
+                    $this->available_points
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->image_size
+                ),
+                $this->persistence_factory->value(
                     \ilDBConstants::T_INTEGER,
                     $this->shuffle_answer_options === null
                         ? null
                         : ($this->shuffle_answer_options ? 1 : 0)
                 ),
-                new Value(\ilDBConstants::T_TEXT, $this->additional_text),
-                new Value(\ilDBConstants::T_TEXT, $this->additional_text_legacy)
-
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->additional_text
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->additional_text_legacy
+                )
             ]
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerForm/Persistence.php b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
index 6b0484912f80..f4aba32eca06 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Persistence.php
@@ -21,6 +21,7 @@
 namespace ILIAS\Questions\AnswerForm;
 
 use ILIAS\Questions\Persistence\Column;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Query;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableNameSpace;
@@ -31,6 +32,7 @@ interface Persistence
     public function getTableNameSpace(): TableNameSpace;
 
     public function getColumns(
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
         string $table_identifier = '',
@@ -38,12 +40,14 @@ public function getColumns(
     ): array;
 
     public function getIdColumn(
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
         string $table_identifier = ''
     ): Column;
 
     public function getForeignKeyColumn(
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
         string $table_identifier = ''
diff --git a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
index 9f924b9b78d3..6e90e88dd8a6 100644
--- a/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
+++ b/components/ILIAS/Questions/src/AnswerForm/TypeGenericProperties.php
@@ -22,12 +22,12 @@
 
 use ILIAS\Questions\Persistence\CoreTables;
 use ILIAS\Questions\Persistence\Delete;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\Manipulate;
 use ILIAS\Questions\Persistence\ManipulationType;
 use ILIAS\Questions\Persistence\Storable;
 use ILIAS\Questions\Persistence\Update;
-use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\Persistence\Where;
 use ILIAS\Data\UUID\Uuid;
 
@@ -85,6 +85,7 @@ public function getAdditionalTextLegacy(): string
         return $this->additional_text_legacy;
     }
 
+    #[\Override]
     public function toStorage(
         Manipulate $manipulate
     ): Manipulate {
@@ -95,23 +96,28 @@ public function toStorage(
         }
         return $manipulate->withAdditionalStatement(
             $manipulate->getManipulationType() === ManipulationType::Create
-                ? $this->buildInsertStatement()
-                : $this->buildUpdateStatement()
+                ? $this->buildInsertStatement($manipulate->getPersistenceFactory())
+                : $this->buildUpdateStatement($manipulate->getPersistenceFactory())
         );
     }
 
+    #[\Override]
     public function toDelete(
         Manipulate $manipulate
     ): Manipulate {
         $answer_form_table_definition = CoreTables::AnswerForms;
 
         return $manipulate->withAdditionalStatement(
-            new Delete(
-                $answer_form_table_definition->getTable(),
+            $manipulate->getPersistenceFactory()->delete(
+                $answer_form_table_definition->getTable(
+                    $manipulate->getPersistenceFactory()
+                ),
                 [
-                    new Where(
-                        $answer_form_table_definition->getIdColumn(),
-                        new Value(
+                    $manipulate->getPersistenceFactory()->where(
+                        $answer_form_table_definition->getIdColumn(
+                            $manipulate->getPersistenceFactory()
+                        ),
+                        $manipulate->getPersistenceFactory()->value(
                             \ilDBConstants::T_TEXT,
                             $this->answer_form_id->toString()
                         )
@@ -121,45 +127,89 @@ public function toDelete(
         );
     }
 
-    private function buildInsertStatement(): Insert
-    {
-        return new Insert(
-            CoreTables::AnswerForms->getColumns(),
+    private function buildInsertStatement(
+        PersistenceFactory $persistence_factory
+    ): Insert {
+        return $persistence_factory->insert(
+            CoreTables::AnswerForms->getColumns(
+                $persistence_factory
+            ),
             [
-                new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
-                new Value(\ilDBConstants::T_TEXT, $this->definition::class),
-                new Value(\ilDBConstants::T_TEXT, $this->question_id->toString()),
-                new Value(\ilDBConstants::T_FLOAT, $this->available_points),
-                new Value(\ilDBConstants::T_INTEGER, $this->image_size),
-                new Value(\ilDBConstants::T_INTEGER, $this->getShuffleAnswerOptionsForStorage()),
-                new Value(\ilDBConstants::T_TEXT, $this->additional_text),
-                new Value(\ilDBConstants::T_TEXT, $this->additional_text_legacy)
-
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->answer_form_id->toString()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->definition::class
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->question_id->toString()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_FLOAT,
+                    $this->available_points
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->image_size
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->getShuffleAnswerOptionsForStorage()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->additional_text
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->additional_text_legacy
+                )
             ]
         );
     }
 
-    private function buildUpdateStatement(): Update
-    {
+    private function buildUpdateStatement(
+        PersistenceFactory $persistence_factory
+    ): Update {
         $answer_form_table_definition = CoreTables::AnswerForms;
-        return new Update(
-            $answer_form_table_definition->getColumns([
-                'id',
-                'type',
-                'question_id',
-                'additional_text_legacy'
-            ]),
+        return $persistence_factory->update(
+            $answer_form_table_definition->getColumns(
+                $persistence_factory,
+                [
+                    'id',
+                    'type',
+                    'question_id',
+                    'additional_text_legacy'
+                ]
+            ),
             [
-                new Value(\ilDBConstants::T_FLOAT, $this->available_points),
-                new Value(\ilDBConstants::T_INTEGER, $this->image_size),
-                new Value(\ilDBConstants::T_INTEGER, $this->getShuffleAnswerOptionsForStorage()),
-                new Value(\ilDBConstants::T_TEXT, $this->additional_text)
+                $persistence_factory->value(
+                    \ilDBConstants::T_FLOAT,
+                    $this->available_points
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->image_size
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->getShuffleAnswerOptionsForStorage()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->additional_text
+                )
 
             ],
             [
-                new Where(
-                    $answer_form_table_definition->getIdColumn(),
-                    new Value(
+                $persistence_factory->where(
+                    $answer_form_table_definition->getIdColumn(
+                        $persistence_factory
+                    ),
+                    $persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         $this->answer_form_id->toString()
                     )
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
index 5a5bbc975948..58242849b853 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/BasicMigrationFunctions.php
@@ -24,10 +24,10 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Definitions\ScoringIdentical;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
-use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\Definitions\TextMatchingOptions;
 use ILIAS\Data\UUID\Uuid;
 
@@ -37,6 +37,7 @@ trait BasicMigrationFunctions
 
     private function buildGapInsertStatement(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         ?Insert $gaps_insert,
         Uuid $answer_input_id,
@@ -50,12 +51,14 @@ private function buildGapInsertStatement(
         ?int $shuffle
     ): Insert {
         if ($gaps_insert === null) {
-            return new Insert(
+            return $persistence_factory->insert(
                 $persistence->getColumns(
+                    $persistence_factory,
                     $table_name_builder,
                     TableTypes::AnswerInputs
                 ),
                 $this->buildGapValuesForInsert(
+                    $persistence_factory,
                     $answer_input_id,
                     $answer_form_id,
                     $position,
@@ -71,6 +74,7 @@ private function buildGapInsertStatement(
 
         return $gaps_insert->withAdditionalValues(
             $this->buildGapValuesForInsert(
+                $persistence_factory,
                 $answer_input_id,
                 $answer_form_id,
                 $position,
@@ -85,6 +89,7 @@ private function buildGapInsertStatement(
     }
 
     private function buildGapValuesForInsert(
+        PersistenceFactory $persistence_factory,
         Uuid $answer_input_id,
         Uuid $answer_form_id,
         int $position,
@@ -96,20 +101,21 @@ private function buildGapValuesForInsert(
         ?int $shuffle
     ): array {
         return [
-            new Value(\ilDBConstants::T_TEXT, $answer_input_id->toString()),
-            new Value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
-            new Value(\ilDBConstants::T_INTEGER, $position),
-            new Value(\ilDBConstants::T_TEXT, $gap_type),
-            new Value(\ilDBConstants::T_INTEGER, $max_chars),
-            new Value(\ilDBConstants::T_FLOAT, $step_size),
-            new Value(\ilDBConstants::T_INTEGER, $matching_options?->value),
-            new Value(\ilDBConstants::T_INTEGER, $min_autocomplete),
-            new Value(\ilDBConstants::T_INTEGER, $shuffle)
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $answer_input_id->toString()),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
+            $persistence_factory->value(\ilDBConstants::T_INTEGER, $position),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $gap_type),
+            $persistence_factory->value(\ilDBConstants::T_INTEGER, $max_chars),
+            $persistence_factory->value(\ilDBConstants::T_FLOAT, $step_size),
+            $persistence_factory->value(\ilDBConstants::T_INTEGER, $matching_options?->value),
+            $persistence_factory->value(\ilDBConstants::T_INTEGER, $min_autocomplete),
+            $persistence_factory->value(\ilDBConstants::T_INTEGER, $shuffle)
         ];
     }
 
     private function buildAnswerOptionInsertStatement(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         ?Insert $options_insert,
         Uuid $answer_option_id,
@@ -121,12 +127,14 @@ private function buildAnswerOptionInsertStatement(
         ?float $upper_limit
     ): Insert {
         if ($options_insert === null) {
-            return new Insert(
+            return $persistence_factory->insert(
                 $persistence->getColumns(
+                    $persistence_factory,
                     $table_name_builder,
                     TableTypes::AnswerOptions
                 ),
                 $this->buildOptionValuesForInsert(
+                    $persistence_factory,
                     $answer_option_id,
                     $answer_input_id,
                     $position,
@@ -140,6 +148,7 @@ private function buildAnswerOptionInsertStatement(
 
         return $options_insert->withAdditionalValues(
             $this->buildOptionValuesForInsert(
+                $persistence_factory,
                 $answer_option_id,
                 $answer_input_id,
                 $position,
@@ -152,6 +161,7 @@ private function buildAnswerOptionInsertStatement(
     }
 
     private function buildOptionValuesForInsert(
+        PersistenceFactory $persistence_factory,
         Uuid $answer_option_id,
         Uuid $answer_input_id,
         int $position,
@@ -161,13 +171,13 @@ private function buildOptionValuesForInsert(
         ?float $upper_limit
     ): array {
         return [
-            new Value(\ilDBConstants::T_TEXT, $answer_option_id->toString()),
-            new Value(\ilDBConstants::T_TEXT, $answer_input_id->toString()),
-            new Value(\ilDBConstants::T_INTEGER, $position),
-            new Value(\ilDBConstants::T_TEXT, $text_value),
-            new Value(\ilDBConstants::T_FLOAT, $points),
-            new Value(\ilDBConstants::T_FLOAT, $lower_limit),
-            new Value(
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $answer_option_id->toString()),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $answer_input_id->toString()),
+            $persistence_factory->value(\ilDBConstants::T_INTEGER, $position),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $text_value),
+            $persistence_factory->value(\ilDBConstants::T_FLOAT, $points),
+            $persistence_factory->value(\ilDBConstants::T_FLOAT, $lower_limit),
+            $persistence_factory->value(
                 \ilDBConstants::T_FLOAT,
                 $lower_limit !== $upper_limit
                     ? $upper_limit
@@ -178,20 +188,22 @@ private function buildOptionValuesForInsert(
 
     private function buildAnswerFormInsertStatement(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         Uuid $answer_form_id,
         ScoringIdentical $scoring_identical,
         int $combinations_enabled
     ): Insert {
-        return new Insert(
+        return $persistence_factory->insert(
             $persistence->getColumns(
+                $persistence_factory,
                 $table_name_builder,
                 TableTypes::TypeSpecificAnswerForms
             ),
             [
-                new Value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
-                new Value(\ilDBConstants::T_TEXT, $scoring_identical->value),
-                new Value(\ilDBConstants::T_INTEGER, $combinations_enabled)
+                $persistence_factory->value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
+                $persistence_factory->value(\ilDBConstants::T_TEXT, $scoring_identical->value),
+                $persistence_factory->value(\ilDBConstants::T_INTEGER, $combinations_enabled)
             ]
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
index 48442e2f7f82..36759ff980e7 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationCloze.php
@@ -25,11 +25,11 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Definition;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations\InRange;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableNameSpace;
 use ILIAS\Questions\Persistence\TableTypes;
-use ILIAS\Questions\Persistence\Value;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Setup\Environment;
 
@@ -81,6 +81,7 @@ public function completeMigrationInsert(
                 $answer_options_mapping[$db_row->gap_id] = [];
                 $gaps_insert = $this->buildGapInsertStatement(
                     $this->persistence,
+                    $migration_insert->getPersistenceFactory(),
                     $migration_insert->getTableNameBuilder(),
                     $gaps_insert,
                     $answer_input_mapping[$db_row->gap_id],
@@ -103,6 +104,7 @@ public function completeMigrationInsert(
 
             $answer_options_insert = $this->buildAnswerOptionInsertStatement(
                 $this->persistence,
+                $migration_insert->getPersistenceFactory(),
                 $migration_insert->getTableNameBuilder(),
                 $answer_options_insert,
                 $answer_option_id,
@@ -131,6 +133,7 @@ public function completeMigrationInsert(
             ->withAdditionalInsert(
                 $this->buildAnswerFormInsertStatement(
                     $this->persistence,
+                    $migration_insert->getPersistenceFactory(),
                     $migration_insert->getTableNameBuilder(),
                     $answer_form_id,
                     $this->buildScoringIdenticalFromOld((int) $db_row->identical_scoring),
@@ -210,6 +213,7 @@ private function addCombinationInsertStatements(
             if (!isset($combination_mapping[$db_row->combination_id . $db_row->row_id])) {
                 $combination_mapping[$db_row->combination_id . $db_row->row_id] = $migration_insert->getUuid();
                 $combinations_insert = $this->buildCombinationsInsert(
+                    $migration_insert->getPersistenceFactory(),
                     $migration_insert->getTableNameBuilder(),
                     $combinations_insert,
                     $combination_mapping[$db_row->combination_id . $db_row->row_id]->toString(),
@@ -219,6 +223,7 @@ private function addCombinationInsertStatements(
             }
 
             $combinations_to_answer_options_insert = $this->buildCombinationsToAnswerOptionsInsert(
+                $migration_insert->getPersistenceFactory(),
                 $migration_insert->getTableNameBuilder(),
                 $combinations_to_answer_options_insert,
                 $combination_mapping[$db_row->combination_id . $db_row->row_id]->toString(),
@@ -233,6 +238,7 @@ private function addCombinationInsertStatements(
     }
 
     private function buildCombinationsInsert(
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         ?Insert $combinations_insert,
         Uuid $combination_id,
@@ -240,28 +246,30 @@ private function buildCombinationsInsert(
         float $points
     ): Insert {
         if ($combinations_insert === null) {
-            return new Insert(
+            return $persistence_factory->insert(
                 $this->persistence->getColumns(
+                    $persistence_factory,
                     $table_name_builder,
                     TableTypes::Additional,
                     $this->persistence->getCombinationsTableIdentifier()
                 ),
                 [
-                    new Value(\ilDBConstants::T_TEXT, $combination_id),
-                    new Value(\ilDBConstants::T_TEXT, $answer_form_id),
-                    new Value(\ilDBConstants::T_FLOAT, $points),
+                    $persistence_factory->value(\ilDBConstants::T_TEXT, $combination_id),
+                    $persistence_factory->value(\ilDBConstants::T_TEXT, $answer_form_id),
+                    $persistence_factory->value(\ilDBConstants::T_FLOAT, $points),
                 ]
             );
         }
 
         return $combinations_insert->withAdditionalValues([
-            new Value(\ilDBConstants::T_TEXT, $combination_id),
-            new Value(\ilDBConstants::T_TEXT, $answer_form_id),
-            new Value(\ilDBConstants::T_FLOAT, $points),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $combination_id),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $answer_form_id),
+            $persistence_factory->value(\ilDBConstants::T_FLOAT, $points),
         ]);
     }
 
     private function buildCombinationsToAnswerOptionsInsert(
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         ?Insert $combinations_to_answer_options_insert,
         Uuid $combination_id,
@@ -270,26 +278,27 @@ private function buildCombinationsToAnswerOptionsInsert(
         InRange $in_range
     ): Insert {
         if ($combinations_to_answer_options_insert === null) {
-            return new Insert(
+            return $persistence_factory->insert(
                 $this->persistence->getColumns(
+                    $persistence_factory,
                     $table_name_builder,
                     TableTypes::Additional,
                     $this->persistence->getCombinationToAnswerOptionsTableIdentifier()
                 ),
                 [
-                    new Value(\ilDBConstants::T_TEXT, $combination_id),
-                    new Value(\ilDBConstants::T_TEXT, $gap_id),
-                    new Value(\ilDBConstants::T_TEXT, $answer_option_id),
-                    new Value(\ilDBConstants::T_TEXT, $in_range)
+                    $persistence_factory->value(\ilDBConstants::T_TEXT, $combination_id),
+                    $persistence_factory->value(\ilDBConstants::T_TEXT, $gap_id),
+                    $persistence_factory->value(\ilDBConstants::T_TEXT, $answer_option_id),
+                    $persistence_factory->value(\ilDBConstants::T_TEXT, $in_range)
                 ]
             );
         }
 
         return $combinations_to_answer_options_insert->withAdditionalValues([
-            new Value(\ilDBConstants::T_TEXT, $combination_id),
-            new Value(\ilDBConstants::T_TEXT, $gap_id),
-            new Value(\ilDBConstants::T_TEXT, $answer_option_id),
-            new Value(\ilDBConstants::T_TEXT, $in_range)
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $combination_id),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $gap_id),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $answer_option_id),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $in_range)
         ]);
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
index f88a3d445179..93a1e55cc85d 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationLongMenu.php
@@ -75,6 +75,7 @@ public function completeMigrationInsert(
 
                 $gaps_insert = $this->buildGapInsertStatement(
                     $this->persistence,
+                    $migration_insert->getPersistenceFactory(),
                     $migration_insert->getTableNameBuilder(),
                     $gaps_insert,
                     $answer_input_id,
@@ -133,6 +134,7 @@ public function completeMigrationInsert(
         ) as $answer) {
             $answer_options_insert = $this->buildAnswerOptionInsertStatement(
                 $this->persistence,
+                $migration_insert->getPersistenceFactory(),
                 $migration_insert->getTableNameBuilder(),
                 $answer_options_insert,
                 $answer['answer_option_id'],
@@ -149,6 +151,7 @@ public function completeMigrationInsert(
             ->withAdditionalInsert(
                 $this->buildAnswerFormInsertStatement(
                     $this->persistence,
+                    $migration_insert->getPersistenceFactory(),
                     $migration_insert->getTableNameBuilder(),
                     $answer_form_id,
                     $this->buildScoringIdenticalFromOld($db_row->identical_scoring),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
index f11a705ef52a..4fc25a6fbf31 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationNumeric.php
@@ -77,6 +77,7 @@ public function completeMigrationInsert(
         return $migration_insert->withAdditionalInsert(
             $this->buildGapInsertStatement(
                 $this->persistence,
+                $migration_insert->getPersistenceFactory(),
                 $migration_insert->getTableNameBuilder(),
                 null,
                 $gap_id,
@@ -92,6 +93,7 @@ public function completeMigrationInsert(
         )->withAdditionalInsert(
             $this->buildAnswerOptionInsertStatement(
                 $this->persistence,
+                $migration_insert->getPersistenceFactory(),
                 $migration_insert->getTableNameBuilder(),
                 null,
                 $migration_insert->getUuid(),
@@ -105,6 +107,7 @@ public function completeMigrationInsert(
         )->withAdditionalInsert(
             $this->buildAnswerFormInsertStatement(
                 $this->persistence,
+                $migration_insert->getPersistenceFactory(),
                 $migration_insert->getTableNameBuilder(),
                 $answer_form_id,
                 ScoringIdentical::ScoreAll,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
index ab57e0f4d3c3..c2ba57c42977 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Migration/MigrationTextSubset.php
@@ -77,6 +77,7 @@ public function completeMigrationInsert(
 
                     $gaps_insert = $this->buildGapInsertStatement(
                         $this->persistence,
+                        $migration_insert->getPersistenceFactory(),
                         $migration_insert->getTableNameBuilder(),
                         $gaps_insert,
                         $gap_id,
@@ -97,6 +98,7 @@ public function completeMigrationInsert(
             foreach ($gaps as $gap_id) {
                 $answer_options_insert = $this->buildAnswerOptionInsertStatement(
                     $this->persistence,
+                    $migration_insert->getPersistenceFactory(),
                     $migration_insert->getTableNameBuilder(),
                     $answer_options_insert,
                     $migration_insert->getUuid(),
@@ -118,6 +120,7 @@ public function completeMigrationInsert(
             ->withAdditionalInsert(
                 $this->buildAnswerFormInsertStatement(
                     $this->persistence,
+                    $migration_insert->getPersistenceFactory(),
                     $migration_insert->getTableNameBuilder(),
                     $answer_form_id,
                     ScoringIdentical::OnlyScoreDistinct,
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
index 3fa8bb631adf..3c3e6072cd9e 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Persistence.php
@@ -23,11 +23,9 @@
 use ILIAS\Questions\AnswerForm\Persistence as PersistenceInterface;
 use ILIAS\Questions\Persistence\TableTypes;
 use ILIAS\Questions\Persistence\Query;
-use ILIAS\Questions\Persistence\Join;
 use ILIAS\Questions\Persistence\Column;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\JoinType;
-use ILIAS\Questions\Persistence\Order;
-use ILIAS\Questions\Persistence\Select;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableNameSpace;
 use ILIAS\Questions\Persistence\TableNameSpaceCore;
@@ -99,12 +97,17 @@ public function getTableNameSpace(): TableNameSpace
 
     #[\Override]
     public function getColumns(
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
         string $table_identifier = '',
         array $columns_to_skip = []
     ): array {
-        $table = $table_type->getTable($table_name_builder, $table_identifier);
+        $table = $table_type->getTable(
+            $persistence_factory,
+            $table_name_builder,
+            $table_identifier
+        );
         $column_identifiers = match($table_type) {
             TableTypes::TypeSpecificAnswerForms => self::ANSWER_FORM_TABLE_COLUMNS,
             TableTypes::AnswerInputs => self::ANSWER_INPUTS_TABLE_COLUMNS,
@@ -115,7 +118,7 @@ public function getColumns(
             }
         };
         return array_map(
-            fn(string $v): Column => new Column($table, $v),
+            fn(string $v): Column => $persistence_factory->column($table, $v),
             array_values(
                 array_filter(
                     $column_identifiers,
@@ -127,20 +130,25 @@ public function getColumns(
 
     #[\Override]
     public function getIdColumn(
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
         string $table_identifier = ''
     ): Column {
         if ($table_type === TableTypes::TypeSpecificAnswerForms) {
-            return new Column(
-                $table_type->getTable($table_name_builder),
+            return $persistence_factory->column(
+                $table_type->getTable(
+                    $persistence_factory,
+                    $table_name_builder
+                ),
                 self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
             );
         }
 
         if ($table_identifier === self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER) {
-            return new Column(
+            return $persistence_factory->column(
                 $table_type->getTable(
+                    $persistence_factory,
                     $table_name_builder,
                     self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER
                 ),
@@ -148,33 +156,51 @@ public function getIdColumn(
             );
         }
 
-        return new Column(
-            $table_type->getTable($table_name_builder, $table_identifier),
+        return $persistence_factory->column(
+            $table_type->getTable(
+                $persistence_factory,
+                $table_name_builder,
+                $table_identifier
+            ),
             self::ID_COLUMN
         );
     }
 
     #[\Override]
     public function getForeignKeyColumn(
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder,
         TableTypes $table_type,
         string $table_identifier = ''
     ): Column {
         return match($table_type) {
-            TableTypes::TypeSpecificAnswerForms => new Column(
-                $table_type->getTable($table_name_builder),
+            TableTypes::TypeSpecificAnswerForms => $persistence_factory->column(
+                $table_type->getTable(
+                    $persistence_factory,
+                    $table_name_builder
+                ),
                 self::ANSWER_FORM_TABLE_ID_COLUMN
             ),
-            TableTypes::AnswerInputs => new Column(
-                $table_type->getTable($table_name_builder),
+            TableTypes::AnswerInputs => $persistence_factory->column(
+                $table_type->getTable(
+                    $persistence_factory,
+                    $table_name_builder
+                ),
                 self::ANSWER_INPUTS_TABLE_FOREIGN_KEY_COLUMN
             ),
-            TableTypes::AnswerOptions => new Column(
-                $table_type->getTable($table_name_builder),
+            TableTypes::AnswerOptions => $persistence_factory->column(
+                $table_type->getTable(
+                    $persistence_factory,
+                    $table_name_builder
+                ),
                 self::ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN
             ),
-            TableTypes::Additional => new Column(
-                $table_type->getTable($table_name_builder, $table_identifier),
+            TableTypes::Additional => $persistence_factory->column(
+                $table_type->getTable(
+                    $persistence_factory,
+                    $table_name_builder,
+                    $table_identifier
+                ),
                 $table_identifier === self::COMBINATION_TABLE_IDENTIFIER
                     ? self::COMBINATION_TABLE_FOREIGN_KEY_COLUMN
                     : self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_FOREIGN_KEY_COLUMN
@@ -187,6 +213,7 @@ public function completeQuery(
         Query $query,
         Column $answer_form_id_column
     ): Query {
+        $persistence_factory = $query->getPersistenceFactory();
         $table_name_builder = $query->getTableNameBuilder(Definition::class);
 
         $answer_form_specific_table_definition = TableTypes::TypeSpecificAnswerForms;
@@ -195,77 +222,93 @@ public function completeQuery(
         $additional_table_definition = TableTypes::Additional;
 
         $combinations_id_column = $this->getIdColumn(
+            $persistence_factory,
             $table_name_builder,
             $additional_table_definition,
             self::COMBINATION_TABLE_IDENTIFIER
         );
 
         return $query->withAdditionalJoin(
-            new Join(
+            $persistence_factory->join(
                 $answer_form_id_column,
                 $this->getForeignKeyColumn(
+                    $persistence_factory,
                     $table_name_builder,
                     $answer_form_specific_table_definition
                 ),
                 JoinType::Left
             )
         )->withAdditionalSelect(
-            new Select(
-                $this->getColumns($table_name_builder, $answer_form_specific_table_definition)
+            $persistence_factory->select(
+                $this->getColumns(
+                    $persistence_factory,
+                    $table_name_builder,
+                    $answer_form_specific_table_definition
+                )
             )
         )->withAdditionalJoin(
-            new Join(
+            $persistence_factory->join(
                 $answer_form_id_column,
                 $this->getForeignKeyColumn(
+                    $persistence_factory,
                     $table_name_builder,
                     $answer_input_table_definition
                 ),
                 JoinType::Left
             )
         )->withAdditionalSelect(
-            new Select(
+            $persistence_factory->select(
                 $this->getColumns(
+                    $persistence_factory,
                     $table_name_builder,
                     $answer_input_table_definition
                 )
             )
         )->withAdditionalJoin(
-            new Join(
+            $persistence_factory->join(
                 $this->getIdColumn(
+                    $persistence_factory,
                     $table_name_builder,
                     $answer_input_table_definition
                 ),
                 $this->getForeignKeyColumn(
+                    $persistence_factory,
                     $table_name_builder,
                     $answer_options_table_definition
                 ),
                 JoinType::Left
             )
         )->withAdditionalOrder(
-            new Order(
+            $persistence_factory->order(
                 $this->getIdColumn(
+                    $persistence_factory,
                     $table_name_builder,
                     $answer_input_table_definition
                 )
             )
         )->withAdditionalSelect(
-            new Select(
+            $persistence_factory->select(
                 $this->getColumns(
+                    $persistence_factory,
                     $table_name_builder,
                     $answer_options_table_definition
                 )
             )
         )->withAdditionalOrder(
-            new Order(
-                new Column(
-                    $answer_options_table_definition->getTable($table_name_builder),
+            $persistence_factory->order(
+                $persistence_factory->column(
+                    $answer_options_table_definition->getTable(
+                        $persistence_factory,
+                        $table_name_builder
+                    ),
                     'position'
                 )
             )
         )->withAdditionalJoin(
-            new Join(
+            $persistence_factory->join(
                 $answer_form_id_column,
                 $this->getForeignKeyColumn(
+                    $persistence_factory,
                     $table_name_builder,
                     $additional_table_definition,
                     self::COMBINATION_TABLE_IDENTIFIER
@@ -273,17 +316,19 @@ public function completeQuery(
                 JoinType::Left
             )
         )->withAdditionalSelect(
-            new Select(
+            $persistence_factory->select(
                 $this->getColumns(
+                    $persistence_factory,
                     $table_name_builder,
                     $additional_table_definition,
                     self::COMBINATION_TABLE_IDENTIFIER
                 )
             )
         )->withAdditionalJoin(
-            new Join(
+            $persistence_factory->join(
                 $combinations_id_column,
                 $this->getForeignKeyColumn(
+                    $persistence_factory,
                     $table_name_builder,
                     $additional_table_definition,
                     self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER
@@ -291,15 +336,16 @@ public function completeQuery(
                 JoinType::Left
             )
         )->withAdditionalSelect(
-            new Select(
+            $persistence_factory->select(
                 $this->getColumns(
+                    $persistence_factory,
                     $table_name_builder,
                     $additional_table_definition,
                     self::COMBINATION_TO_ANSWER_OPTIONS_TABLE_IDENTIFIER
                 )
             )
         )->withAdditionalOrder(
-            new Order(
+            $persistence_factory->order(
                 $combinations_id_column
             )
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
index 8ba82d26f080..ed6a55d775bd 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
@@ -21,16 +21,13 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Combinations;
 
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
 use ILIAS\Questions\Persistence\Delete;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Manipulate;
 use ILIAS\Questions\Persistence\Replace;
-use ILIAS\Questions\Persistence\Table;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
-use ILIAS\Questions\Persistence\Value;
-use ILIAS\Questions\Persistence\Where;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -111,14 +108,16 @@ public function toStorage(
             fn(Manipulate $c, MatchingValue $v): Manipulate => $c->withAdditionalStatement(
                 $v->toStorage(
                     $persistence,
+                    $manipulate->getPersistenceFactory(),
                     $table_name_builder
                 )
             ),
             $manipulate->withAdditionalStatement(
                 $this->buildReplace(
-                    $answer_form_id,
                     $persistence,
-                    $table_name_builder
+                    $manipulate->getPersistenceFactory(),
+                    $table_name_builder,
+                    $answer_form_id
                 )
             )
         );
@@ -130,54 +129,65 @@ public function toDelete(
         Manipulate $manipulate
     ): Manipulate {
         return $manipulate->withAdditionalStatement(
-            $this->buildDelete($persistence, $table_name_builder)
+            $this->buildDelete(
+                $persistence,
+                $manipulate->getPersistenceFactory(),
+                $table_name_builder
+            )
         )->withAdditionalStatement(
             $this->buildDeleteForLinkedValues(
                 $persistence,
+                $manipulate->getPersistenceFactory(),
                 $table_name_builder
             )
         );
     }
 
     private function buildReplace(
-        Uuid $answer_form_id,
         Persistence $persistence,
-        TableNameBuilder $table_name_builder
+        PersistenceFactory $persistence_factory,
+        TableNameBuilder $table_name_builder,
+        Uuid $answer_form_id
     ): Replace {
         $table_definition = TableTypes::Additional;
-        return new Replace(
+        return $persistence_factory->replace(
             $persistence->getColumns(
+                $persistence_factory,
                 $table_name_builder,
                 $table_definition,
                 $persistence->getCombinationsTableIdentifier()
             ),
             [
-                new Value(\ilDBConstants::T_TEXT, $this->id->toString()),
-                new Value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
-                new Value(\ilDBConstants::T_FLOAT, $this->available_points)
+                $persistence_factory->value(\ilDBConstants::T_TEXT, $this->id->toString()),
+                $persistence_factory->value(\ilDBConstants::T_TEXT, $answer_form_id->toString()),
+                $persistence_factory->value(\ilDBConstants::T_FLOAT, $this->available_points)
             ]
         );
     }
 
     private function buildDelete(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Delete {
         $table_definition = TableTypes::Additional;
-        return new Delete(
-            new Table(
+        return $persistence_factory->delete(
+            $persistence_factory->table(
                 $table_definition,
                 $table_name_builder,
                 $persistence->getCombinationsTableIdentifier()
             ),
             [
-                new Where(
+                $persistence_factory->where(
                     $persistence->getIdColumn(
                         $table_name_builder,
                         $table_definition,
                         $persistence->getCombinationsTableIdentifier()
                     ),
-                    new Value(\ilDBConstants::T_TEXT, $this->id->toString())
+                    $persistence_factory->value(
+                        \ilDBConstants::T_TEXT,
+                        $this->id->toString()
+                    )
                 )
             ]
         );
@@ -185,23 +195,27 @@ private function buildDelete(
 
     private function buildDeleteForLinkedValues(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Delete {
         $table_definition = TableTypes::Additional;
-        return new Delete(
-            new Table(
+        return $persistence_factory->delete(
+            $persistence_factory->table(
                 $table_definition,
                 $table_name_builder,
                 $persistence->getCombinationToAnswerOptionsTableIdentifier()
             ),
             [
-                new Where(
+                $persistence_factory->where(
                     $persistence->getIdColumn(
                         $table_name_builder,
                         $table_definition,
                         $persistence->getCombinationToAnswerOptionsTableIdentifier()
                     ),
-                    new Value(\ilDBConstants::T_TEXT, $this->id->toString())
+                    $persistence_factory->value(
+                        \ilDBConstants::T_TEXT,
+                        $this->id->toString()
+                    )
                 )
             ]
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
index 609c3141ac2a..9add58b34293 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
@@ -189,6 +189,7 @@ private function retrieveCombinationsFromQuery(
     ): array {
         return $query->retrieveCurrentRecord(
             TableTypes::Additional->getTable(
+                $query->getPersistenceFactory(),
                 $query->getTableNameBuilder(
                     $type_generic_properties->getDefinition()::class
                 ),
@@ -238,6 +239,7 @@ private function retrieveMatchingValuesFromQuery(
     ): array {
         return $query->retrieveCurrentRecord(
             TableTypes::Additional->getTable(
+                $query->getPersistenceFactory(),
                 $query->getTableNameBuilder(
                     $type_generic_properties->getDefinition()::class
                 ),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php
index 6f7a97fbc520..50eb350fbece 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/MatchingValue.php
@@ -23,10 +23,10 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Replace;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
-use ILIAS\Questions\Persistence\Value;
 use ILIAS\Language\Language;
 use ILIAS\Data\UUID\Uuid;
 
@@ -74,6 +74,7 @@ public function buildPresentationString(
 
     public function toStorage(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Replace {
         if ($this->answer_option === null) {
@@ -83,17 +84,30 @@ public function toStorage(
         }
 
         $table_definition = TableTypes::Additional;
-        return new Replace(
+        return $persistence_factory->replace(
             $persistence->getColumns(
+                $persistence_factory,
                 $table_name_builder,
                 $table_definition,
                 $persistence->getCombinationToAnswerOptionsTableIdentifier()
             ),
             [
-                new Value(\ilDBConstants::T_TEXT, $this->combination_id->toString()),
-                new Value(\ilDBConstants::T_TEXT, $this->gap->getAnswerInputId()->toString()),
-                new Value(\ilDBConstants::T_TEXT, $this->answer_option->getAnswerOptionId()->toString()),
-                new Value(\ilDBConstants::T_TEXT, $this->in_range?->value)
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->combination_id->toString()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->gap->getAnswerInputId()->toString()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->answer_option->getAnswerOptionId()->toString()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->in_range?->value
+                )
             ]
         );
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
index 44dab3e82a0e..6e1f2610216d 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
@@ -67,6 +67,7 @@ public function fromData(
             'combinations_enabled' => $combinations_enabled
         ] = $query->retrieveCurrentRecord(
             TableTypes::TypeSpecificAnswerForms->getTable(
+                $query->getPersistenceFactory(),
                 $query->getTableNameBuilder($type_generic_properties->getDefinition()::class)
             ),
             $query->getRefinery()->custom()->transformation(
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
index ff0000cdc243..a59e4b4be113 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
@@ -20,8 +20,8 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions;
 
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Replace;
-use ILIAS\Questions\Persistence\Value;
 use ILIAS\Data\UUID\Uuid;
 
 class AnswerOption
@@ -138,32 +138,54 @@ public function buildArrayForHiddenInput(): array
     }
 
     public function buildReplace(
+        PersistenceFactory $persistence_factory,
         ?Replace $replace,
         array $columns
     ): Replace {
         if ($replace === null) {
-            return new Replace(
+            return $persistence_factory->replace(
                 $columns,
-                $this->buildValuesForGapReplace()
+                $this->buildValuesForGapReplace($persistence_factory)
             );
         }
 
         return $replace->withAdditionalValues(
-            $this->buildValuesForGapReplace()
+            $this->buildValuesForGapReplace($persistence_factory)
         );
     }
 
-    private function buildValuesForGapReplace(): array
-    {
+    private function buildValuesForGapReplace(
+        PersistenceFactory $persistence_factory
+    ): array {
         return [
-            new Value(\ilDBConstants::T_TEXT, $this->answer_option_id->toString()),
-            new Value(\ilDBConstants::T_TEXT, $this->answer_input_id->toString()),
-            new Value(\ilDBConstants::T_INTEGER, $this->position),
-            new Value(\ilDBConstants::T_TEXT, $this->text_value),
-            new Value(\ilDBConstants::T_FLOAT, $this->available_points),
-            new Value(\ilDBConstants::T_FLOAT, $this->lower_limit),
-            new Value(\ilDBConstants::T_FLOAT, $this->upper_limit)
-
+            $persistence_factory->value(
+                \ilDBConstants::T_TEXT,
+                $this->answer_option_id->toString()
+            ),
+            $persistence_factory->value(
+                \ilDBConstants::T_TEXT,
+                $this->answer_input_id->toString()
+            ),
+            $persistence_factory->value(
+                \ilDBConstants::T_INTEGER,
+                $this->position
+            ),
+            $persistence_factory->value(
+                \ilDBConstants::T_TEXT,
+                $this->text_value
+            ),
+            $persistence_factory->value(
+                \ilDBConstants::T_FLOAT,
+                $this->available_points
+            ),
+            $persistence_factory->value(
+                \ilDBConstants::T_FLOAT,
+                $this->lower_limit
+            ),
+            $persistence_factory->value(
+                \ilDBConstants::T_FLOAT,
+                $this->upper_limit
+            )
         ];
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
index 00bf3b3b704a..06efbda84b08 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
@@ -21,11 +21,10 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions;
 
 use ILIAS\Questions\Persistence\Delete;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Replace;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
-use ILIAS\Questions\Persistence\Value;
-use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Refinery\Factory as Refinery;
@@ -241,14 +240,19 @@ function (array $c, AnswerOption $v) use ($ff, $build_label): array {
     public function buildReplace(
         ?Replace $replace,
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Replace {
         return array_reduce(
             $this->answer_options,
             fn(?Replace $c, AnswerOption $v): Replace => $v->buildReplace(
+                $persistence_factory,
                 $c,
-                $persistence->getColumns($table_name_builder, TableTypes::AnswerOptions),
-                $table_name_builder
+                $persistence->getColumns(
+                    $persistence_factory,
+                    $table_name_builder,
+                    TableTypes::AnswerOptions
+                )
             ),
             $replace
         );
@@ -256,19 +260,23 @@ public function buildReplace(
 
     public function buildDelete(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Delete {
         $answer_options_table_definition = TableTypes::AnswerOptions;
 
-        return new Delete(
-            $answer_options_table_definition->getTable($table_name_builder),
+        return $persistence_factory->delete(
+            $answer_options_table_definition->getTable(
+                $persistence_factory,
+                $table_name_builder
+            ),
             [
-                new Where(
+                $persistence_factory->where(
                     $persistence->getForeignKeyColumn(
                         $table_name_builder,
                         $answer_options_table_definition
                     ),
-                    new Value(
+                    $persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         $this->answer_input_id->toString()
                     )
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
index fde7139f60e7..116107608504 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/Factory.php
@@ -80,7 +80,10 @@ public function fromDatabase(
         Query $query
     ): array {
         return $query->retrieveCurrentRecord(
-            TableTypes::AnswerOptions->getTable($query->getTableNameBuilder(Definition::class)),
+            TableTypes::AnswerOptions->getTable(
+                $query->getPersistenceFactory(),
+                $query->getTableNameBuilder(Definition::class)
+            ),
             $query->getRefinery()->custom()->transformation(
                 function (array $vs): array {
                     $previous_answer_input_id = null;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index b2b3b0cb9fab..077fc8ce9089 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -100,7 +100,10 @@ public function fromDatabase(
         $answer_options = $this->answer_options_factory->fromDatabase($query);
 
         return $query->retrieveCurrentRecord(
-            TableTypes::AnswerInputs->getTable($query->getTableNameBuilder(Definition::class)),
+            TableTypes::AnswerInputs->getTable(
+                $query->getPersistenceFactory(),
+                $query->getTableNameBuilder(Definition::class)
+            ),
             $query->getRefinery()->custom()->transformation(
                 function (array $vs) use ($answer_form_id, $answer_options): Gaps {
                     $previous_answer_input_id = null;
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index b8ab11b85caa..82e9ccc18918 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -23,10 +23,10 @@
 use ILIAS\Questions\AnswerForm\Persistence;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOptions;
 use ILIAS\Questions\Definitions\TextMatchingOptions;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Replace;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
-use ILIAS\Questions\Persistence\Value;
 use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
@@ -243,6 +243,7 @@ function (CarryWrapper $v) use ($refinery, $gaps_factory): self {
     public function buildReplace(
         ?Replace $replace,
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Replace {
         if ($this->type === null) {
@@ -254,14 +255,18 @@ public function buildReplace(
         $table_definition = TableTypes::AnswerInputs;
 
         if ($replace === null) {
-            return new Replace(
-                $persistence->getColumns($table_name_builder, $table_definition),
-                $this->buildValuesForGapReplace()
+            return $persistence_factory->replace(
+                $persistence->getColumns(
+                    $persistence_factory,
+                    $table_name_builder,
+                    $table_definition
+                ),
+                $this->buildValuesForGapReplace($persistence_factory)
             );
         }
 
         return $replace->withAdditionalValues(
-            $this->buildValuesForGapReplace()
+            $this->buildValuesForGapReplace($persistence_factory)
         );
     }
 
@@ -359,18 +364,19 @@ public function toTableRow(
         );
     }
 
-    private function buildValuesForGapReplace(): array
-    {
+    private function buildValuesForGapReplace(
+        PersistenceFactory $persistence_factory
+    ): array {
         return [
-            new Value(\ilDBConstants::T_TEXT, $this->answer_input_id->toString()),
-            new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
-            new Value(\ilDBConstants::T_INTEGER, $this->position),
-            new Value(\ilDBConstants::T_TEXT, $this->type->getIdentifier()),
-            new Value(\ilDBConstants::T_INTEGER, $this->max_chars),
-            new Value(\ilDBConstants::T_FLOAT, $this->step_size),
-            new Value(\ilDBConstants::T_INTEGER, $this->text_matching_method?->value),
-            new Value(\ilDBConstants::T_INTEGER, $this->min_autocomplete),
-            new Value(
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $this->answer_input_id->toString()),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
+            $persistence_factory->value(\ilDBConstants::T_INTEGER, $this->position),
+            $persistence_factory->value(\ilDBConstants::T_TEXT, $this->type->getIdentifier()),
+            $persistence_factory->value(\ilDBConstants::T_INTEGER, $this->max_chars),
+            $persistence_factory->value(\ilDBConstants::T_FLOAT, $this->step_size),
+            $persistence_factory->value(\ilDBConstants::T_INTEGER, $this->text_matching_method?->value),
+            $persistence_factory->value(\ilDBConstants::T_INTEGER, $this->min_autocomplete),
+            $persistence_factory->value(
                 \ilDBConstants::T_INTEGER,
                 $this->shuffle_answer_options === null
                     ? null
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 20c9305e66a0..6480a378bd31 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -21,13 +21,12 @@
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
 use ILIAS\Questions\Persistence\Delete;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Junctor;
 use ILIAS\Questions\Persistence\Manipulate;
 use ILIAS\Questions\Persistence\Operator;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
-use ILIAS\Questions\Persistence\Value;
-use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
 use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
@@ -357,11 +356,13 @@ public function toStorage(
                 'gaps' => $v->buildReplace(
                     $c['gaps'],
                     $persistence,
+                    $manipulate->getPersistenceFactory(),
                     $table_name_builder
                 ),
                 'answer_options' => $v->getAnswerOptions()->buildReplace(
                     $c['answer_options'],
                     $persistence,
+                    $manipulate->getPersistenceFactory(),
                     $table_name_builder
                 )
             ],
@@ -374,6 +375,7 @@ public function toStorage(
         return $manipulate->withAdditionalStatement(
             $this->buildDeleteForRemovedGaps(
                 $persistence,
+                $manipulate->getPersistenceFactory(),
                 $table_name_builder
             )
         )->withAdditionalStatement($replace_for_gaps)
@@ -390,12 +392,14 @@ public function toDelete(
             fn(Manipulate $c, Gap $v): Manipulate => $c->withAdditionalStatement(
                 $v->getAnswerOptions()->buildDelete(
                     $persistence,
+                    $manipulate->getPersistenceFactory(),
                     $table_name_builder
                 )
             ),
             $manipulate->withAdditionalStatement(
                 $this->buildDeleteForDeletionOfAnswerForm(
                     $persistence,
+                    $manipulate->getPersistenceFactory(),
                     $table_name_builder
                 )
             )
@@ -404,28 +408,34 @@ public function toDelete(
 
     private function buildDeleteForRemovedGaps(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Delete {
         $table_definition = TableTypes::AnswerInputs;
-        return new Delete(
-            $table_definition->getTable($table_name_builder),
+        return $persistence_factory->delete(
+            $table_definition->getTable(
+                $persistence_factory,
+                $table_name_builder
+            ),
             [
-                new Where(
+                $persistence_factory->where(
                     $persistence->getForeignKeyColumn(
+                        $persistence_factory,
                         $table_name_builder,
                         $table_definition
                     ),
-                    new Value(
+                    $persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         $this->answer_form_id->toString()
                     )
                 ),
-                new Where(
+                $persistence_factory->where(
                     $persistence->getIdColumn(
+                        $persistence_factory,
                         $table_name_builder,
                         $table_definition
                     ),
-                    new Value(
+                    $persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         array_map(
                             fn(Gap $v): string => $v->getAnswerInputId()->toString(),
@@ -442,19 +452,23 @@ private function buildDeleteForRemovedGaps(
 
     private function buildDeleteForDeletionOfAnswerForm(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Delete {
         $table_definition = TableTypes::AnswerInputs;
 
-        return new Delete(
-            $table_definition->getTable($table_name_builder),
+        return $persistence_factory->delete(
+            $table_definition->getTable(
+                $persistence_factory,
+                $table_name_builder
+            ),
             [
-                new Where(
+                $persistence_factory->where(
                     $persistence->getForeignKeyColumn(
                         $table_name_builder,
                         $table_definition
                     ),
-                    new Value(
+                    $persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         $this->answer_form_id->toString()
                     ),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index 42f0d41c5a2a..4112004e6e5a 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -32,14 +32,13 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gaps;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapsFactory;
 use ILIAS\Questions\Persistence\Delete;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\Update;
 use ILIAS\Questions\Persistence\Manipulate;
 use ILIAS\Questions\Persistence\ManipulationType;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
-use ILIAS\Questions\Persistence\Value;
-use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\Presentation\Definitions\Environment;
 use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
@@ -346,9 +345,11 @@ public function toStorage(
         $answer_form_statement = $manipulate->getManipulationType() === ManipulationType::Create
             ? $this->buildInsertAnswerFormStatement(
                 $persistence,
+                $manipulate->getPersistenceFactory(),
                 $table_name_builder
             ) : $this->buildUpdateAnswerFormStatement(
                 $persistence,
+                $manipulate->getPersistenceFactory(),
                 $table_name_builder
             );
 
@@ -381,6 +382,7 @@ public function toDelete(
             $manipulate->withAdditionalStatement(
                 $this->buildDeleteAnswerFormStatement(
                     $persistence,
+                    $manipulate->getPersistenceFactory(),
                     $table_name_builder
                 )
             ),
@@ -391,18 +393,26 @@ public function toDelete(
 
     private function buildInsertAnswerFormStatement(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Insert {
         $table_definition = TableTypes::TypeSpecificAnswerForms;
-        return new Insert(
+        return $persistence_factory->insert(
             $persistence->getColumns(
+                $persistence_factory,
                 $table_name_builder,
                 $table_definition
             ),
             [
-                new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString()),
-                new Value(\ilDBConstants::T_TEXT, $this->scoring_identical->value),
-                new Value(
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->answer_form_id->toString()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->scoring_identical->value
+                ),
+                $persistence_factory->value(
                     \ilDBConstants::T_INTEGER,
                     $this->combinations->areCombinationsEnabled() ? 1 : 0
                 )
@@ -412,30 +422,38 @@ private function buildInsertAnswerFormStatement(
 
     private function buildUpdateAnswerFormStatement(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Update {
         $table_definition = TableTypes::TypeSpecificAnswerForms;
-        return new Update(
+        return $persistence_factory->update(
             $persistence->getColumns(
+                $persistence_factory,
                 $table_name_builder,
                 $table_definition,
                 '',
                 ['answer_form_id']
             ),
             [
-                new Value(\ilDBConstants::T_TEXT, $this->scoring_identical->value),
-                new Value(
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->scoring_identical->value
+                ),
+                $persistence_factory->value(
                     \ilDBConstants::T_INTEGER,
                     $this->combinations->areCombinationsEnabled() ? 1 : 0
                 )
             ],
             [
-                new Where(
+                $persistence_factory->where(
                     $persistence->getIdColumn(
                         $table_name_builder,
                         $table_definition
                     ),
-                    new Value(\ilDBConstants::T_TEXT, $this->answer_form_id->toString())
+                    $persistence_factory->value(
+                        \ilDBConstants::T_TEXT,
+                        $this->answer_form_id->toString()
+                    )
                 )
             ]
         );
@@ -460,19 +478,23 @@ private function addReplaceCombinationsStatements(
 
     private function buildDeleteAnswerFormStatement(
         Persistence $persistence,
+        PersistenceFactory $persistence_factory,
         TableNameBuilder $table_name_builder
     ): Delete {
         $table_definition = TableTypes::TypeSpecificAnswerForms;
 
-        return new Delete(
-            $table_definition->getTable($table_name_builder),
+        return $persistence_factory->delete(
+            $table_definition->getTable(
+                $persistence_factory,
+                $table_name_builder
+            ),
             [
-                new Where(
+                $persistence_factory->where(
                     $persistence->getForeignKeyColumn(
                         $table_name_builder,
                         $table_definition
                     ),
-                    new Value(
+                    $persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         $this->answer_form_id->toString()
                     )
diff --git a/components/ILIAS/Questions/src/Persistence/CoreTables.php b/components/ILIAS/Questions/src/Persistence/CoreTables.php
index ca083a2cc89c..d181857711ce 100644
--- a/components/ILIAS/Questions/src/Persistence/CoreTables.php
+++ b/components/ILIAS/Questions/src/Persistence/CoreTables.php
@@ -70,15 +70,17 @@ enum CoreTables: string
     case Linking = 'qsts_linking';
     case MigrationsTable = 'qsts_migrations';
 
-    public function getTable(): Table
-    {
-        return new Table($this);
+    public function getTable(
+        Factory $persistence_factory
+    ): Table {
+        return $persistence_factory->table($this);
     }
 
     public function getColumns(
+        Factory $persistence_factory,
         array $columns_to_skip = []
     ): array {
-        $table = $this->getTable();
+        $table = $this->getTable($persistence_factory);
         $column_identifiers = match($this) {
             self::Questions => self::QUESTION_TABLE_COLUMNS,
             self::AnswerForms => self::ANSWER_FORM_TABLE_COLUMNS,
@@ -86,7 +88,7 @@ public function getColumns(
             self::MigrationsTable => self::MIGRATIONS_TABLE_COLUMNS
         };
         return array_map(
-            fn(string $v): Column => new Column($table, $v),
+            fn(string $v): Column => $persistence_factory->column($table, $v),
             array_values(
                 array_filter(
                     $column_identifiers,
@@ -96,41 +98,43 @@ public function getColumns(
         );
     }
 
-    public function getIdColumn(): Column
-    {
+    public function getIdColumn(
+        Factory $persistence_factory
+    ): Column {
         return match($this) {
-            self::Questions => new Column(
-                $this->getTable(),
+            self::Questions => $persistence_factory->column(
+                $this->getTable($persistence_factory),
                 self::QUESTION_TABLE_ID_COLUMN
             ),
-            self::AnswerForms => new Column(
-                $this->getTable(),
+            self::AnswerForms => $persistence_factory->column(
+                $this->getTable($persistence_factory),
                 self::ANSWER_FORM_TABLE_ID_COLUMN
             ),
-            self::Linking => new Column(
-                $this->getTable(),
+            self::Linking => $persistence_factory->column(
+                $this->getTable($persistence_factory),
                 self::LINKING_TABLE_ID_COLUMN
             ),
-            self::MigrationsTable => new Column(
-                $this->getTable(),
+            self::MigrationsTable => $persistence_factory->column(
+                $this->getTable($persistence_factory),
                 self::MIGRATIONS_TABLE_ID_COLUMN
             )
         };
     }
 
-    public function getForeignKeyColumn(): ?Column
-    {
+    public function getForeignKeyColumn(
+        Factory $persistence_factory
+    ): ?Column {
         return match($this) {
-            self::AnswerForms => new Column(
-                $this->getTable(),
+            self::AnswerForms => $persistence_factory->column(
+                $this->getTable($persistence_factory),
                 self::ANSWER_FORM_TABLE_FOREIGN_KEY_COLUMN
             ),
-            self::Linking => new Column(
-                $this->getTable(),
+            self::Linking => $persistence_factory->column(
+                $this->getTable($persistence_factory),
                 self::LINKING_TABLE_FOREIGN_KEY_COLUMN
             ),
-            self::MigrationsTable => new Column(
-                $this->getTable(),
+            self::MigrationsTable => $persistence_factory->column(
+                $this->getTable($persistence_factory),
                 self::MIGRATIONS_TABLE_FOREIGN_KEY_COLUMN
             ),
             default => null
diff --git a/components/ILIAS/Questions/src/Persistence/Factory.php b/components/ILIAS/Questions/src/Persistence/Factory.php
new file mode 100644
index 000000000000..6ba8487d645f
--- /dev/null
+++ b/components/ILIAS/Questions/src/Persistence/Factory.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Persistence;
+
+class Factory
+{
+    /**
+     * @param array<\ILIAS\Questions\Persistence\Column> $columns
+     * @param array<\ILIAS\Questions\Persistence\Value> $values
+     */
+    public function insert(
+        array $columns,
+        array $values
+    ): Insert {
+        return new Insert($columns, $values);
+    }
+
+    /**
+     * @param array<\ILIAS\Questions\Persistence\Column> $columns
+     * @param array<\ILIAS\Questions\Persistence\Value> $values
+     */
+    public function replace(
+        array $columns,
+        array $values
+    ): Replace {
+        return new Replace($columns, $values);
+    }
+
+    /**
+     * @param array<\ILIAS\Questions\Persistence\Column> $columns
+     * @param array<\ILIAS\Questions\Persistence\Value> $values
+     * @param array<\ILIAS\Questions\Persistence\Where> $where
+     */
+    public function update(
+        array $columns,
+        array $values,
+        array $where
+    ): Update {
+        return new Update($columns, $values, $where);
+    }
+
+    /**
+     * @param array<\ILIAS\Questions\Persistence\Where> $where
+     */
+    public function delete(
+        Table $table,
+        array $where
+    ): Delete {
+        return new Delete($table, $where);
+    }
+
+    public function table(
+        CoreTables|TableTypes $table_definition,
+        ?TableNameBuilder $table_name_builder = null,
+        string $table_identifier = ''
+    ): Table {
+        return new Table($table_definition, $table_name_builder, $table_identifier);
+    }
+
+    public function column(
+        Table $table,
+        string $identifier
+    ): Column {
+        return new Column($table, $identifier);
+    }
+
+    /**
+     * @param array<\ILIAS\Questions\Persistence\Column> $columns
+     */
+    public function select(
+        array $columns
+    ): Select {
+        return new Select($columns);
+    }
+
+    public function join(
+        Column $left,
+        Column $right,
+        JoinType $type = JoinType::Inner
+    ): Join {
+        return new Join($left, $right, $type);
+    }
+
+    public function where(
+        Column $left,
+        Value $right,
+        Operator $comparison = Operator::Equal,
+        Junctor $junctor = Junctor::Conjunction,
+        bool $negate = false
+    ): Where {
+        return new Where($left, $right, $comparison, $junctor, $negate);
+    }
+
+    public function order(
+        Column $column,
+        OrderDirection $direction = OrderDirection::Asc
+    ): Order {
+        return new Order($column, $direction);
+    }
+
+    public function value(
+        string $type,
+        null|string|int|float|array $value
+    ): Value {
+        return new Value($type, $value);
+    }
+}
diff --git a/components/ILIAS/Questions/src/Persistence/Join.php b/components/ILIAS/Questions/src/Persistence/Join.php
index 4e1a0446b741..6ef4e4d941fd 100644
--- a/components/ILIAS/Questions/src/Persistence/Join.php
+++ b/components/ILIAS/Questions/src/Persistence/Join.php
@@ -25,7 +25,7 @@ class Join
     public function __construct(
         private readonly Column $left,
         private readonly Column $right,
-        private readonly JoinType $type = JoinType::Inner
+        private readonly JoinType $type
     ) {
     }
 
diff --git a/components/ILIAS/Questions/src/Persistence/Manipulate.php b/components/ILIAS/Questions/src/Persistence/Manipulate.php
index baaf5340e61b..81757ebee3c8 100644
--- a/components/ILIAS/Questions/src/Persistence/Manipulate.php
+++ b/components/ILIAS/Questions/src/Persistence/Manipulate.php
@@ -29,11 +29,17 @@ class Manipulate
 
     public function __construct(
         private readonly \ilDBInterface $db,
+        private readonly Factory $persistence_factory,
         private readonly AnswerFormFactory $answer_form_factory,
         private readonly ManipulationType $type
     ) {
     }
 
+    public function getPersistenceFactory(): Factory
+    {
+        return $this->persistence_factory;
+    }
+
     public function getManipulationType(): ManipulationType
     {
         return $this->type;
diff --git a/components/ILIAS/Questions/src/Persistence/Order.php b/components/ILIAS/Questions/src/Persistence/Order.php
index f805003533ed..b7d73975448e 100644
--- a/components/ILIAS/Questions/src/Persistence/Order.php
+++ b/components/ILIAS/Questions/src/Persistence/Order.php
@@ -24,7 +24,7 @@ class Order
 {
     public function __construct(
         private readonly Column $column,
-        private readonly OrderDirection $direction = OrderDirection::Asc
+        private readonly OrderDirection $direction
     ) {
     }
 
diff --git a/components/ILIAS/Questions/src/Persistence/Query.php b/components/ILIAS/Questions/src/Persistence/Query.php
index 9588187b8a40..214dc058735e 100644
--- a/components/ILIAS/Questions/src/Persistence/Query.php
+++ b/components/ILIAS/Questions/src/Persistence/Query.php
@@ -41,47 +41,69 @@ class Query
 
     public function __construct(
         private readonly \ilDBInterface $db,
+        private readonly Factory $persistence_factory,
         private readonly AnswerFormFactory $answer_form_factory,
         private readonly Refinery $refinery
     ) {
         $questions_linking_table_definition = CoreTables::Linking;
         $questions_table_definition = CoreTables::Questions;
         $answer_form_table_definition = CoreTables::AnswerForms;
-        $questions_id_column = $questions_table_definition->getIdColumn();
+        $questions_id_column = $questions_table_definition->getIdColumn(
+            $this->persistence_factory
+        );
 
-        $this->select[] = new Select(
-            $questions_linking_table_definition->getColumns()
+        $this->select[] = $this->persistence_factory->select(
+            $questions_linking_table_definition->getColumns(
+                $this->persistence_factory
+            )
         );
 
-        $this->select[] = new Select(
-            $questions_table_definition->getColumns()
+        $this->select[] = $this->persistence_factory->select(
+            $questions_table_definition->getColumns(
+                $this->persistence_factory
+            )
         );
 
-        $this->select[] = new Select(
-            $answer_form_table_definition->getColumns()
+        $this->select[] = $this->persistence_factory->select(
+            $answer_form_table_definition->getColumns(
+                $this->persistence_factory
+            )
         );
 
-        $this->joins[] = new Join(
-            $questions_linking_table_definition->getIdColumn(),
-            $questions_table_definition->getIdColumn(),
+        $this->joins[] = $this->persistence_factory->join(
+            $questions_linking_table_definition->getIdColumn(
+                $this->persistence_factory
+            ),
+            $questions_table_definition->getIdColumn(
+                $this->persistence_factory
+            ),
             JoinType::Inner
         );
 
-        $this->joins[] = new Join(
+        $this->joins[] = $this->persistence_factory->join(
             $questions_id_column,
-            $answer_form_table_definition->getForeignKeyColumn(),
+            $answer_form_table_definition->getForeignKeyColumn(
+                $this->persistence_factory
+            ),
             JoinType::Left
         );
 
-        $this->order[] = new Order(
+        $this->order[] = $this->persistence_factory->order(
             $questions_id_column
         );
 
-        $this->order[] = new Order(
-            $answer_form_table_definition->getIdColumn()
+        $this->order[] = $this->persistence_factory->order(
+            $answer_form_table_definition->getIdColumn(
+                $this->persistence_factory
+            )
         );
     }
 
+    public function getPersistenceFactory(): Factory
+    {
+        return $this->persistence_factory;
+    }
+
     public function getPersistenceForDefinitionClass(
         string $definition_class
     ): Persistence {
@@ -148,7 +170,9 @@ public function withRange(
 
     public function loadNextRecord(): \Generator
     {
-        $alias = CoreTables::Questions->getIdColumn()->getColumnAlias();
+        $alias = CoreTables::Questions->getIdColumn(
+            $this->persistence_factory
+        )->getColumnAlias();
 
         $result = $this->toSql();
 
diff --git a/components/ILIAS/Questions/src/Persistence/Repository.php b/components/ILIAS/Questions/src/Persistence/Repository.php
index 7bea0e758777..f395ab96b436 100644
--- a/components/ILIAS/Questions/src/Persistence/Repository.php
+++ b/components/ILIAS/Questions/src/Persistence/Repository.php
@@ -36,6 +36,7 @@ public function __construct(
         private readonly \ilDBInterface $db,
         private readonly Refinery $refinery,
         private readonly UuidFactory $uuid_factory,
+        private readonly Factory $persistence_factory,
         private readonly AnswerFormFactory $answer_form_factory
     ) {
     }
@@ -56,6 +57,7 @@ public function getQuestionDataOnlyForAllQuestions(): \Generator
     {
         foreach ($query = new Query(
             $this->db,
+            $this->persistence_factory,
             $this->answer_form_factory,
             $this->refinery
         )->loadNextRecord() as $query_with_record) {
@@ -74,12 +76,15 @@ public function getQuestionDataOnlyForQuestionIds(
     ): \Generator {
         foreach ((new Query(
             $this->db,
+            $this->persistence_factory,
             $this->answer_form_factory,
             $this->refinery
         )->withAdditionalWhere(
-            new Where(
-                CoreTables::Questions->getIdColumn(),
-                new Value(
+            $this->persistence_factory->where(
+                CoreTables::Questions->getIdColumn(
+                    $this->persistence_factory
+                ),
+                $this->persistence_factory->value(
                     \ilDBConstants::T_TEXT,
                     array_map(
                         fn(Uuid $v): string => $v->toString(),
@@ -102,12 +107,15 @@ public function getForQuestionId(
         return $this->getForBaseQuery(
             (new Query(
                 $this->db,
+                $this->persistence_factory,
                 $this->answer_form_factory,
                 $this->refinery
             ))->withAdditionalWhere(
-                new Where(
-                    CoreTables::Questions->getIdColumn(),
-                    new Value(
+                $this->persistence_factory->where(
+                    CoreTables::Questions->getIdColumn(
+                        $this->persistence_factory
+                    ),
+                    $this->persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         $question_id->toString()
                     ),
@@ -129,12 +137,15 @@ public function getForQuestionIds(
         yield from $this->getForBaseQuery(
             (new Query(
                 $this->db,
+                $this->persistence_factory,
                 $this->answer_form_factory,
                 $this->refinery
             ))->withAdditionalWhere(
-                new Where(
-                    CoreTables::Questions->getIdColumn(),
-                    new Value(
+                $this->persistence_factory->where(
+                    CoreTables::Questions->getIdColumn(
+                        $this->persistence_factory
+                    ),
+                    $this->persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         array_map(
                             fn(Uuid $v): string => $v->toString(),
@@ -162,6 +173,7 @@ public function create(
             ),
             new Manipulate(
                 $this->db,
+                $this->persistence_factory,
                 $this->answer_form_factory,
                 ManipulationType::Create
             )
@@ -178,6 +190,7 @@ public function update(
             $questions,
             new Manipulate(
                 $this->db,
+                $this->persistence_factory,
                 $this->answer_form_factory,
                 ManipulationType::Update
             )
@@ -192,6 +205,7 @@ public function delete(
             fn(Manipulate $c, QuestionImplementation $v): Manipulate => $v->toDelete($c),
             new Manipulate(
                 $this->db,
+                $this->persistence_factory,
                 $this->answer_form_factory,
                 ManipulationType::Delete
             )
@@ -214,7 +228,9 @@ private function getForBaseQuery(
             $this->getAnswerFormTypesForQuestionIds($question_ids),
             fn(Query $c, AnswerFormDefinition $v) => $v->getPersistence()->completeQuery(
                 $c,
-                CoreTables::AnswerForms->getIdColumn()
+                CoreTables::AnswerForms->getIdColumn(
+                    $this->persistence_factory
+                )
             ),
             $query
         );
@@ -235,12 +251,16 @@ private function retrieveQuestionFromQuery(
         array $answer_forms
     ): QuestionImplementation {
         $linking_info = $query->retrieveCurrentRecord(
-            CoreTables::Linking->getTable(),
+            CoreTables::Linking->getTable(
+                $query->getPersistenceFactory()
+            ),
             $this->refinery->identity()
         );
 
         $question = $query->retrieveCurrentRecord(
-            CoreTables::Questions->getTable(),
+            CoreTables::Questions->getTable(
+                $query->getPersistenceFactory()
+            ),
             $this->refinery->custom()->transformation(
                 fn(array $vs): QuestionImplementation => new QuestionImplementation(
                     $this->uuid_factory->fromString($vs[0]['id']),
@@ -275,7 +295,9 @@ private function retrieveAnswerFormsFromQuery(
         Query $query
     ): array {
         return $query->retrieveCurrentRecord(
-            CoreTables::AnswerForms->getTable(),
+            CoreTables::AnswerForms->getTable(
+                $query->getPersistenceFactory()
+            ),
             $this->refinery->custom()->transformation(
                 function (array $vs) use ($query): array {
                     if (count($vs) === 1 && $vs[0]['type'] === null) {
diff --git a/components/ILIAS/Questions/src/Persistence/Table.php b/components/ILIAS/Questions/src/Persistence/Table.php
index c9ff6f5cba6e..443c8b2885bd 100644
--- a/components/ILIAS/Questions/src/Persistence/Table.php
+++ b/components/ILIAS/Questions/src/Persistence/Table.php
@@ -24,8 +24,8 @@ class Table
 {
     public function __construct(
         private readonly CoreTables|TableTypes $table_definition,
-        private readonly ?TableNameBuilder $table_name_builder = null,
-        private readonly string $table_identifier = ''
+        private readonly ?TableNameBuilder $table_name_builder,
+        private readonly string $table_identifier
     ) {
     }
 
diff --git a/components/ILIAS/Questions/src/Persistence/TableTypes.php b/components/ILIAS/Questions/src/Persistence/TableTypes.php
index a12804600aa5..7caed2f133de 100644
--- a/components/ILIAS/Questions/src/Persistence/TableTypes.php
+++ b/components/ILIAS/Questions/src/Persistence/TableTypes.php
@@ -29,16 +29,17 @@ enum TableTypes
     case Additional;
 
     public function getTable(
+        Factory $persistence_factory,
         TableNameBuilder $table_name_builder,
         string $table_identifier = ''
     ): Table {
         return match($this) {
-            self::Additional => new Table(
+            self::Additional => $persistence_factory->table(
                 $this,
                 $table_name_builder,
                 $table_identifier
             ),
-            default => new Table(
+            default => $persistence_factory->table(
                 $this,
                 $table_name_builder
             )
diff --git a/components/ILIAS/Questions/src/Persistence/Where.php b/components/ILIAS/Questions/src/Persistence/Where.php
index b57d202bdde3..c0714bb73224 100644
--- a/components/ILIAS/Questions/src/Persistence/Where.php
+++ b/components/ILIAS/Questions/src/Persistence/Where.php
@@ -25,9 +25,9 @@ class Where
     public function __construct(
         private readonly Column $left,
         private readonly Value $right,
-        private readonly Operator $comparison = Operator::Equal,
-        private readonly Junctor $junctor = Junctor::Conjunction,
-        private readonly bool $negate = false
+        private readonly Operator $comparison,
+        private readonly Junctor $junctor,
+        private readonly bool $negate
     ) {
     }
 
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index f96c9d373c73..ae5dcfc2c1f1 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -49,7 +49,6 @@
 use ILIAS\UI\Renderer as UIRenderer;
 use ILIAS\UI\Component\Item\Group as ItemGroup;
 use ILIAS\UI\Component\MainControls\Slate\Legacy as LegacySlate;
-use ILIAS\User\Settings\Settings as UserSettings;
 use ILIAS\Style\Content\Service as ContentStyle;
 use ILIAS\GlobalScreen\Services as GlobalScreen;
 
diff --git a/components/ILIAS/Questions/src/Question/QuestionImplementation.php b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
index 0532d6e491ab..72223f67f1e4 100644
--- a/components/ILIAS/Questions/src/Question/QuestionImplementation.php
+++ b/components/ILIAS/Questions/src/Question/QuestionImplementation.php
@@ -23,14 +23,12 @@
 use ILIAS\Questions\Administration\ConfigurationRepository;
 use ILIAS\Questions\AnswerForm\Properties as AnswerFormProperties;
 use ILIAS\Questions\Persistence\CoreTables;
-use ILIAS\Questions\Persistence\Column;
 use ILIAS\Questions\Persistence\Delete;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\Update;
 use ILIAS\Questions\Persistence\Manipulate;
 use ILIAS\Questions\Persistence\ManipulationType;
-use ILIAS\Questions\Persistence\Value;
-use ILIAS\Questions\Persistence\Where;
 use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
 use ILIAS\Questions\UserSettings\CreateModes;
@@ -336,11 +334,17 @@ public function toDelete(
     ): Manipulate {
         return $this->addDeleteAnswerFormsStatementsToManipulate(
             $manipulate->withAdditionalStatement(
-                $this->buildDeleteQuestionStatement()
+                $this->buildDeleteQuestionStatement(
+                    $manipulate->getPersistenceFactory()
+                )
             )->withAdditionalStatement(
-                $this->buildDeleteLinkingStatement()
+                $this->buildDeleteLinkingStatement(
+                    $manipulate->getPersistenceFactory()
+                )
             )->withAdditionalStatement(
-                $this->buildDeleteMigrationStatement()
+                $this->buildDeleteMigrationStatement(
+                    $manipulate->getPersistenceFactory()
+                )
             ),
             $this->answer_forms
         );
@@ -352,9 +356,13 @@ private function addInsertStatementsToManipulation(
         if ($this->created === null) {
             $manipulate = $manipulate
                 ->withAdditionalStatement(
-                    $this->buildInsertLinkingStatement()
+                    $this->buildInsertLinkingStatement(
+                        $manipulate->getPersistenceFactory()
+                    )
                 )->withAdditionalStatement(
-                    $this->buildInsertQuestionStatement()
+                    $this->buildInsertQuestionStatement(
+                        $manipulate->getPersistenceFactory()
+                    )
                 );
         }
 
@@ -387,13 +395,17 @@ private function addUpdateStatementsToManipulation(
 
         if ($this->self_updated) {
             $manipulate = $manipulate->withAdditionalStatement(
-                $this->buildUpdateQuestionStatement()
+                $this->buildUpdateQuestionStatement(
+                    $manipulate->getPersistenceFactory()
+                )
             );
         }
 
         if ($this->page_id) {
             $manipulate = $manipulate->withAdditionalStatement(
-                $this->buildUpdatePageIdStatement()
+                $this->buildUpdatePageIdStatement(
+                    $manipulate->getPersistenceFactory()
+                )
             );
         }
 
@@ -438,91 +450,176 @@ private function addDeleteAnswerFormsStatementsToManipulate(
 
 
 
-    private function buildInsertLinkingStatement(): Insert
-    {
-        return new Insert(
-            CoreTables::Linking->getColumns(),
+    private function buildInsertLinkingStatement(
+        PersistenceFactory $persistence_factory
+    ): Insert {
+        return $persistence_factory->insert(
+            CoreTables::Linking->getColumns(
+                $persistence_factory
+            ),
             [
-                new Value(\ilDBConstants::T_TEXT, $this->id->toString()),
-                new Value(\ilDBConstants::T_INTEGER, $this->parent_obj_id),
-                new Value(\ilDBConstants::T_INTEGER, $this->position)
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->id->toString()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->parent_obj_id
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->position
+                )
             ]
         );
     }
 
-    private function buildInsertQuestionStatement(): Insert
-    {
-        return new Insert(
-            CoreTables::Questions->getColumns(),
+    private function buildInsertQuestionStatement(
+        PersistenceFactory $persistence_factory
+    ): Insert {
+        return $persistence_factory->insert(
+            CoreTables::Questions->getColumns(
+                $persistence_factory
+            ),
             [
-                new Value(\ilDBConstants::T_TEXT, $this->id->toString()),
-                new Value(\ilDBConstants::T_INTEGER, $this->page_id),
-                new Value(\ilDBConstants::T_TEXT, $this->title),
-                new Value(\ilDBConstants::T_TEXT, $this->author),
-                new Value(\ilDBConstants::T_TEXT, $this->lifecycle->value),
-                new Value(\ilDBConstants::T_TEXT, $this->remarks),
-                new Value(\ilDBConstants::T_TEXT, $this->original_id?->toString()),
-                new Value(\ilDBConstants::T_INTEGER, time()),
-                new Value(\ilDBConstants::T_INTEGER, time())
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->id->toString()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->page_id
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->title
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->author
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->lifecycle->value
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->remarks
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->original_id?->toString()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    time()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    time()
+                )
             ]
         );
     }
 
-    private function buildUpdateLinkingStatement(): Update
-    {
+    private function buildUpdateLinkingStatement(
+        PersistenceFactory $persistence_factory
+    ): Update {
         $linking_table_definition = CoreTables::Linking;
-        return new Update(
+        return $persistence_factory->update(
             $linking_table_definition->getColumns(
+                $persistence_factory,
                 [CoreTables::LINKING_TABLE_ID_COLUMN]
             ),
             [
-                new Value(\ilDBConstants::T_INTEGER, $this->parent_obj_id),
-                new Value(\ilDBConstants::T_INTEGER, $this->position)
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->parent_obj_id
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $this->position
+                )
             ],
             [
-                new Where(
-                    $linking_table_definition->getIdColumn(),
-                    new Value(\ilDBConstants::T_TEXT, $this->id->toString())
+                $persistence_factory->where(
+                    $linking_table_definition->getIdColumn(
+                        $persistence_factory
+                    ),
+                    $persistence_factory->value(
+                        \ilDBConstants::T_TEXT,
+                        $this->id->toString()
+                    )
                 )
             ]
         );
     }
 
-    private function buildUpdateQuestionStatement(): Update
-    {
+    private function buildUpdateQuestionStatement(
+        PersistenceFactory $persistence_factory
+    ): Update {
         $questions_table_definition = CoreTables::Questions;
-        return new Update(
-            $questions_table_definition->getColumns([
-                CoreTables::ANSWER_FORM_TABLE_ID_COLUMN,
-                'page_id',
-                'created'
-            ]),
+        return $persistence_factory->update(
+            $questions_table_definition->getColumns(
+                $persistence_factory,
+                [
+                    CoreTables::ANSWER_FORM_TABLE_ID_COLUMN,
+                    'page_id',
+                    'created'
+                ]
+            ),
             [
-                new Value(\ilDBConstants::T_TEXT, $this->title),
-                new Value(\ilDBConstants::T_TEXT, $this->author),
-                new Value(\ilDBConstants::T_TEXT, $this->lifecycle->value),
-                new Value(\ilDBConstants::T_TEXT, $this->remarks),
-                new Value(\ilDBConstants::T_TEXT, $this->original_id?->toString()),
-                new Value(\ilDBConstants::T_INTEGER, time())
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->title
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->author
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->lifecycle->value
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->remarks
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->original_id?->toString()
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    time()
+                )
             ],
             [
-                new Where(
-                    $questions_table_definition->getIdColumn(),
-                    new Value(\ilDBConstants::T_TEXT, $this->id->toString())
+                $persistence_factory->where(
+                    $questions_table_definition->getIdColumn(
+                        $persistence_factory
+                    ),
+                    $persistence_factory->value(
+                        \ilDBConstants::T_TEXT,
+                        $this->id->toString()
+                    )
                 )
             ]
         );
     }
 
-    private function buildDeleteQuestionStatement(): Delete
-    {
+    private function buildDeleteQuestionStatement(
+        PersistenceFactory $persistence_factory
+    ): Delete {
         $table_definition = CoreTables::Questions;
-        return new Delete(
-            $table_definition->getTable(),
+        return $persistence_factory->delete(
+            $table_definition->getTable($persistence_factory),
             [
-                new Where(
-                    $table_definition->getIdColumn(),
-                    new Value(
+                $persistence_factory->where(
+                    $table_definition->getIdColumn(
+                        $persistence_factory
+                    ),
+                    $persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         $this->id->toString()
                     )
@@ -531,15 +628,18 @@ private function buildDeleteQuestionStatement(): Delete
         );
     }
 
-    private function buildDeleteLinkingStatement(): Delete
-    {
+    private function buildDeleteLinkingStatement(
+        PersistenceFactory $persistence_factory
+    ): Delete {
         $table_definition = CoreTables::Linking;
-        return new Delete(
-            $table_definition->getTable(),
+        return $persistence_factory->delete(
+            $table_definition->getTable($persistence_factory),
             [
-                new Where(
-                    $table_definition->getIdColumn(),
-                    new Value(
+                $persistence_factory->where(
+                    $table_definition->getIdColumn(
+                        $persistence_factory
+                    ),
+                    $persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         $this->id->toString()
                     )
@@ -549,18 +649,21 @@ private function buildDeleteLinkingStatement(): Delete
     }
 
     /**
-     * skergomard, 2026-01-86: This we only need while the migrations exist, after
+     * @todo skergomard, 2026-01-86: This we only need while the migrations exist, after
      * this MUST go!
      */
-    private function buildDeleteMigrationStatement(): Delete
-    {
+    private function buildDeleteMigrationStatement(
+        PersistenceFactory $persistence_factory
+    ): Delete {
         $table_definition = CoreTables::MigrationsTable;
-        return new Delete(
-            $table_definition->getTable(),
+        return $persistence_factory->delete(
+            $table_definition->getTable($persistence_factory),
             [
-                new Where(
-                    $table_definition->getIdColumn(),
-                    new Value(
+                $persistence_factory->where(
+                    $table_definition->getIdColumn(
+                        $persistence_factory
+                    ),
+                    $persistence_factory->value(
                         \ilDBConstants::T_TEXT,
                         $this->id->toString()
                     )
@@ -570,31 +673,43 @@ private function buildDeleteMigrationStatement(): Delete
     }
 
     /**
-     * skergomard, 2026-01-26: This we only need while the migrations exist, after
+     * @todo skergomard, 2026-01-26: This we only need while the migrations exist, after
      * this a question MUST never change the page assigned to it after its creation!
      */
-    private function buildUpdatePageIdStatement(): Update
-    {
+    private function buildUpdatePageIdStatement(
+        PersistenceFactory $persistence_factory
+    ): Update {
         $questions_table_definition = CoreTables::Questions;
-        return new Update(
+        return $persistence_factory->update(
             [
-                new Column(
-                    $questions_table_definition->getTable(),
+                $persistence_factory->column(
+                    $questions_table_definition->getTable($persistence_factory),
                     'page_id'
                 ),
-                new Column(
-                    $questions_table_definition->getTable(),
+                $persistence_factory->column(
+                    $questions_table_definition->getTable($persistence_factory),
                     'last_update'
                 )
             ],
             [
-                new Value(\ilDBConstants::T_TEXT, $this->page_id),
-                new Value(\ilDBConstants::T_INTEGER, time())
+                $persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $this->page_id
+                ),
+                $persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    time()
+                )
             ],
             [
-                new Where(
-                    $questions_table_definition->getIdColumn(),
-                    new Value(\ilDBConstants::T_TEXT, $this->id->toString())
+                $persistence_factory->where(
+                    $questions_table_definition->getIdColumn(
+                        $persistence_factory
+                    ),
+                    $persistence_factory->value(
+                        \ilDBConstants::T_TEXT,
+                        $this->id->toString()
+                    )
                 )
             ]
         );
diff --git a/components/ILIAS/Questions/src/Setup/Agent.php b/components/ILIAS/Questions/src/Setup/Agent.php
index a8708db82f2e..19f96fb48107 100644
--- a/components/ILIAS/Questions/src/Setup/Agent.php
+++ b/components/ILIAS/Questions/src/Setup/Agent.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\Setup;
 
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableNameSpaceCore;
 use ILIAS\Refinery\Transformation;
@@ -36,6 +37,7 @@ class Agent implements SetupAgent
     use HasNoNamedObjective;
 
     public function __construct(
+        private readonly PersistenceFactory $persistence_factory,
         private readonly array $answer_form_migrations
     ) {
     }
@@ -101,6 +103,7 @@ public function getMigrations(): array
     {
         return [
             new QuestionsMigration(
+                $this->persistence_factory,
                 $this->answer_form_migrations
             )
         ];
diff --git a/components/ILIAS/Questions/src/Setup/QuestionsMigration.php b/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
index a02fcb248534..6f9e9a9265ee 100644
--- a/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
+++ b/components/ILIAS/Questions/src/Setup/QuestionsMigration.php
@@ -24,9 +24,9 @@
 use ILIAS\Questions\AnswerForm\Migration\MigrationInsert as AnswerFormMigrationInsert;
 use ILIAS\Questions\Persistence\CoreTables;
 use ILIAS\Questions\Question\Definitions\Lifecycle;
+use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Insert;
 use ILIAS\Questions\Persistence\TableNameBuilder;
-use ILIAS\Questions\Persistence\Value;
 use ILIAS\Data\UUID\Factory as UuidFactory;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Setup;
@@ -50,6 +50,7 @@ class QuestionsMigration implements Migration
     private ?array $allready_migrated_questions_in_qpls = null;
 
     public function __construct(
+        private readonly PersistenceFactory $persistence_factory,
         array $answer_form_migrations
     ) {
         $this->answer_form_migrations = array_reduce(
@@ -295,12 +296,23 @@ private function buildInsertLinkingStatement(
         int $obj_id,
         ?int $position
     ): Insert {
-        return new Insert(
-            CoreTables::Linking->getColumns(),
+        return $this->persistence_factory->insert(
+            CoreTables::Linking->getColumns(
+                $this->persistence_factory
+            ),
             [
-                new Value(\ilDBConstants::T_TEXT, $new_question_id->toString()),
-                new Value(\ilDBConstants::T_INTEGER, $obj_id),
-                new Value(\ilDBConstants::T_INTEGER, $position)
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $new_question_id->toString()
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $obj_id
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $position
+                )
             ]
         );
     }
@@ -314,18 +326,47 @@ private function buildInsertQuestionStatement(
         ?Uuid $original_id,
         int $create_date
     ): Insert {
-        return new Insert(
-            CoreTables::Questions->getColumns(),
+        return $this->persistence_factory->insert(
+            CoreTables::Questions->getColumns(
+                $this->persistence_factory
+            ),
             [
-                new Value(\ilDBConstants::T_TEXT, $id->toString()),
-                new Value(\ilDBConstants::T_INTEGER, 0),
-                new Value(\ilDBConstants::T_TEXT, $title),
-                new Value(\ilDBConstants::T_TEXT, $author),
-                new Value(\ilDBConstants::T_TEXT, $lifecycle->value),
-                new Value(\ilDBConstants::T_TEXT, $remarks),
-                new Value(\ilDBConstants::T_TEXT, $original_id?->toString()),
-                new Value(\ilDBConstants::T_INTEGER, time()),
-                new Value(\ilDBConstants::T_INTEGER, $create_date)
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $id->toString()
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    0
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $title
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $author
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $lifecycle->value
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $remarks
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $original_id?->toString()
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    time()
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $create_date
+                )
             ]
         );
     }
@@ -334,12 +375,20 @@ private function buildInsertMigrationStatement(
         int $old_question_id,
         ?Uuid $new_question_id
     ): Insert {
-        return new Insert(
-            CoreTables::MigrationsTable->getColumns(),
+        return $this->persistence_factory->insert(
+            CoreTables::MigrationsTable->getColumns(
+                $this->persistence_factory
+            ),
             [
-                new Value(\ilDBConstants::T_INTEGER, $old_question_id),
-                new Value(\ilDBConstants::T_TEXT, $new_question_id?->toString()),
-                new Value(
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_INTEGER,
+                    $old_question_id
+                ),
+                $this->persistence_factory->value(
+                    \ilDBConstants::T_TEXT,
+                    $new_question_id?->toString()
+                ),
+                $this->persistence_factory->value(
                     \ilDBConstants::T_INTEGER,
                     $new_question_id === null
                         ? '0'
@@ -359,6 +408,7 @@ private function buildMigrationInsert(
             $this->db,
             $this->io,
             $this->uuid_factory,
+            $this->persistence_factory,
             new TableNameBuilder(
                 $answer_form_migration->getTableNameSpace()
             ),

From 9b64c5b149d8a1605d4e4f520671c252719ab1b4 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Tue, 10 Feb 2026 12:10:11 +0100
Subject: [PATCH 128/141] Questions: Move to New Mechanism For Carry

---
 .../Cloze/Layout/CombinationsOverview.php     | 50 ++++++++------
 .../Cloze/Layout/OverviewTable.php            | 11 +++-
 .../Cloze/Properties/Combinations/Factory.php | 52 +++++----------
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 32 ++++-----
 .../Presentation/Definitions/Environment.php  |  8 +--
 .../Definitions/EnvironmentImplementation.php | 20 +++---
 .../src/Presentation/Layout/EditForm.php      | 65 +++++++++----------
 .../src/Presentation/Layout/Factory.php       | 13 ++--
 .../src/Presentation/Layout/InputsBuilder.php | 39 ++++++-----
 .../Questions/src/Presentation/Views/Edit.php |  6 +-
 .../Questions/src/Question/Views/Edit.php     | 26 ++++----
 11 files changed, 157 insertions(+), 165 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
index 14c4240512c6..e509f2007f27 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
@@ -147,12 +147,16 @@ private function getActions(): array
         return [
             $af->single(
                 $this->lng->txt('edit'),
-                $this->environment->getUrlBuilderWithStepParameter(self::STEP_JUMP_TO_SET_COMBINATION_VALUES),
+                $this->environment
+                    ->withStepParameter(self::STEP_JUMP_TO_SET_COMBINATION_VALUES)
+                    ->getUrlBuilder(),
                 $this->environment->getTableRowIdToken()
             )->withAsync(true),
             $af->single(
                 $this->lng->txt('delete'),
-                $this->environment->getUrlBuilderWithStepParameter(self::STEP_CONFIRM_DELETE_COMBINATION),
+                $this->environment
+                ->withStepParameter(self::STEP_CONFIRM_DELETE_COMBINATION)
+                ->getUrlBuilder(),
                 $this->environment->getTableRowIdToken()
             )->withAsync(true)
         ];
@@ -217,7 +221,8 @@ private function buildSetCombinationGapsModal(): RoundTripModal
                 )
             ],
             $this->environment
-                ->getUrlBuilderWithStepParameter(self::STEP_SET_COMBINATION_VALUES)
+                ->withStepParameter(self::STEP_SET_COMBINATION_VALUES)
+                ->getUrlBuilder()
                 ->buildURI()
                 ->__toString()
         )->withSubmitLabel($this->lng->txt('next'));
@@ -265,7 +270,8 @@ private function buildSetCombinationValuesModal(
             ],
             $inputs_builder->addCarryToEnvironment(
                 $this->environment
-            )->getUrlBuilderWithStepParameter(self::STEP_SAVE)
+            )->withStepParameter(self::STEP_SAVE)
+            ->getUrlBuilder()
             ->buildURI()
             ->__toString()
         );
@@ -291,9 +297,10 @@ private function confirmDeleteCombination(
         return $this->ui_factory->modal()->interruptive(
             $this->lng->txt('confirm'),
             $this->lng->txt('delete_combination'),
-            $this->environment->getUrlBuilderWithStepParameter(
+            $this->environment->withStepParameter(
                 self::STEP_DELETE_COMBINATION
-            )->withParameter(
+            )->getUrlBuilder()
+            ->withParameter(
                 $this->environment->getTableRowIdToken(),
                 [$affected_item->getId()->toString()]
             )->buildURI()->__toString()
@@ -320,20 +327,25 @@ private function deleteCombination(): Properties
     private function buildInputsBuilder(
         ?Combination $combination,
     ): InputsBuilder {
-        $properties = $this->environment->getAnswerFormProperties();
         $inputs_builder = $this->environment->getPresentationFactory()->getInputsBuilder(
-            $this->combinations_factory->getToCombinationTransformation(
-                $this->ui_factory->input()->field(),
-                $this->refinery,
-                $this->lng,
-                $properties
-            ),
-            $combination?->buildPointsInputs(
-                $this->ui_factory->input()->field(),
-                $this->refinery,
-                $this->lng,
-                $this->combinations_factory,
-                $properties
+            $this->refinery->custom()->transformation(
+                function (?string $v) use ($combination): ?Group {
+                    $properties = $this->environment->getAnswerFormProperties();
+                    if ($combination === null) {
+                        $combination = $this->combinations_factory
+                            ->buildCombinationFromCarryValue(
+                                $v,
+                                $properties
+                            );
+                    }
+
+                    return $combination?->buildPointsInputs(
+                        $this->ui_factory->input()->field(),
+                        $this->refinery,
+                        $this->lng,
+                        $properties
+                    );
+                }
             )
         );
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
index 039947f97b54..b64fa3ec6779 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
@@ -91,17 +91,22 @@ private function getActions(): array
         return [
             'edit_gaps' => $this->table_factory->action()->standard(
                 $this->lng->txt('edit_gaps'),
-                $this->environment->getUrlBuilderWithStepParameter(Edit::STEP_JUMP_TO_SET_GAP_TYPES),
+                $this->environment
+                    ->withStepParameter(Edit::STEP_JUMP_TO_SET_GAP_TYPES)
+                    ->getUrlBuilder(),
                 $this->environment->getTableRowIdToken()
             ),
             'edit_answer_options' => $this->table_factory->action()->standard(
                 $this->lng->txt('edit_answer_options'),
-                $this->environment->getUrlBuilderWithStepParameter(Edit::STEP_JUMP_TO_SET_ANSWER_OPTIONS),
+                $this->environment
+                    ->withStepParameter(Edit::STEP_JUMP_TO_SET_ANSWER_OPTIONS),
                 $this->environment->getTableRowIdToken()
             ),
             'edit_points' => $this->table_factory->action()->standard(
                 $this->lng->txt('edit_available_points'),
-                $this->environment->getUrlBuilderWithStepParameter(Edit::STEP_JUMP_TO_SET_POINTS),
+                $this->environment
+                    ->withStepParameter(Edit::STEP_JUMP_TO_SET_POINTS)
+                    ->getUrlBuilder(),
                 $this->environment->getTableRowIdToken()
             )
         ];
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
index 9add58b34293..5eba4b2ba5e5 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Factory.php
@@ -143,43 +143,27 @@ function (array $c, string $v) use (
         );
     }
 
-    public function getToCombinationTransformation(
-        FieldFactory $field_factory,
-        Refinery $refinery,
-        Language $lng,
+    public function buildCombinationFromCarryValue(
+        string $carry,
         Properties $properties
-    ): CustomTransformation {
-        return $refinery->custom()->transformation(
-            function (string $v) use (
-                $field_factory,
-                $refinery,
-                $lng,
-                $properties
-            ): Group {
-                $values_array = json_decode($v, true);
-                $combination_id = $this->uuid_factory->fromString(
-                    array_key_first($values_array)
-                );
-                return new Combination(
+    ): Combination {
+        $values_array = json_decode($carry, true);
+        $combination_id = $this->uuid_factory->fromString(
+            array_key_first($values_array)
+        );
+
+        return new Combination(
+            $combination_id,
+            null,
+            array_map(
+                fn(string $v): MatchingValue => new MatchingValue(
                     $combination_id,
-                    null,
-                    array_map(
-                        fn(string $v): MatchingValue => new MatchingValue(
-                            $combination_id,
-                            $properties->getGaps()->getGapById(
-                                $this->uuid_factory->fromString($v)
-                            )
-                        ),
-                        $values_array[$combination_id->toString()]
+                    $properties->getGaps()->getGapById(
+                        $this->uuid_factory->fromString($v)
                     )
-                )->buildPointsInputs(
-                    $field_factory,
-                    $refinery,
-                    $lng,
-                    $this,
-                    $properties
-                );
-            }
+                ),
+                $values_array[$combination_id->toString()]
+            )
         );
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 5bbd49213efc..b4a7617b0e99 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -96,7 +96,8 @@ public function edit(
         if ($step === '') {
             return $environment->getPresentationFactory()->getEditOverview(
                 $environment,
-                $environment->getUrlBuilderWithStepParameter(self::STEP_EDIT_BASIC_PROPERTIES)
+                $environment->withStepParameter(self::STEP_EDIT_BASIC_PROPERTIES)
+                    ->getUrlBuilder()
                     ->buildURI()
             );
         }
@@ -190,9 +191,7 @@ private function buildBasicEditingForm(
         $answer_form_properties = $environment->getAnswerFormProperties();
 
         $editing_form = $environment->getPresentationFactory()->getEditForm(
-            $environment
-                ->getUrlBuilderWithStepParameter(self::STEP_SET_GAP_TYPES)
-                ->buildURI(),
+            $environment->withStepParameter(self::STEP_SET_GAP_TYPES),
             $answer_form_properties->buildBasicEditingInputs(
                 $this->lng,
                 $this->ui_factory->input()->field(),
@@ -208,9 +207,10 @@ private function buildBasicEditingForm(
             && $answer_form_properties->getLegacyClozeText() !== ''
             && $answer_form_properties->getClozeText()->getRawRepresentationForPersistence() === '') {
             return $editing_form->withInsertLegacyTextsButton(
-                $environment->getUrlBuilderWithStepParameter(
+                $environment->withStepParameter(
                     self::STEP_ADD_LEGACY_TEXT_BASIC_PROPERTIES
-                )->buildURI()
+                )->getUrlBuilder()
+                ->buildURI()
             );
         }
 
@@ -269,9 +269,7 @@ private function buildGapTypesForm(
         $properties = $environment->getAnswerFormProperties();
         $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
-            $environment
-                ->getUrlBuilderWithStepParameter(self::STEP_SET_ANSWER_OPTIONS)
-                ->buildURI(),
+            $environment->withStepParameter(self::STEP_SET_ANSWER_OPTIONS),
             $properties->getGaps()->buildGapsTypeInputs(
                 $this->lng,
                 $ff,
@@ -279,9 +277,7 @@ private function buildGapTypesForm(
                 $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng),
                 $environment->getTableRowIds()
             ),
-            false,
-            $properties->withClozeText($properties->getClozeText())
-                ->buildCarryInputs($ff)
+            false
         )->withContentBeforeForm(
             $properties->getClozeText()->buildPanelForEditing(
                 $this->ui_factory,
@@ -315,9 +311,7 @@ private function buildAnswerOptionsForm(
         $properties = $environment->getAnswerFormProperties();
         $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
-            $environment
-                ->getUrlBuilderWithStepParameter(self::STEP_SET_POINTS)
-                ->buildURI(),
+            $environment->withStepParameter(self::STEP_SET_POINTS),
             $properties->getGaps()->buildAnswerOptionsInputs(
                 $this->lng,
                 $ff,
@@ -359,9 +353,7 @@ private function buildAssignPointsForm(
         $properties = $environment->getAnswerFormProperties();
         $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
-            $environment
-                ->getUrlBuilderWithStepParameter(self::STEP_SAVE)
-                ->buildURI(),
+            $environment->withStepParameter(self::STEP_SAVE),
             $properties->getGaps()->buildPointInputs(
                 $this->lng,
                 $ff,
@@ -410,9 +402,9 @@ private function buildRemovedGapsConfirmation(
         return $this->ui_factory->modal()->interruptive(
             $this->lng->txt('confirm'),
             $this->lng->txt('confirm_remove_gaps'),
-            $environment->getUrlBuilderWithStepParameter(
+            $environment->withStepParameter(
                 self::STEP_CONFIRMED_GAP_REMOVAL
-            )->buildURI()->__toString()
+            )->getUrlBuilder()->buildURI()->__toString()
         )->withAffectedItems(
             array_map(
                 fn(Gap $v): InterruptiveItem => $this->ui_factory->modal()
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php b/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
index 0ef27b1057ce..900612a6949a 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
@@ -42,10 +42,6 @@ public function getPresentationFactory(): Factory;
 
     public function getUrlBuilder(): URLBuilder;
 
-    public function getUrlBuilderWithStepParameter(
-        string $step
-    ): URLBuilder;
-
     public function getTableRowIdToken(): URLBuilderToken;
 
     public function getTableRowIds(): array;
@@ -62,5 +58,9 @@ public function withAnswerFormProperties(
         Properties $properties
     ): self;
 
+    public function withStepParameter(
+        string $step
+    ): self;
+
     public function withPreservedTableRowIdsParameter(): self;
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
index acb7da1230ca..d33ec5be9737 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
@@ -96,11 +96,10 @@ public function addEditAnswerFormSubTab(
         $this->tabs_gui->addSubTab(
             $step,
             $this->lng->txt($language_variable),
-            $this->getUrlBuilderWithStepParameter($step)
-                ->withParameter(
-                    $this->action_token,
-                    Edit::CMD_OTHER_ANSWER_FORM
-                )->buildURI()
+            $this->withStepParameter($step)
+                ->withActionParameter(Edit::ACTION_OTHER_ANSWER_FORM)
+                ->getUrlBuilder()
+                ->buildURI()
                 ->__toString()
         );
     }
@@ -125,10 +124,13 @@ public function getUrlBuilder(): URLBuilder
     }
 
     #[\Override]
-    public function getUrlBuilderWithStepParameter(
+    public function withStepParameter(
         string $step
-    ): URLBuilder {
-        return $this->getUrlBuilder()->withParameter($this->step_token, $step);
+    ): self {
+        $clone = clone $this;
+        $clone->url_builder = $this->url_builder
+            ->withParameter($this->step_token, $step);
+        return $clone;
     }
 
     #[\Override]
@@ -344,7 +346,7 @@ public function getTypeClassHash(): string
 
     public function getCarry(
         Transformation $to_form_transformation
-    ): Input|array|string|null {
+    ): Input|array|null {
         [, $carry_token] = $this->url_builder->acquireParameter(
             self::QUERY_PARAMETER_NAME_SPACE,
             self::TOKEN_STRING_CARRY_ID
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
index acf632d20f97..0b718c1d13cf 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
@@ -20,13 +20,12 @@
 
 namespace ILIAS\Questions\Presentation\Layout;
 
+use ILIAS\Questions\Presentation\Definitions\Environment;
 use ILIAS\Data\URI;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Component\MessageBox\MessageBox;
 use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
-use ILIAS\UI\Component\Input\Field\Section;
-use ILIAS\UI\Component\Input\Field\Group;
 use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\UI\Renderer as UIRenderer;
@@ -35,7 +34,6 @@
 class EditForm implements Renderable
 {
     private const string MAIN_SECTION_NAME = 'form';
-    public const string CARRY_SECTION_NAME = 'carry';
 
     private StandardForm $form;
 
@@ -47,12 +45,22 @@ class EditForm implements Renderable
     public function __construct(
         private readonly UIFactory $ui_factory,
         private readonly Language $lng,
-        private readonly URI $form_target_uri,
-        private readonly Section $main_section_inputs,
-        private readonly bool $is_final_step,
-        private readonly ?Group $carry_inputs
+        Environment $environment,
+        InputsBuilder $inputs_builder,
+        bool $is_final_step
     ) {
-        $this->form = $this->buildForm();
+        $this->form = $this->buildForm(
+            $environment,
+            $inputs_builder,
+            $is_final_step
+        );
+    }
+
+    #[\Override]
+    public function render(
+        UIRenderer $ui_renderer
+    ): string {
+        return $ui_renderer->render($this->buildContent());
     }
 
     public function withContentBeforeForm(
@@ -94,12 +102,6 @@ public function withInsertLegacyTextsButton(
         return $clone;
     }
 
-    public function render(
-        UIRenderer $ui_renderer
-    ): string {
-        return $ui_renderer->render($this->buildContent());
-    }
-
     public function withRequest(
         ServerRequestInterface $request
     ): self {
@@ -149,31 +151,28 @@ function ($id) {
         return $content;
     }
 
-    private function buildForm(): StandardForm
-    {
+    private function buildForm(
+        Environment $environment,
+        InputsBuilder $inputs_builder,
+        bool $is_final_step
+    ): StandardForm {
         $form = $this->ui_factory->input()->container()->form()->standard(
-            $this->form_target_uri->__toString(),
-            $this->buildFormInputs()
+            $inputs_builder
+                ->addCarryToEnvironment($environment)
+                ->getUrlBuilder()
+                ->buildURI()
+                ->__toString(),
+            [
+                self::MAIN_SECTION_NAME => $inputs_builder->getInputs(
+                    $environment
+                )
+            ]
         );
 
-        if ($this->is_final_step) {
+        if ($is_final_step) {
             return $form->withSubmitLabel($this->lng->txt('save'));
         }
 
         return $form->withSubmitLabel($this->lng->txt('next'));
     }
-
-    private function buildFormInputs(): array
-    {
-        $form_inputs = [
-            self::MAIN_SECTION_NAME => $this->main_section_inputs
-        ];
-
-        if ($this->carry_inputs !== null) {
-            $form_inputs[self::CARRY_SECTION_NAME] = $this->carry_inputs
-                ->withDedicatedName(self::CARRY_SECTION_NAME);
-        }
-
-        return $form_inputs;
-    }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
index 8dc459e4caef..cbabfcb51db3 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
@@ -30,7 +30,6 @@
 use ILIAS\Refinery\Custom\Transformation as CustomTransformation;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\URLBuilder;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\Group;
 use ILIAS\UI\Component\Input\Input;
@@ -62,11 +61,11 @@ public function getEditOverview(
     }
 
     /**
-     * @param URLBuilder $url_builder The url_builder MUST have the step set,
+     * @param Environment $environment The environment MUST have the step set,
      * to which the form shall be sent.
      */
     public function getEditForm(
-        URI $form_target_uri,
+        Environment $environment,
         Section $main_section_inputs,
         bool $is_final_step,
         ?Group $carry_inputs = null
@@ -74,7 +73,7 @@ public function getEditForm(
         return new EditForm(
             $this->ui_factory,
             $this->lng,
-            $form_target_uri,
+            $environment,
             $main_section_inputs,
             $is_final_step,
             $carry_inputs
@@ -98,13 +97,11 @@ public function getAsync(
      * carry is present and you want to use them directly.
      */
     public function getInputsBuilder(
-        CustomTransformation $to_inputs,
-        Input|array|null $inputs = null
+        CustomTransformation $to_inputs
     ): InputsBuilder {
         return new InputsBuilder(
             $this->refinery,
-            $to_inputs,
-            $inputs
+            $to_inputs
         );
     }
 
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php b/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php
index 6089cf295a80..3d11c950b940 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php
@@ -36,17 +36,21 @@ class InputsBuilder
 {
     private ?string $carry = null;
 
+    /**
+     * @param CustomTransformation $to_inputs This Transformation receives the
+     * value set by `self::withCarry()` if it is available, otherwise the value
+     * will be null.
+     */
     public function __construct(
         private readonly Refinery $refinery,
-        private readonly CustomTransformation $to_inputs,
-        private Input|array|null $inputs
+        private readonly CustomTransformation $to_inputs
     ) {
     }
 
     /**
      * @param string $carry The `string` will be `base64-encoded` before
-     * adding it to the `Query`. The string whill be passed to the `$to_inputs`
-     * to allow the recreation of the inputs.
+     * adding it to the `Query`. The string will be passed to the `$to_inputs`
+     * transformation to allow the recreation of the inputs.
      */
     public function withCarry(
         string $carry
@@ -66,23 +70,22 @@ public function addCarryToEnvironment(
         );
     }
 
+    /**
+     * @return \ILIAS\UI\Component\Input\Input|array|null The return value will
+     * be null, if no inputs could be built. This is a sign that something is
+     * wrong with carry. This might mean that there is a mistake in the carry
+     * that was set, but it can also be the consequence of somebody messing
+     * with the query.
+     */
     public function getInputs(
         EnvironmentImplementation $environment
-    ): Input|array {
-        if ($this->inputs === null) {
-            $this->buildInputs($environment);
-        }
-
-        return $this->inputs;
-    }
-
-    private function buildInputs(
-        EnvironmentImplementation $environment
-    ): void {
-        $this->inputs = $environment->getCarry(
+    ): Input|array|null {
+        return $environment->getCarry(
             $this->refinery->custom()->transformation(
-                fn(string $v): Input|array => $this->to_inputs->transform(
-                    base64_decode($v)
+                fn(?string $v): Input|array|null => $this->to_inputs->transform(
+                    $v === null
+                        ? null
+                        : base64_decode($v)
                 )
             )
         );
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index ae5dcfc2c1f1..2aa339784cae 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -353,9 +353,9 @@ private function deleteQuestions(
                 $this->lng->txt('qpl_confirm_delete_questions'),
                 $environment->withActionParameter(
                     self::ACTION_DELETE_QUESTIONS
-                )->getUrlBuilderWithStepParameter(
+                )->withStepParameter(
                     self::ACTION_DELETE_QUESTIONS
-                )->buildURI()->__toString()
+                )->getUrlBuilder()->buildURI()->__toString()
             )->withAffectedItems(
                 $this->buildAffectedItems($question_ids)
             )
@@ -545,7 +545,7 @@ private function buildCreateAnswerForm(
         }
 
         return $environment->getPresentationFactory()->getEditForm(
-            $environment->getUrlBuilder()->buildURI(),
+            $environment,
             $if->field()->section(
                 $inputs + [
                     'type' => $if->field()->select(
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index 066579e2fd70..f51e86f1b11e 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -107,14 +107,12 @@ private function buildBasicPropertiesCreateForm(
         }
 
         return $environment->getPresentationFactory()->getEditForm(
-            $environment
-                ->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION)
-                ->buildURI(),
+            $environment->withStepParameter(self::CMD_SAVE_QUESTION),
             $ff->section(
                 $inputs,
                 $this->lng->txt('edit_basic_form_properties')
             ),
-            true
+            false
         );
     }
 
@@ -138,16 +136,16 @@ private function buildBasicPropertiesEditingForm(
         EnvironmentImplementation $environment
     ): EditForm {
         return $environment->getPresentationFactory()->getEditForm(
-            $environment
-                ->getUrlBuilderWithStepParameter(self::CMD_SAVE_QUESTION)
-                ->buildURI(),
-            $this->ui_factory->input()->field()->section(
-                $this->buildBasicPropertiesInputs(),
-                $this->lng->txt('edit_basic_form_properties')
-            )->withAdditionalTransformation(
-                $this->buildAddBasicPropertiesToQuestionTrafo()
-            )->withValue(
-                $this->buildBasicPropertiesBasicValuesArray()
+            $environment->withStepParameter(self::CMD_SAVE_QUESTION),
+            $environment->getPresentationFactory()->getInputsBuilder(
+                $this->ui_factory->input()->field()->section(
+                    $this->buildBasicPropertiesInputs(),
+                    $this->lng->txt('edit_basic_form_properties')
+                )->withAdditionalTransformation(
+                    $this->buildAddBasicPropertiesToQuestionTrafo()
+                )->withValue(
+                    $this->buildBasicPropertiesBasicValuesArray()
+                )
             ),
             true
         );

From 97cf02c487616a8e03e7218120a52f0ec9dc7617 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 11 Feb 2026 10:14:57 +0100
Subject: [PATCH 129/141] Questions: Fix Typo

---
 .../class.ilObjQuestionsGUI.php               |  2 +-
 .../Presentation/Definitions/CarryWrapper.php | 61 -------------------
 .../src/Presentation/Definitions/Leaf.php     | 34 -----------
 3 files changed, 1 insertion(+), 96 deletions(-)
 delete mode 100755 components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
 delete mode 100755 components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
index f4d487b4c4e3..aa242550195d 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -43,7 +43,7 @@ class ilObjQuestionsGUI extends ilObjectGUI
 
     private readonly UnitsRepository $units_repository;
     private readonly Edit $edit_view;
-    private readonly ConfigurationRepository $configurations_repository;
+    private readonly ConfigurationRepository $configuration_repository;
 
     private readonly ilHelpGUI $help;
     private readonly DataFactory $data_factory;
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php b/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
deleted file mode 100755
index 3733be691737..000000000000
--- a/components/ILIAS/Questions/src/Presentation/Definitions/CarryWrapper.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\Presentation\Definitions;
-
-use ILIAS\Refinery\Transformation;
-
-class CarryWrapper
-{
-    public function __construct(
-        private array $raw_values
-    ) {
-    }
-
-    /**
-     * The Transformation will receive either the value from $_POST or an instance
-     * of `CarrySectionData` containing the next nesting level if the value contains
-     * values from multiple variables from $_POST.
-     */
-    public function retrieve(
-        string $key,
-        Transformation $transformation
-    ): mixed {
-        return $transformation->transform(
-            $this->retrieveValueFromArray($key)
-        );
-    }
-
-    private function retrieveValueFromArray(
-        string $key
-    ): mixed {
-        $value = $this->raw_values[$key] ?? null;
-
-        if ($value === null) {
-            return null;
-        }
-
-        if ($value instanceof Leaf) {
-            return $value->get();
-        }
-
-        return new self($value);
-    }
-}
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php b/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
deleted file mode 100755
index 55e80b2bc9a3..000000000000
--- a/components/ILIAS/Questions/src/Presentation/Definitions/Leaf.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * This file is part of ILIAS, a powerful learning management system
- * published by ILIAS open source e-Learning e.V.
- *
- * ILIAS is licensed with the GPL-3.0,
- * see https://www.gnu.org/licenses/gpl-3.0.en.html
- * You should have received a copy of said license along with the
- * source code, too.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- * https://www.ilias.de
- * https://github.com/ILIAS-eLearning
- *
- *********************************************************************/
-
-declare(strict_types=1);
-
-namespace ILIAS\Questions\Presentation\Definitions;
-
-class Leaf
-{
-    public function __construct(
-        private readonly mixed $value
-    ) {
-    }
-
-    public function get(): mixed
-    {
-        return $this->value;
-    }
-}

From 52d1d9a991875b747af8301373a585079896ad98 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 11 Feb 2026 10:45:15 +0100
Subject: [PATCH 130/141] Questions: Implement New Carry Mechanism

---
 .../Cloze/Properties/ClozeText/Text.php       |  2 +-
 .../Gaps/AnswerOptions/AnswerOptions.php      | 28 +++++++
 .../Cloze/Properties/Gaps/Gap.php             | 69 +++++++++--------
 .../Cloze/Properties/Gaps/Gaps.php            | 37 ++++++++-
 .../Cloze/Properties/Properties.php           | 76 ++++++++++++-------
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 72 +++++++++---------
 .../src/Presentation/Layout/Factory.php       | 20 -----
 7 files changed, 188 insertions(+), 116 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 17b414a3abfe..2d842846e9f0 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -73,7 +73,7 @@ public function getCarryInputs(
         return $ff->hidden()->withValue($this->getTextForOutputInHiddenInput());
     }
 
-    public function getRawRepresentationForPersistence(): string
+    public function getRawRepresentation(): string
     {
         return $this->cloze_text->getRawRepresentation();
     }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
index 06efbda84b08..90c1b6bafad8 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
@@ -206,6 +206,34 @@ function (array $c, AnswerOption $v): array {
         );
     }
 
+    public function buildQueryCarry(): array
+    {
+        return array_map(
+            fn(AnswerOption $v) => $v->getAnswerOptionId()->toString(),
+            $this->answer_options
+        );
+    }
+
+    public function withValuesFromQueryCarry(
+        array $carry
+    ): self {
+        $clone = clone $this;
+        $clone->answer_options = array_reduce(
+            $carry,
+            function (array $c, string $v): array {
+                $c[$v] = $this->factory->buildAnswerOption(
+                    $v,
+                    $this->answer_input_id,
+                    0,
+                    ''
+                );
+                return $c;
+            },
+            []
+        );
+        return $clone;
+    }
+
     public function buildHiddenInputValue(): string
     {
         return json_encode([
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index 82e9ccc18918..ea961413dc83 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -42,13 +42,13 @@ class Gap
 {
     public const string GAP_PLACEHOLDER_NAME = 'GAP';
 
-    private const string FORM_KEY_TYPE = 'type';
-    private const string FORM_KEY_MAX_CHARS = 'max_chars';
-    private const string FORM_KEY_STEP_SIZE = 'step_size';
-    private const string FORM_KEY_TEXT_MATCHING_METHOD = 'matching_method';
-    private const string FORM_KEY_MIN_AUTOCOMPLETE = 'min_autocomplete';
-    private const string FORM_KEY_SHUFFLE_ANSWER_OPTIONS = 'shuffle';
-    private const string FORM_KEY_ANSWER_OPTIONS = 'answer_options';
+    private const string KEY_TYPE = 'type';
+    private const string KEY_MAX_CHARS = 'max_chars';
+    private const string KEY_STEP_SIZE = 'step_size';
+    private const string KEY_TEXT_MATCHING_METHOD = 'matching_method';
+    private const string KEY_MIN_AUTOCOMPLETE = 'min_autocomplete';
+    private const string KEY_SHUFFLE_ANSWER_OPTIONS = 'shuffle';
+    private const string KEY_ANSWER_OPTIONS = 'answer_options';
 
     /**
      * @param array<ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\AnswerOptions\AnswerOption> $answer_options
@@ -181,42 +181,51 @@ public function withAnswerOptions(
         return $clone;
     }
 
+    public function getQueryCarry(): array
+    {
+        return [
+            self::KEY_TYPE => $this->type?->getIdentifier() ?? '',
+            self::KEY_ANSWER_OPTIONS => $this->answer_options->buildQueryCarry()
+        ];
+    }
+
+    public function withValuesFromQueryCarry(
+        Factory $gap_factory,
+        array $carry
+    ): self {
+        $clone = clone $this;
+        $clone->type = $gap_factory->getGapTypeByIdentifier($carry[self::KEY_TYPE]);
+        $clone->answer_options = $clone->answer_options->withValuesFromQueryCarry(
+            $carry[self::KEY_ANSWER_OPTIONS]
+        );
+    }
+
     public function getCarryInputs(
         FieldFactory $ff
     ): Group {
         $inputs = [];
-        if ($this->type !== null) {
-            $inputs[self::FORM_KEY_TYPE] = $ff->hidden()->withValue($this->type?->getIdentifier() ?? '')
-                ->withDedicatedName(self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId());
-        }
 
         if ($this->max_chars !== null) {
-            $inputs[self::FORM_KEY_MAX_CHARS] = $ff->hidden()->withValue($this->getMaxChars())
-                ->withDedicatedName(self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId());
+            $inputs[self::KEY_MAX_CHARS] = $ff->hidden()->withValue($this->getMaxChars());
         }
 
         if ($this->step_size !== null) {
-            $inputs[self::FORM_KEY_STEP_SIZE] = $ff->hidden()->withValue($this->getStepSize())
-                ->withDedicatedName(self::FORM_KEY_STEP_SIZE . $this->getShortenedAnswerInputId());
+            $inputs[self::KEY_STEP_SIZE] = $ff->hidden()->withValue($this->getStepSize());
         }
 
         if ($this->text_matching_method !== null) {
-            $inputs[self::FORM_KEY_TEXT_MATCHING_METHOD] = $ff->hidden()->withValue($this->getTextMatchingMethod()->value)
-                ->withDedicatedName(self::FORM_KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId());
+            $inputs[self::KEY_TEXT_MATCHING_METHOD] = $ff->hidden()->withValue($this->getTextMatchingMethod()->value);
         }
 
         if ($this->min_autocomplete !== null) {
-            $inputs[self::FORM_KEY_MIN_AUTOCOMPLETE] = $ff->hidden()->withValue($this->getMinAutocomplete())
-                ->withDedicatedName(self::FORM_KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId());
+            $inputs[self::KEY_MIN_AUTOCOMPLETE] = $ff->hidden()->withValue($this->getMinAutocomplete());
         }
 
         if ($this->shuffle_answer_options !== null) {
-            $inputs[self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->getShuffleAnswerOptions() ? '1' : '0')
-                ->withDedicatedName(self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId());
+            $inputs[self::KEY_SHUFFLE_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->getShuffleAnswerOptions() ? '1' : '0');
         }
 
-        $inputs[self::FORM_KEY_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->answer_options->buildHiddenInputValue())
-            ->withDedicatedName(self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId());
+        $inputs[self::KEY_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->answer_options->buildHiddenInputValue());
 
         return $ff->group($inputs);
     }
@@ -392,7 +401,7 @@ private function retrieveTypeFromCarry(
         array $available_gap_types
     ): ?Type {
         return $carry->retrieve(
-            self::FORM_KEY_TYPE . $this->getShortenedAnswerInputId(),
+            self::KEY_TYPE . $this->getShortenedAnswerInputId(),
             $refinery->custom()->transformation(
                 fn(?string $v): ?Type => $available_gap_types[$v] ?? $this->getType()
             )
@@ -404,7 +413,7 @@ private function retrieveMaxCharsFromCarry(
         CarryWrapper $carry
     ): ?int {
         return $carry->retrieve(
-            self::FORM_KEY_MAX_CHARS . $this->getShortenedAnswerInputId(),
+            self::KEY_MAX_CHARS . $this->getShortenedAnswerInputId(),
             $refinery->byTrying([
                 $refinery->kindlyTo()->int(),
                 $refinery->always($this->getMaxChars())
@@ -417,7 +426,7 @@ private function retrieveStepSizeFromCarry(
         CarryWrapper $carry
     ): ?float {
         return $carry->retrieve(
-            self::FORM_KEY_STEP_SIZE . $this->getShortenedAnswerInputId(),
+            self::KEY_STEP_SIZE . $this->getShortenedAnswerInputId(),
             $refinery->byTrying([
                 $refinery->kindlyTo()->float(),
                 $refinery->always($this->getStepSize())
@@ -430,7 +439,7 @@ private function retrieveTextMatchingMethodFromCarry(
         CarryWrapper $carry
     ): ?TextMatchingOptions {
         return $carry->retrieve(
-            self::FORM_KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId(),
+            self::KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId(),
             $refinery->custom()->transformation(
                 fn(?string $v): ?TextMatchingOptions => $v !== null
                     ? TextMatchingOptions::tryFrom($v)
@@ -444,7 +453,7 @@ private function retrieveMinAutocompleteFromCarry(
         CarryWrapper $carry
     ): ?int {
         return $carry->retrieve(
-            self::FORM_KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId(),
+            self::KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId(),
             $refinery->byTrying([
                 $refinery->kindlyTo()->int(),
                 $refinery->always($this->getMinAutocomplete())
@@ -457,7 +466,7 @@ private function retrieveShuffleAnswerOptionsFromCarry(
         CarryWrapper $carry
     ): ?bool {
         return $carry->retrieve(
-            self::FORM_KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
+            self::KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
             $refinery->byTrying([
                 $refinery->kindlyTo()->bool(),
                 $refinery->always($this->getShuffleAnswerOptions())
@@ -470,7 +479,7 @@ private function retrieveAnswerOptionsFromCarry(
         CarryWrapper $carry
     ): AnswerOptions {
         return $carry->retrieve(
-            self::FORM_KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
+            self::KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
             $refinery->custom()->transformation(
                 fn(?string $v): AnswerOptions => $this->answer_options
                     ->withValuesFromHiddenInputValue($v)
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 6480a378bd31..217453596bcf 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -212,6 +212,7 @@ public function buildAnswerOptionsInputs(
         Language $lng,
         FieldFactory $ff,
         Refinery $refinery,
+        ?string $carry,
         array $selected_gaps
     ): Section {
         return $ff->section(
@@ -289,6 +290,18 @@ function (array $c, Gap $v): array {
         );
     }
 
+    public function getQueryCarry(): array
+    {
+        return array_reduce(
+            $this->gaps,
+            function (array $c, Gap $v): array {
+                $c[$v->getAnswerInputId()->toString()] = $v->getQueryCarry();
+                return $c;
+            },
+            []
+        );
+    }
+
     public function getCarryInputs(
         FieldFactory $ff
     ): Group {
@@ -296,8 +309,7 @@ public function getCarryInputs(
             array_reduce(
                 $this->gaps,
                 function (array $c, Gap $v) use ($ff): array {
-                    $c[$v->getAnswerInputId()->toString()] = $v->getCarryInputs($ff)
-                        ->withDedicatedName($v->getAnswerInputId()->toString());
+                    $c[$v->getAnswerInputId()->toString()] = $v->getCarryInputs($ff);
                     return $c;
                 },
                 []
@@ -305,6 +317,27 @@ function (array $c, Gap $v) use ($ff): array {
         );
     }
 
+    public function withValuesFromQueryCarry(
+        Factory $gaps_factory,
+        array $carry
+    ): self {
+        $clone = clone $this;
+        foreach ($carry as $answer_input_id => $gap_definition) {
+            if (!isset($clone->gaps[$answer_input_id])) {
+                $clone->gaps[$answer_input_id] = $gaps_factory->getNewGap(
+                    $this->answer_form_id,
+                    0,
+                    $answer_input_id
+                );
+            }
+
+            $clone->gaps[$answer_input_id] = $clone->gaps[$answer_input_id]
+                ->withValuesFromQueryCarry($this->factory, $gap_definition);
+        }
+
+        return $clone;
+    }
+
     public function getFromCarryTransformation(
         Refinery $refinery,
         Factory $gaps_factory
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index 4112004e6e5a..0ece42581068 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -40,7 +40,6 @@
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
 use ILIAS\Questions\Presentation\Definitions\Environment;
-use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
@@ -53,11 +52,11 @@
 
 class Properties implements PropertiesInterface
 {
-    private const string FORM_KEY_ID = 'form_id';
-    private const string FORM_KEY_CLOZE_TEXT = 'cloze_text';
-    private const string FORM_KEY_IDENTICAL_SCORING = 'identical_scoring';
-    private const string FORM_KEY_ENABLE_COMBINATIONS = 'enable_combinations';
-    private const string FORM_KEY_GAPS_TO_EDIT = 'gaps';
+    private const string KEY_ID = 'form_id';
+    private const string KEY_CLOZE_TEXT = 'cloze_text';
+    private const string KEY_IDENTICAL_SCORING = 'identical_scoring';
+    private const string KEY_ENABLE_COMBINATIONS = 'enable_combinations';
+    private const string KEY_GAPS_TO_EDIT = 'gaps';
 
     private bool $updated_combinations = false;
 
@@ -104,7 +103,7 @@ public function getTypeGenericProperties(): TypeGenericProperties
             null,
             null,
             null,
-            $this->cloze_text->getRawRepresentationForPersistence(),
+            $this->cloze_text->getRawRepresentation(),
             $this->legacy_cloze_text
         );
     }
@@ -129,7 +128,7 @@ public function getLegacyClozeText(): string
 
     public function getClozeTextForPresentation(): string
     {
-        return $this->cloze_text->getRawRepresentationForPersistence() === ''
+        return $this->cloze_text->getRawRepresentation() === ''
             ? \ilRTE::_replaceMediaObjectImageSrc($this->legacy_cloze_text, 0)
             : $this->cloze_text->getRenderedMarkdownForParticipantPresentation();
     }
@@ -229,14 +228,14 @@ public function buildBasicEditingInputs(
 
         return $ff->section(
             [
-                self::FORM_KEY_CLOZE_TEXT => $cloze_text_input,
-                self::FORM_KEY_IDENTICAL_SCORING => ScoringIdentical::buildInput(
+                self::KEY_CLOZE_TEXT => $cloze_text_input,
+                self::KEY_IDENTICAL_SCORING => ScoringIdentical::buildInput(
                     $lng,
                     $ff,
                     $refinery,
                     $this->scoring_identical
                 )->withValue($this->getScoringOfIdenticalResponses()->value),
-                self::FORM_KEY_ENABLE_COMBINATIONS => $ff->checkbox($lng->txt('cloze_enable_combinations'))
+                self::KEY_ENABLE_COMBINATIONS => $ff->checkbox($lng->txt('cloze_enable_combinations'))
                     ->withValue($this->combinations->areCombinationsEnabled())
             ],
             $lng->txt('create_answer_form')
@@ -244,36 +243,55 @@ public function buildBasicEditingInputs(
             $refinery->custom()->transformation(
                 fn(array $vs): self => $propteries_factory->fromForm(
                     $this,
-                    $vs[self::FORM_KEY_CLOZE_TEXT],
-                    $vs[self::FORM_KEY_IDENTICAL_SCORING],
-                    $vs[self::FORM_KEY_ENABLE_COMBINATIONS]
+                    $vs[self::KEY_CLOZE_TEXT],
+                    $vs[self::KEY_IDENTICAL_SCORING],
+                    $vs[self::KEY_ENABLE_COMBINATIONS]
                 )
             )
         );
     }
 
+    public function buildQueryCarry(): string
+    {
+        return json_encode($this->gaps->getQueryCarry());
+    }
+
+    public function withValuesFromQueryCarry(
+        ClozeTextFactory $cloze_text_factory,
+        ?string $carry
+    ): self {
+        if ($carry === null
+            || !is_array(
+                ($carry_array = json_decode($carry))
+            )) {
+            return $this;
+        }
+
+        $clone = clone $this;
+        $clone->gaps = $this->getGaps()->withValuesFromQueryCarry(
+            $cloze_text_factory,
+            $carry_array
+        );
+        return $clone;
+    }
+
     public function buildCarryInputs(
         FieldFactory $ff
     ): Group {
         return $ff->group(
             [
-                self::FORM_KEY_ID => $ff->hidden()->withValue($this->answer_form_id->toString())
-                    ->withDedicatedName(self::FORM_KEY_ID),
-                self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getCarryInputs($ff)
-                    ->withDedicatedName(self::FORM_KEY_CLOZE_TEXT),
-                self::FORM_KEY_GAPS_TO_EDIT => $this->gaps->getCarryInputs($ff)
-                    ->withDedicatedName(self::FORM_KEY_GAPS_TO_EDIT),
-                self::FORM_KEY_IDENTICAL_SCORING => $ff->hidden()
-                    ->withDedicatedName(self::FORM_KEY_IDENTICAL_SCORING)
+                self::KEY_ID => $ff->hidden()->withValue($this->answer_form_id->toString()),
+                self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getCarryInputs($ff),
+                self::KEY_GAPS_TO_EDIT => $this->gaps->getCarryInputs($ff),
+                self::KEY_IDENTICAL_SCORING => $ff->hidden()
                     ->withValue($this->getScoringOfIdenticalResponses()->value),
-                self::FORM_KEY_ENABLE_COMBINATIONS => $ff->hidden()
-                    ->withDedicatedName(self::FORM_KEY_ENABLE_COMBINATIONS)
+                self::KEY_ENABLE_COMBINATIONS => $ff->hidden()
                     ->withValue($this->combinations->areCombinationsEnabled() ? 1 : 0)
             ]
         );
     }
 
-    public function withValuesFromCarry(
+    public function withValuesFromInputs(
         Refinery $refinery,
         ClozeTextFactory $cloze_text_factory,
         GapsFactory $gaps_factory,
@@ -281,7 +299,7 @@ public function withValuesFromCarry(
     ): Properties {
         $clone = clone $this;
         $clone->cloze_text = $carry->retrieve(
-            self::FORM_KEY_CLOZE_TEXT,
+            self::KEY_CLOZE_TEXT,
             $refinery->byTrying([
                 $refinery->custom()->transformation(
                     fn(?string $v): Text => $v === null
@@ -293,7 +311,7 @@ public function withValuesFromCarry(
         );
 
         $clone->scoring_identical = $carry->retrieve(
-            self::FORM_KEY_IDENTICAL_SCORING,
+            self::KEY_IDENTICAL_SCORING,
             $refinery->byTrying([
                 $refinery->custom()->transformation(
                     fn(?string $v): ScoringIdentical => $v === null
@@ -305,7 +323,7 @@ public function withValuesFromCarry(
         );
 
         $clone->combinations = $carry->retrieve(
-            self::FORM_KEY_ENABLE_COMBINATIONS,
+            self::KEY_ENABLE_COMBINATIONS,
             $refinery->byTrying([
                 $refinery->custom()->transformation(
                     fn($v): Combinations => $clone->combinations->withCombinationsEnabled(
@@ -317,7 +335,7 @@ public function withValuesFromCarry(
         );
 
         $clone->gaps = $carry->retrieve(
-            self::FORM_KEY_GAPS_TO_EDIT,
+            self::KEY_GAPS_TO_EDIT,
             $clone->cloze_text->updateGapsFromMarkdown(
                 $this->getAnswerFormId(),
                 $this->getGaps()
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index b4a7617b0e99..7fe3308d2ce2 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -35,6 +35,7 @@
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
 use ILIAS\UI\Component\Modal\InterruptiveItem\Standard as InterruptiveItem;
 use ILIAS\UI\URLBuilder;
@@ -141,21 +142,6 @@ private function callIntermediateStep(
     ): EditForm|Properties {
         $initialized_environment = $environment->withPreservedTableRowIdsParameter();
 
-        if ($step !== self::STEP_JUMP_TO_SET_ANSWER_OPTIONS
-            && $step !== self::STEP_JUMP_TO_SET_ANSWER_OPTIONS
-            && $step !== self::STEP_JUMP_TO_SET_POINTS) {
-            $initialized_environment = $initialized_environment->withAnswerFormProperties(
-                $environment->getAnswerFormProperties()->withValuesFromCarry(
-                    $this->refinery,
-                    $this->cloze_text_factory,
-                    $this->gap_factory,
-                    $environment->getPresentationFactory()->getCarrySectionData(
-                        $this->http->wrapper()->post()
-                    )
-                )
-            );
-        }
-
         return match ($step) {
             self::STEP_SET_GAP_TYPES,
             self::STEP_CONFIRMED_GAP_REMOVAL => $this->processBasicEditingForm(
@@ -192,20 +178,24 @@ private function buildBasicEditingForm(
 
         $editing_form = $environment->getPresentationFactory()->getEditForm(
             $environment->withStepParameter(self::STEP_SET_GAP_TYPES),
-            $answer_form_properties->buildBasicEditingInputs(
-                $this->lng,
-                $this->ui_factory->input()->field(),
-                $this->refinery,
-                $this->properties_factory,
-                $this->cloze_text_factory,
-                $add_legacy_cloze_text_to_input
+            $environment->getPresentationFactory()->getInputsBuilder(
+                $this->refinery->custom()->transformation(
+                    fn(null $carry) => $answer_form_properties->buildBasicEditingInputs(
+                        $this->lng,
+                        $this->ui_factory->input()->field(),
+                        $this->refinery,
+                        $this->properties_factory,
+                        $this->cloze_text_factory,
+                        $add_legacy_cloze_text_to_input
+                    )
+                )
             ),
             false
         );
 
         if (!$add_legacy_cloze_text_to_input
             && $answer_form_properties->getLegacyClozeText() !== ''
-            && $answer_form_properties->getClozeText()->getRawRepresentationForPersistence() === '') {
+            && $answer_form_properties->getClozeText()->getRawRepresentation() === '') {
             return $editing_form->withInsertLegacyTextsButton(
                 $environment->withStepParameter(
                     self::STEP_ADD_LEGACY_TEXT_BASIC_PROPERTIES
@@ -266,16 +256,26 @@ private function processBasicEditingForm(
     private function buildGapTypesForm(
         Environment $environment
     ): EditForm {
+        /** @var \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties $properties */
         $properties = $environment->getAnswerFormProperties();
         $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
             $environment->withStepParameter(self::STEP_SET_ANSWER_OPTIONS),
-            $properties->getGaps()->buildGapsTypeInputs(
-                $this->lng,
-                $ff,
-                $this->refinery,
-                $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng),
-                $environment->getTableRowIds()
+            $environment->getPresentationFactory()->getInputsBuilder(
+                $this->refinery->custom()->transformation(
+                    fn(?string $carry) => $properties
+                        ->withValuesFromQueryCarry($carry)
+                        ->getGaps()
+                        ->buildGapsTypeInputs(
+                            $this->lng,
+                            $ff,
+                            $this->refinery,
+                            $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng),
+                            $environment->getTableRowIds()
+                        )
+                )
+            )->withCarry(
+                $properties->buildQueryCarry()
             ),
             false
         )->withContentBeforeForm(
@@ -312,11 +312,15 @@ private function buildAnswerOptionsForm(
         $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
             $environment->withStepParameter(self::STEP_SET_POINTS),
-            $properties->getGaps()->buildAnswerOptionsInputs(
-                $this->lng,
-                $ff,
-                $this->refinery,
-                $environment->getTableRowIds()
+            $this->refinery->custom()->transformation(
+                fn(?string $carry): Section => $properties->getGaps()
+                    ->buildAnswerOptionsInputs(
+                        $this->lng,
+                        $ff,
+                        $this->refinery,
+                        $carry,
+                        $environment->getTableRowIds()
+                    )
             ),
             false,
             $properties->buildCarryInputs($ff)
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
index cbabfcb51db3..b6848cfbcfe2 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
@@ -104,24 +104,4 @@ public function getInputsBuilder(
             $to_inputs
         );
     }
-
-    public function getCarrySectionData(
-        ArrayBasedRequestWrapper $post_wrapper
-    ): CarryWrapper {
-        return new CarryWrapper(
-            array_reduce(
-                $post_wrapper->keys(),
-                function (array $c, string $v) use ($post_wrapper): array {
-                    $value = new Leaf(
-                        $post_wrapper->retrieve($v, $this->refinery->identity())
-                    );
-                    foreach (array_reverse(explode('/', $v)) as $path_element) {
-                        $value = [$path_element => $value];
-                    }
-                    return array_merge_recursive($c, $value);
-                },
-                []
-            )['form'][EditForm::CARRY_SECTION_NAME] ?? []
-        );
-    }
 }

From 2e61d95caf881b4894c189b6572e43d869229b44 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 11 Feb 2026 17:58:30 +0100
Subject: [PATCH 131/141] Questions: Fix Input on LegacyClozeText

---
 .../Cloze/Layout/OverviewTable.php            |  3 ++-
 .../Cloze/Properties/ClozeText/Text.php       |  8 +++---
 .../Cloze/Properties/Factory.php              | 25 +++++++++++++------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
index b64fa3ec6779..7f28cefc1fad 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
@@ -99,7 +99,8 @@ private function getActions(): array
             'edit_answer_options' => $this->table_factory->action()->standard(
                 $this->lng->txt('edit_answer_options'),
                 $this->environment
-                    ->withStepParameter(Edit::STEP_JUMP_TO_SET_ANSWER_OPTIONS),
+                    ->withStepParameter(Edit::STEP_JUMP_TO_SET_ANSWER_OPTIONS)
+                    ->getUrlBuilder(),
                 $this->environment->getTableRowIdToken()
             ),
             'edit_points' => $this->table_factory->action()->standard(
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index 2d842846e9f0..dddc27c0d086 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -47,7 +47,8 @@ public function __construct(
     public function getInput(
         Language $lng,
         FieldFactory $ff,
-        Factory $cloze_text_factory
+        Factory $cloze_text_factory,
+        bool $is_required
     ): MarkdownInput {
         return $ff->markdown(
             new \ilUIMarkdownPreviewGUI(),
@@ -60,10 +61,11 @@ public function getInput(
             )
         )->withAdditionalTransformation(
             $this->refinery->custom()->constraint(
-                fn(self $v): bool => $v->hasAtLeastOneGap(),
+                fn(self $v): bool => !$is_required && $v->getRawRepresentation() === ''
+                    || $v->hasAtLeastOneGap(),
                 $lng->txt('no_gaps')
             )
-        )->withRequired(true)
+        )->withRequired($is_required)
         ->withValue($this->cloze_text->getRawRepresentation());
     }
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
index 6e1f2610216d..b8f890786c84 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
@@ -114,21 +114,30 @@ public function fromForm(
         ScoringIdentical $scoring_of_identical_responses,
         bool $combinations_enabled
     ): Properties {
+        $updated_properties = $properties
+            ->withScoringOfIdenticalResponses($scoring_of_identical_responses)
+            ->withCombinations(
+                $properties->getCombinations()->withCombinationsEnabled(
+                    $combinations_enabled
+                )
+            );
+
+        if ($updated_properties->getLegacyClozeText() !== ''
+            && $cloze_text->getRawRepresentation() === '') {
+            return $updated_properties;
+        }
+
         $updated_gaps = $cloze_text->updateGapsFromMarkdown(
             $properties->getAnswerFormId(),
             $properties->getGaps()
         );
 
-        return $properties
+        return $updated_properties
             ->withClozeText(
-                $cloze_text->withIdsOfNewGapsInClozeText($updated_gaps->getUndefinedGaps())
-            )->withGaps($updated_gaps)
-            ->withScoringOfIdenticalResponses($scoring_of_identical_responses)
-            ->withCombinations(
-                $properties->getCombinations()->withCombinationsEnabled(
-                    $combinations_enabled
+                $cloze_text->withIdsOfNewGapsInClozeText(
+                    $updated_gaps->getUndefinedGaps()
                 )
-            );
+            )->withGaps($updated_gaps);
     }
 
     private function retrieveFirstMatchingRowFromDBRecords(

From a9cbddd1d78973a77931a22327f6a4597775bf46 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 11 Feb 2026 17:59:16 +0100
Subject: [PATCH 132/141] Questions: Fixes in Combinations

---
 .../AnswerFormTypes/Cloze/Layout/CombinationsOverview.php    | 4 +++-
 .../Cloze/Properties/Combinations/Combination.php            | 5 +++--
 .../Cloze/Properties/Combinations/Combinations.php           | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
index e509f2007f27..f86e827a1f74 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
@@ -33,6 +33,7 @@
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Modal\RoundTrip as RoundTripModal;
 use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
 use ILIAS\UI\Component\Table\Data as DataTable;
@@ -329,7 +330,7 @@ private function buildInputsBuilder(
     ): InputsBuilder {
         $inputs_builder = $this->environment->getPresentationFactory()->getInputsBuilder(
             $this->refinery->custom()->transformation(
-                function (?string $v) use ($combination): ?Group {
+                function (?string $v) use ($combination): ?Section {
                     $properties = $this->environment->getAnswerFormProperties();
                     if ($combination === null) {
                         $combination = $this->combinations_factory
@@ -343,6 +344,7 @@ function (?string $v) use ($combination): ?Group {
                         $this->ui_factory->input()->field(),
                         $this->refinery,
                         $this->lng,
+                        $this->combinations_factory,
                         $properties
                     );
                 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
index ed6a55d775bd..f66bdfc00fba 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
@@ -33,6 +33,7 @@
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Group;
+use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Table\DataRow;
 use ILIAS\UI\Component\Table\DataRowBuilder;
 
@@ -252,7 +253,7 @@ public function buildPointsInputs(
         Language $lng,
         Factory $combinations_factory,
         Properties $properties
-    ): Group {
+    ): Section {
         return $field_factory->section(
             [
                 'values' => $this->buildValuesInputs(
@@ -311,7 +312,7 @@ private function buildValuesInputs(
                 function (array $c, MatchingValue $v) use ($field_factory, $properties): array {
                     $gap_id = $v->getGap()->getAnswerInputId();
                     $gap = $properties->getGaps()->getGapById($gap_id);
-                    $c[$gap_id] = $field_factory->select(
+                    $c[$gap_id->toString()] = $field_factory->select(
                         $gap->buildShortenedGapName(),
                         $gap->getType()->getCombinationsSelectValues($gap)
                     )->withRequired(true)
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combinations.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combinations.php
index 90c6540c8a3e..e3efa80e6f82 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combinations.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combinations.php
@@ -95,8 +95,8 @@ public function hasMatchingCombinationForAnswerOptionIds(
             if ($combination->containsAnswerOptionsExactly($vs)) {
                 return true;
             }
-            return false;
         }
+        return false;
     }
 
     public function getEditView(

From 23da1d934210ec493c0d1d5de3b5a6ad862b4c54 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 12 Feb 2026 15:58:06 +0100
Subject: [PATCH 133/141] Questions: Fix Typo in Variable Name

---
 .../Questions/Legacy/Administration/class.ilObjQuestionsGUI.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
index aa242550195d..807823abf99d 100755
--- a/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
+++ b/components/ILIAS/Questions/Legacy/Administration/class.ilObjQuestionsGUI.php
@@ -62,7 +62,7 @@ public function __construct(
         $local_dic = LocalDIC::dic();
         $this->units_repository = $local_dic[UnitsRepository::class];
         $this->edit_view = $local_dic[Edit::class];
-        $this->configurations_repository = $local_dic[ConfigurationRepository::class];
+        $this->configuration_repository = $local_dic[ConfigurationRepository::class];
 
         $this->type = 'qsts';
 

From 3741bc96057601a505dce79bef80fa684f2afd7b Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 18 Feb 2026 14:33:09 +0100
Subject: [PATCH 134/141] Questions: Move To InputsBuilderSession

---
 .../ILIAS/Questions/Legacy/LocalDIC.php       |  13 +-
 .../Questions/src/AnswerForm/Factory.php      |   5 +-
 .../Cloze/Layout/CombinationsOverview.php     |  37 +-
 .../Cloze/Layout/OverviewTable.php            |  18 +-
 .../Cloze/Properties/ClozeText/Factory.php    |  12 -
 .../Cloze/Properties/ClozeText/Text.php       |  15 -
 .../Properties/Combinations/Combination.php   |   2 +
 .../Cloze/Properties/Factory.php              |  21 +-
 .../Gaps/AnswerOptions/AnswerOption.php       |   4 +-
 .../Gaps/AnswerOptions/AnswerOptions.php      | 117 ++--
 .../Cloze/Properties/Gaps/Factory.php         |   4 +
 .../Cloze/Properties/Gaps/Gap.php             | 189 ++----
 .../Cloze/Properties/Gaps/Gaps.php            | 186 +++---
 .../Cloze/Properties/Properties.php           | 123 +---
 .../src/AnswerFormTypes/Cloze/Views/Edit.php  | 311 ++++------
 .../AnswerFormTypes/Cloze/Views/EditGaps.php  | 550 ++++++++++++++++++
 .../Presentation/Definitions/Environment.php  |  11 +
 .../Definitions/EnvironmentImplementation.php | 136 +++--
 .../src/Presentation/Layout/EditForm.php      |  50 +-
 .../src/Presentation/Layout/EditOverview.php  |   8 +-
 .../src/Presentation/Layout/Factory.php       |  47 +-
 .../src/Presentation/Layout/InputsBuilder.php |  71 +--
 .../Layout/InputsBuilderSession.php           |  89 +++
 .../Questions/src/Presentation/Views/Edit.php |  19 +-
 .../Questions/src/Question/Views/Edit.php     |  26 +-
 25 files changed, 1237 insertions(+), 827 deletions(-)
 create mode 100644 components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/EditGaps.php
 create mode 100644 components/ILIAS/Questions/src/Presentation/Layout/InputsBuilderSession.php

diff --git a/components/ILIAS/Questions/Legacy/LocalDIC.php b/components/ILIAS/Questions/Legacy/LocalDIC.php
index 8f3cf59f63f5..2bdcb1c4f56c 100755
--- a/components/ILIAS/Questions/Legacy/LocalDIC.php
+++ b/components/ILIAS/Questions/Legacy/LocalDIC.php
@@ -87,7 +87,6 @@ protected static function buildDIC(ILIASContainer $DIC): self
         $dic[LayoutFactory::class] = static fn($c): LayoutFactory =>
             new LayoutFactory(
                 $DIC['ui.factory'],
-                $DIC['refinery'],
                 $DIC['http'],
                 $DIC['lng']
             );
@@ -124,6 +123,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
             );
         $dic[Cloze\Properties\Gaps\Factory::class] = static fn($c): Cloze\Properties\Gaps\Factory
             => new Cloze\Properties\Gaps\Factory(
+                $DIC['refinery'],
                 $c[UuidFactory::class],
                 $c[Cloze\Properties\Gaps\AnswerOptions\Factory::class],
                 [
@@ -160,6 +160,15 @@ protected static function buildDIC(ILIASContainer $DIC): self
             => new Cloze\Persistence(
                 new TableNameSpaceCore('cloze')
             );
+        $dic[Cloze\Views\EditGaps::class] = static fn($c): Cloze\Views\EditGaps
+            => new Cloze\Views\EditGaps(
+                $DIC['lng'],
+                $DIC['ui.factory'],
+                $DIC['refinery'],
+                $DIC['http'],
+                $c[Cloze\Properties\Factory::class],
+                $c[Cloze\Properties\Gaps\Factory::class]
+            );
         $dic[Cloze\Views\Edit::class] = static fn($c): Cloze\Views\Edit
             => new Cloze\Views\Edit(
                 $DIC['lng'],
@@ -169,7 +178,7 @@ protected static function buildDIC(ILIASContainer $DIC): self
                 $DIC['http'],
                 $c[Cloze\Properties\Factory::class],
                 $c[Cloze\Properties\ClozeText\Factory::class],
-                $c[Cloze\Properties\Gaps\Factory::class]
+                $c[Cloze\Views\EditGaps::class]
             );
         $dic[Cloze\Views\Participant::class] = static fn($c): Cloze\Views\Participant
             => new Cloze\Views\Participant(
diff --git a/components/ILIAS/Questions/src/AnswerForm/Factory.php b/components/ILIAS/Questions/src/AnswerForm/Factory.php
index b951d2bc6fa1..b31721d78266 100644
--- a/components/ILIAS/Questions/src/AnswerForm/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerForm/Factory.php
@@ -101,10 +101,11 @@ public function buildTypeDefinitionFromSelectValue(
 
     public function getDefaultTypeGenericProperties(
         Uuid $question_id,
-        Definition $type
+        Definition $type,
+        ?Uuid $answer_form_id = null
     ): TypeGenericProperties {
         return new TypeGenericProperties(
-            $this->uuid_factory->uuid4(),
+            $answer_form_id ?? $this->uuid_factory->uuid4(),
             $question_id,
             $type
         );
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
index f86e827a1f74..eb9d6b9b3f82 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/CombinationsOverview.php
@@ -26,6 +26,7 @@
 use ILIAS\Questions\Presentation\Definitions\Environment;
 use ILIAS\Questions\Presentation\Layout\Async;
 use ILIAS\Questions\Presentation\Layout\InputsBuilder;
+use ILIAS\Questions\Presentation\Layout\InputsBuilderSession;
 use ILIAS\Questions\Presentation\Layout\Renderable;
 use ILIAS\Data\Range;
 use ILIAS\Data\Order;
@@ -177,7 +178,9 @@ private function buildAction(): Async
         return $this->environment->getPresentationFactory()->getAsync(
             match ($this->environment->getStep()) {
                 self::STEP_JUMP_TO_SET_COMBINATION_VALUES =>
-                    $this->buildSetCombinationValuesModal($affected_item),
+                    $this->buildSetCombinationValuesModal(
+                        $this->buildInputsBuilder($affected_item)
+                    ),
                 self::STEP_CONFIRM_DELETE_COMBINATION =>
                     $this->confirmDeleteCombination($affected_item)
             }
@@ -242,22 +245,19 @@ private function processSetCombinationGapsModal(): self
             return $clone;
         }
 
-        $set_values_modal = $clone->buildSetCombinationValuesModal($data['combination']);
+        $set_values_modal = $clone->buildSetCombinationValuesModal(
+            $this->buildInputsBuilder($data['combination'])
+        );
         $clone->modal = $set_values_modal->withOnLoad($set_values_modal->getShowSignal());
         return $clone;
     }
 
     private function buildSetCombinationValuesModal(
-        ?Combination $combination = null
+        InputsBuilder $inputs_builder
     ): RoundTripModal {
         $properties = $this->environment->getAnswerFormProperties();
         $gaps = $properties->getGaps();
 
-        $inputs_builder = $this->buildInputsBuilder($combination);
-        $inputs = $inputs_builder->getInputs(
-            $this->environment
-        );
-
         return $this->ui_factory->modal()->roundtrip(
             $this->lng->txt('edit'),
             $properties->getClozeText()->buildPanelForEditing(
@@ -267,11 +267,9 @@ private function buildSetCombinationValuesModal(
                 $properties->getLegacyClozeText()
             ),
             [
-                'values_awarding_points' => $inputs
+                'values_awarding_points' => $inputs_builder->getInputs()
             ],
-            $inputs_builder->addCarryToEnvironment(
-                $this->environment
-            )->withStepParameter(self::STEP_SAVE)
+            $this->environment->withStepParameter(self::STEP_SAVE)
             ->getUrlBuilder()
             ->buildURI()
             ->__toString()
@@ -280,12 +278,14 @@ private function buildSetCombinationValuesModal(
 
     private function processSetCombinationValues(): self|Properties
     {
-        $set_values_modal = $this->buildSetCombinationValuesModal()
+        $inputs_builder = $this->buildInputsBuilder(null);
+        $set_values_modal = $this->buildSetCombinationValuesModal($inputs_builder)
             ->withRequest($this->http->request());
         $data = $set_values_modal->getData();
         if ($data === null) {
             $this->modal = $this->initializeModal($set_values_modal)
                 ->withOnLoad($set_values_modal->getShowSignal());
+            $inputs_builder->persistCarry();
             return $this;
         }
 
@@ -327,8 +327,9 @@ private function deleteCombination(): Properties
 
     private function buildInputsBuilder(
         ?Combination $combination,
-    ): InputsBuilder {
-        $inputs_builder = $this->environment->getPresentationFactory()->getInputsBuilder(
+    ): InputsBuilderSession {
+        $builder = $this->environment->getPresentationFactory()->getSessionBasedInputsBuilder(
+            $this->environment->getAnswerFormProperties()->getAnswerFormId()->toString(),
             $this->refinery->custom()->transformation(
                 function (?string $v) use ($combination): ?Section {
                     $properties = $this->environment->getAnswerFormProperties();
@@ -352,9 +353,11 @@ function (?string $v) use ($combination): ?Section {
         );
 
         if ($combination === null) {
-            return $inputs_builder;
+            return $builder;
         }
 
-        return $inputs_builder->withCarry($combination->buildCarryString());
+        $builder_with_string = $builder->withCarry($combination->buildCarryString());
+        $builder_with_string->persistCarry();
+        return $builder_with_string;
     }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
index 7f28cefc1fad..e9b259ab5dbe 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Layout/OverviewTable.php
@@ -20,7 +20,7 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Layout;
 
-use ILIAS\Questions\AnswerFormTypes\Cloze\Views\Edit;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Views\EditGaps;
 use ILIAS\Questions\Presentation\Definitions\Environment;
 use ILIAS\Data\Range;
 use ILIAS\Data\Order;
@@ -79,10 +79,14 @@ private function getColums(): array
         $f = $this->table_factory->column();
 
         return [
-            'gap' => $f->text($this->lng->txt('title')),
-            'type' => $f->text($this->lng->txt('question_type')),
-            'answers_options_awarding_points' => $f->text($this->lng->txt('answer_options_awarding_points')),
+            'gap' => $f->text($this->lng->txt('title'))->withIsSortable(false),
+            'type' => $f->text($this->lng->txt('cloze_type'))->withIsSortable(false),
+            'answers_options_awarding_points' => $f
+                ->text($this->lng->txt('answer_options_awarding_points'))
+                ->withIsSortable(false),
             'available_points' => $f->number($this->lng->txt('available_points'))
+                ->withDecimals(4)
+                ->withIsSortable(false)
         ];
     }
 
@@ -92,21 +96,21 @@ private function getActions(): array
             'edit_gaps' => $this->table_factory->action()->standard(
                 $this->lng->txt('edit_gaps'),
                 $this->environment
-                    ->withStepParameter(Edit::STEP_JUMP_TO_SET_GAP_TYPES)
+                    ->withStepParameter(EditGaps::STEP_JUMP_TO_SET_GAP_TYPES)
                     ->getUrlBuilder(),
                 $this->environment->getTableRowIdToken()
             ),
             'edit_answer_options' => $this->table_factory->action()->standard(
                 $this->lng->txt('edit_answer_options'),
                 $this->environment
-                    ->withStepParameter(Edit::STEP_JUMP_TO_SET_ANSWER_OPTIONS)
+                    ->withStepParameter(EditGaps::STEP_JUMP_TO_SET_ANSWER_OPTIONS)
                     ->getUrlBuilder(),
                 $this->environment->getTableRowIdToken()
             ),
             'edit_points' => $this->table_factory->action()->standard(
                 $this->lng->txt('edit_available_points'),
                 $this->environment
-                    ->withStepParameter(Edit::STEP_JUMP_TO_SET_POINTS)
+                    ->withStepParameter(EditGaps::STEP_JUMP_TO_ASSIGN_POINTS)
                     ->getUrlBuilder(),
                 $this->environment->getTableRowIdToken()
             )
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
index 55e2ac30a4c6..b24c6ab3de23 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Factory.php
@@ -43,16 +43,4 @@ public function buildFromTextString(
             $this->text_factory->markdown($text)
         );
     }
-
-    public function buildFromHiddenInputString(
-        string $text
-    ): Text {
-        return $this->buildFromTextString($this->unmaskTextFromOutputInHiddenInput($text));
-    }
-
-    private function unmaskTextFromOutputInHiddenInput(
-        string $text
-    ): string {
-        return str_replace(['\{\{', '\}\}'], ['{{', '}}'], $text);
-    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index dddc27c0d086..b1eba9f89ad4 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -69,12 +69,6 @@ public function getInput(
         ->withValue($this->cloze_text->getRawRepresentation());
     }
 
-    public function getCarryInputs(
-        FieldFactory $ff
-    ): HiddenInput {
-        return $ff->hidden()->withValue($this->getTextForOutputInHiddenInput());
-    }
-
     public function getRawRepresentation(): string
     {
         return $this->cloze_text->getRawRepresentation();
@@ -196,13 +190,4 @@ private function hasAtLeastOneGap(): bool
 
         return false;
     }
-
-    private function getTextForOutputInHiddenInput(): string
-    {
-        return str_replace(
-            ['{{', '}}'],
-            ['\{\{', '\}\}'],
-            $this->cloze_text->getRawRepresentation()
-        );
-    }
 }
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
index f66bdfc00fba..8f0f87d4076d 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Combinations/Combination.php
@@ -181,6 +181,7 @@ private function buildDelete(
             [
                 $persistence_factory->where(
                     $persistence->getIdColumn(
+                        $persistence_factory,
                         $table_name_builder,
                         $table_definition,
                         $persistence->getCombinationsTableIdentifier()
@@ -209,6 +210,7 @@ private function buildDeleteForLinkedValues(
             [
                 $persistence_factory->where(
                     $persistence->getIdColumn(
+                        $persistence_factory,
                         $table_name_builder,
                         $table_definition,
                         $persistence->getCombinationToAnswerOptionsTableIdentifier()
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
index b8f890786c84..c5112d5622ce 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Factory.php
@@ -108,7 +108,7 @@ function (array $vs) use ($type_generic_properties): array {
         );
     }
 
-    public function fromForm(
+    public function fromBasicEditingForm(
         Properties $properties,
         ClozeText $cloze_text,
         ScoringIdentical $scoring_of_identical_responses,
@@ -135,11 +135,28 @@ public function fromForm(
         return $updated_properties
             ->withClozeText(
                 $cloze_text->withIdsOfNewGapsInClozeText(
-                    $updated_gaps->getUndefinedGaps()
+                    $updated_gaps->getIncompleteGaps()
                 )
             )->withGaps($updated_gaps);
     }
 
+    public function fromCarry(
+        Properties $properties,
+        ?string $carry
+    ): Properties {
+        if ($carry === null
+           || !is_array(
+               ($carry_array = json_decode($carry, true))
+           )) {
+            return $properties;
+        }
+
+        return $properties->withValuesFromCarry(
+            $this->cloze_text_factory,
+            $carry_array
+        );
+    }
+
     private function retrieveFirstMatchingRowFromDBRecords(
         string $answer_form_id,
         array $vs
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
index a59e4b4be113..96ce83eb3252 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOption.php
@@ -114,11 +114,11 @@ public function withAvailablePoints(
         return $clone;
     }
 
-    public function buildArrayForHiddenInput(): array
+    public function toCarry(): array
     {
         $values = [
             self::FORM_KEY_ID => $this->getAnswerOptionId()->toString(),
-            self::FORM_KEY_POSITION => $this->getPosition(),
+            self::FORM_KEY_POSITION => (string) $this->getPosition(),
             self::FORM_KEY_TEXT_VALUE => $this->getTextValue()
         ];
 
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
index 90c1b6bafad8..c673ec6291e2 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/AnswerOptions/AnswerOptions.php
@@ -33,8 +33,14 @@
 
 class AnswerOptions
 {
+    private const string KEY_IS_INCOMPLETE = 'is_incomplete';
+    private const string KEY_ANSWER_OPIONS = 'answer_options';
+    private const string KEY_ANSWER_OPTIONS_AWARDING_POINTS = 'answer_options_awarding_points';
+
     private array $answer_options_awarding_points;
 
+    private bool $is_incomplete = false;
+
     public function __construct(
         private readonly Factory $factory,
         private readonly Uuid $answer_input_id,
@@ -45,10 +51,19 @@ public function __construct(
 
     public function isIncomplete(): bool
     {
-        return $this->answer_options === []
+        return $this->is_incomplete
+            || $this->answer_options === []
             || $this->answer_options_awarding_points === [];
     }
 
+    public function withIsIncomplete(
+        bool $is_incomplete
+    ): self {
+        $clone = clone $this;
+        $clone->is_incomplete = $is_incomplete;
+        return $clone;
+    }
+
     public function getAnswerOptionById(
         Uuid $answer_option_id
     ): ?AnswerOption {
@@ -114,42 +129,6 @@ public function withAnswerOptions(
         return $clone;
     }
 
-    public function withValuesFromHiddenInputValue(
-        ?string $value
-    ): self {
-        if ($value === null
-            || !is_array(
-                ($decoded_value = json_decode($value, true))
-            )
-        ) {
-            return $this;
-        }
-
-        $clone = clone $this;
-        $clone->answer_options = array_map(
-            fn(array $vs): AnswerOption => $this->factory->buildAnswerOption(
-                $vs[AnswerOption::FORM_KEY_ID],
-                $this->answer_input_id,
-                $vs[AnswerOption::FORM_KEY_POSITION],
-                $vs[AnswerOption::FORM_KEY_TEXT_VALUE],
-                $vs[AnswerOption::FORM_KEY_LOWER_LIMIT] ?? null,
-                $vs[AnswerOption::FORM_KEY_UPPER_LIMIT] ?? null,
-                $vs[AnswerOption::FORM_KEY_AVAILABLE_POINTS] ?? null
-            ),
-            $decoded_value['answer_options'] ?? []
-        );
-
-        $answer_inputs_awarding_points = $decoded_value['answer_options_awarding_points'] ?? [];
-        $clone->answer_options_awarding_points = array_filter(
-            $clone->answer_options,
-            fn(AnswerOption $v): bool => in_array(
-                $v->getAnswerOptionId()->toString(),
-                $answer_inputs_awarding_points
-            )
-        );
-        return $clone;
-    }
-
     public function withAnswerOptionsFromTags(
         array $tags
     ): self {
@@ -206,46 +185,47 @@ function (array $c, AnswerOption $v): array {
         );
     }
 
-    public function buildQueryCarry(): array
+    public function toCarry(): array
     {
-        return array_map(
-            fn(AnswerOption $v) => $v->getAnswerOptionId()->toString(),
-            $this->answer_options
-        );
+        return [
+            self::KEY_IS_INCOMPLETE => $this->is_incomplete ? 1 : 0,
+            self::KEY_ANSWER_OPIONS => array_map(
+                fn(AnswerOption $v): array => $v->toCarry(),
+                $this->answer_options
+            ),
+            self::KEY_ANSWER_OPTIONS_AWARDING_POINTS => array_map(
+                fn(AnswerOption $v): string => $v->getAnswerOptionId()->toString(),
+                $this->answer_options_awarding_points
+            )
+        ];
     }
 
-    public function withValuesFromQueryCarry(
+    public function withValuesFromCarry(
         array $carry
     ): self {
         $clone = clone $this;
-        $clone->answer_options = array_reduce(
-            $carry,
-            function (array $c, string $v): array {
-                $c[$v] = $this->factory->buildAnswerOption(
-                    $v,
-                    $this->answer_input_id,
-                    0,
-                    ''
-                );
-                return $c;
-            },
-            []
+        $clone->is_incomplete = $carry[self::KEY_IS_INCOMPLETE] === 1;
+        $clone->answer_options = array_map(
+            fn(array $vs): AnswerOption => $this->factory->buildAnswerOption(
+                $vs[AnswerOption::FORM_KEY_ID],
+                $this->answer_input_id,
+                (int) $vs[AnswerOption::FORM_KEY_POSITION],
+                $vs[AnswerOption::FORM_KEY_TEXT_VALUE],
+                $vs[AnswerOption::FORM_KEY_LOWER_LIMIT] ?? null,
+                $vs[AnswerOption::FORM_KEY_UPPER_LIMIT] ?? null,
+                $vs[AnswerOption::FORM_KEY_AVAILABLE_POINTS] ?? null
+            ),
+            $carry[self::KEY_ANSWER_OPIONS] ?? []
         );
-        return $clone;
-    }
 
-    public function buildHiddenInputValue(): string
-    {
-        return json_encode([
-            'answer_options' => array_map(
-                fn(AnswerOption $v): array => $v->buildArrayForHiddenInput(),
-                $this->answer_options
-            ),
-            'answer_options_awarding_points' => array_map(
-                fn(AnswerOption $v): string => $v->getAnswerOptionId()->toString(),
-                $this->answer_options_awarding_points
+        $clone->answer_options_awarding_points = array_filter(
+            $clone->answer_options,
+            fn(AnswerOption $v): bool => in_array(
+                $v->getAnswerOptionId()->toString(),
+                $carry[self::KEY_ANSWER_OPTIONS_AWARDING_POINTS] ?? []
             )
-        ]);
+        );
+        return $clone;
     }
 
     public function getEditPointsInputs(
@@ -301,6 +281,7 @@ public function buildDelete(
             [
                 $persistence_factory->where(
                     $persistence->getForeignKeyColumn(
+                        $persistence_factory,
                         $table_name_builder,
                         $answer_options_table_definition
                     ),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
index 077fc8ce9089..947c50361936 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Factory.php
@@ -28,12 +28,14 @@
 use ILIAS\Language\Language;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Data\UUID\Factory as UuidFactory;
+use ILIAS\Refinery\Factory as Refinery;
 
 class Factory
 {
     private array $available_gap_types;
 
     public function __construct(
+        private readonly Refinery $refinery,
         private readonly UuidFactory $uuid_factory,
         private readonly AnswerOptionsFactory $answer_options_factory,
         array $available_gap_types
@@ -78,6 +80,7 @@ public function getEmptyGapsObject(
         Uuid $answer_form_id,
     ): Gaps {
         return new Gaps(
+            $this->refinery,
             $this,
             $answer_form_id,
             []
@@ -117,6 +120,7 @@ function (array $vs) use ($answer_form_id, $answer_options): Gaps {
                         $gaps[] = $this->buildGapFromDBValues($v, $answer_options);
                     }
                     return new Gaps(
+                        $this->refinery,
                         $this,
                         $answer_form_id,
                         $gaps
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
index ea961413dc83..a27fc3e3bd58 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gap.php
@@ -43,6 +43,7 @@ class Gap
     public const string GAP_PLACEHOLDER_NAME = 'GAP';
 
     private const string KEY_TYPE = 'type';
+    private const string KEY_POSITION = 'position';
     private const string KEY_MAX_CHARS = 'max_chars';
     private const string KEY_STEP_SIZE = 'step_size';
     private const string KEY_TEXT_MATCHING_METHOD = 'matching_method';
@@ -181,72 +182,80 @@ public function withAnswerOptions(
         return $clone;
     }
 
-    public function getQueryCarry(): array
+    public function toCarry(): array
     {
-        return [
+        $inputs = [
             self::KEY_TYPE => $this->type?->getIdentifier() ?? '',
-            self::KEY_ANSWER_OPTIONS => $this->answer_options->buildQueryCarry()
+            self::KEY_POSITION => $this->position,
+            self::KEY_ANSWER_OPTIONS => $this->answer_options->toCarry()
         ];
-    }
-
-    public function withValuesFromQueryCarry(
-        Factory $gap_factory,
-        array $carry
-    ): self {
-        $clone = clone $this;
-        $clone->type = $gap_factory->getGapTypeByIdentifier($carry[self::KEY_TYPE]);
-        $clone->answer_options = $clone->answer_options->withValuesFromQueryCarry(
-            $carry[self::KEY_ANSWER_OPTIONS]
-        );
-    }
-
-    public function getCarryInputs(
-        FieldFactory $ff
-    ): Group {
-        $inputs = [];
 
         if ($this->max_chars !== null) {
-            $inputs[self::KEY_MAX_CHARS] = $ff->hidden()->withValue($this->getMaxChars());
+            $inputs[self::KEY_MAX_CHARS] = (string) $this->getMaxChars();
         }
 
         if ($this->step_size !== null) {
-            $inputs[self::KEY_STEP_SIZE] = $ff->hidden()->withValue($this->getStepSize());
+            $inputs[self::KEY_STEP_SIZE] = (string) $this->getStepSize();
         }
 
         if ($this->text_matching_method !== null) {
-            $inputs[self::KEY_TEXT_MATCHING_METHOD] = $ff->hidden()->withValue($this->getTextMatchingMethod()->value);
+            $inputs[self::KEY_TEXT_MATCHING_METHOD] = $this->getTextMatchingMethod()->value;
         }
 
         if ($this->min_autocomplete !== null) {
-            $inputs[self::KEY_MIN_AUTOCOMPLETE] = $ff->hidden()->withValue($this->getMinAutocomplete());
+            $inputs[self::KEY_MIN_AUTOCOMPLETE] = (string) $this->getMinAutocomplete();
         }
 
         if ($this->shuffle_answer_options !== null) {
-            $inputs[self::KEY_SHUFFLE_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->getShuffleAnswerOptions() ? '1' : '0');
+            $inputs[self::KEY_SHUFFLE_ANSWER_OPTIONS] = $this->getShuffleAnswerOptions() ? '1' : '0';
         }
 
-        $inputs[self::KEY_ANSWER_OPTIONS] = $ff->hidden()->withValue($this->answer_options->buildHiddenInputValue());
-
-        return $ff->group($inputs);
+        return $inputs;
     }
 
-    public function getFromCarryTransformation(
+    public function withValuesFromCarry(
         Refinery $refinery,
-        Factory $gaps_factory
-    ): Transformation {
-        return $refinery->custom()->transformation(
-            function (CarryWrapper $v) use ($refinery, $gaps_factory): self {
-                $clone = clone $this;
-                $clone->type = $this->retrieveTypeFromCarry($refinery, $v, $gaps_factory->getAvailableGapTypes());
-                $clone->max_chars = $this->retrieveMaxCharsFromCarry($refinery, $v);
-                $clone->step_size = $this->retrieveStepSizeFromCarry($refinery, $v);
-                $clone->text_matching_method = $this->retrieveTextMatchingMethodFromCarry($refinery, $v);
-                $clone->min_autocomplete = $this->retrieveMinAutocompleteFromCarry($refinery, $v);
-                $clone->shuffle_answer_options = $this->retrieveShuffleAnswerOptionsFromCarry($refinery, $v);
-                $clone->answer_options = $this->retrieveAnswerOptionsFromCarry($refinery, $v);
-                return $clone;
-            }
-        );
+        Factory $gaps_factory,
+        array $carry
+    ): self {
+        if ($carry === null) {
+            return $this;
+        }
+
+        $clone = clone $this;
+        $clone->type = $carry[self::KEY_TYPE] === ''
+            ? $this->getType()
+            : $gaps_factory->getGapTypeByIdentifier($carry[self::KEY_TYPE]);
+        $clone->position = $carry[self::KEY_POSITION];
+
+        $clone->max_chars = $refinery->byTrying([
+            $refinery->kindlyTo()->int(),
+            $refinery->always($this->getMaxChars())
+        ])->transform($carry[self::KEY_MAX_CHARS] ?? null);
+
+        $clone->step_size = $refinery->byTrying([
+            $refinery->kindlyTo()->float(),
+            $refinery->always($this->getStepSize())
+        ])->transform($carry[self::KEY_STEP_SIZE] ?? null);
+
+        $clone->text_matching_method = is_string($carry[self::KEY_TEXT_MATCHING_METHOD] ?? null)
+            ? TextMatchingOptions::tryFrom($carry[self::KEY_TEXT_MATCHING_METHOD])
+            : $this->getTextMatchingMethod();
+
+        $clone->min_autocomplete = $refinery->byTrying([
+            $refinery->kindlyTo()->int(),
+            $refinery->always($this->getMinAutocomplete())
+        ])->transform($carry[self::KEY_MIN_AUTOCOMPLETE] ?? null);
+
+        $clone->shuffle_answer_options = $refinery->byTrying([
+            $refinery->kindlyTo()->bool(),
+            $refinery->always($this->getShuffleAnswerOptions())
+        ])->transform($carry[self::KEY_SHUFFLE_ANSWER_OPTIONS] ?? null);
+
+        $clone->answer_options = $this->answer_options
+            ->withValuesFromCarry($carry[self::KEY_ANSWER_OPTIONS]);
+
+        return $clone;
     }
 
     public function buildReplace(
@@ -395,98 +404,6 @@ private function buildValuesForGapReplace(
         ];
     }
 
-    private function retrieveTypeFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry,
-        array $available_gap_types
-    ): ?Type {
-        return $carry->retrieve(
-            self::KEY_TYPE . $this->getShortenedAnswerInputId(),
-            $refinery->custom()->transformation(
-                fn(?string $v): ?Type => $available_gap_types[$v] ?? $this->getType()
-            )
-        );
-    }
-
-    private function retrieveMaxCharsFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): ?int {
-        return $carry->retrieve(
-            self::KEY_MAX_CHARS . $this->getShortenedAnswerInputId(),
-            $refinery->byTrying([
-                $refinery->kindlyTo()->int(),
-                $refinery->always($this->getMaxChars())
-            ])
-        );
-    }
-
-    private function retrieveStepSizeFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): ?float {
-        return $carry->retrieve(
-            self::KEY_STEP_SIZE . $this->getShortenedAnswerInputId(),
-            $refinery->byTrying([
-                $refinery->kindlyTo()->float(),
-                $refinery->always($this->getStepSize())
-            ])
-        );
-    }
-
-    private function retrieveTextMatchingMethodFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): ?TextMatchingOptions {
-        return $carry->retrieve(
-            self::KEY_TEXT_MATCHING_METHOD . $this->getShortenedAnswerInputId(),
-            $refinery->custom()->transformation(
-                fn(?string $v): ?TextMatchingOptions => $v !== null
-                    ? TextMatchingOptions::tryFrom($v)
-                    : $this->getTextMatchingMethod()
-            )
-        );
-    }
-
-    private function retrieveMinAutocompleteFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): ?int {
-        return $carry->retrieve(
-            self::KEY_MIN_AUTOCOMPLETE . $this->getShortenedAnswerInputId(),
-            $refinery->byTrying([
-                $refinery->kindlyTo()->int(),
-                $refinery->always($this->getMinAutocomplete())
-            ])
-        );
-    }
-
-    private function retrieveShuffleAnswerOptionsFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): ?bool {
-        return $carry->retrieve(
-            self::KEY_SHUFFLE_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
-            $refinery->byTrying([
-                $refinery->kindlyTo()->bool(),
-                $refinery->always($this->getShuffleAnswerOptions())
-            ])
-        );
-    }
-
-    private function retrieveAnswerOptionsFromCarry(
-        Refinery $refinery,
-        CarryWrapper $carry
-    ): AnswerOptions {
-        return $carry->retrieve(
-            self::KEY_ANSWER_OPTIONS . $this->getShortenedAnswerInputId(),
-            $refinery->custom()->transformation(
-                fn(?string $v): AnswerOptions => $this->answer_options
-                    ->withValuesFromHiddenInputValue($v)
-            )
-        );
-    }
-
     private function getShortenedAnswerInputId(): string
     {
         return mb_substr($this->answer_input_id->toString(), 0, 4);
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
index 217453596bcf..837e154ba746 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Gaps/Gaps.php
@@ -20,6 +20,7 @@
 
 namespace ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps;
 
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
 use ILIAS\Questions\Persistence\Delete;
 use ILIAS\Questions\Persistence\Factory as PersistenceFactory;
 use ILIAS\Questions\Persistence\Junctor;
@@ -28,13 +29,10 @@
 use ILIAS\Questions\Persistence\TableNameBuilder;
 use ILIAS\Questions\Persistence\TableTypes;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Persistence;
-use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Data\UUID\Uuid;
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
-use ILIAS\UI\Component\Input\Field\Group;
 use ILIAS\UI\Component\Input\Field\Section;
 use ILIAS\UI\Component\Input\Field\MultiSelect;
 use ILIAS\UI\Component\Table\DataRowBuilder;
@@ -47,6 +45,7 @@ class Gaps
     private array $gaps;
 
     public function __construct(
+        private readonly Refinery $refinery,
         private readonly Factory $factory,
         private Uuid $answer_form_id,
         array $gaps
@@ -127,14 +126,27 @@ public function withResetGaps(): self
         return $clone;
     }
 
-    public function getUndefinedGaps(): array
+    public function getIncompleteGaps(): array
     {
         return array_filter(
             $this->gaps,
-            fn(Gap $v): bool => $v->isUndefined()
+            fn(Gap $v): bool => $v->getAnswerOptions()->isIncomplete()
         );
     }
 
+    public function withMarkedIncompleteGaps(): self
+    {
+        $clone = clone $this;
+        $clone->gaps = array_map(
+            fn(Gap $v): Gap => $v->getAnswerOptions()->isIncomplete()
+                ? $v->withAnswerOptions(
+                    $v->getAnswerOptions()->withIsIncomplete(true)
+                ) : $v,
+            $clone->gaps
+        );
+        return $clone;
+    }
+
     public function getRemovedGaps(
         self $old_gaps
     ): array {
@@ -174,35 +186,40 @@ function (array $c, Gap $v): array {
     public function buildGapsTypeInputs(
         Language $lng,
         FieldFactory $ff,
-        Refinery $refinery,
         array $available_gap_types,
+        Properties $properties,
+        bool $is_in_creation_context,
         array $selected_gaps
     ): Section {
         return $ff->section(
             array_reduce(
-                $selected_gaps !== []
-                    ? $this->filterGapsBySelected($selected_gaps)
-                    : $this->getUndefinedGaps(),
+                $this->retrieveGapsForInputs(
+                    $is_in_creation_context,
+                    $selected_gaps
+                ),
                 function (array $c, Gap $v) use ($ff, $available_gap_types): array {
                     $c[$v->getAnswerInputId()->toString()] = $ff->select(
                         $v->buildShortenedGapName(),
                         $available_gap_types
-                    )->withRequired(true);
+                    )->withRequired(true)
+                    ->withValue($v->getType()?->getIdentifier());
                     return $c;
                 },
                 []
             ),
             $lng->txt('select_gap_types')
         )->withAdditionalTransformation(
-            $refinery->custom()->transformation(
-                fn(array $vs): self => array_reduce(
-                    array_keys($vs),
-                    fn(self $c, string $v): self => $c->withGap(
-                        $c->gaps[$v]->withType(
-                            $this->factory->getGapTypeByIdentifier($vs[$v])
-                        )
-                    ),
-                    $this
+            $this->refinery->custom()->transformation(
+                fn(array $vs): Properties => $properties->withGaps(
+                    array_reduce(
+                        array_keys($vs),
+                        fn(self $c, string $v): self => $c->withGap(
+                            $c->gaps[$v]->withType(
+                                $this->factory->getGapTypeByIdentifier($vs[$v])
+                            )
+                        ),
+                        $this
+                    )
                 )
             )
         );
@@ -211,15 +228,16 @@ function (array $c, Gap $v) use ($ff, $available_gap_types): array {
     public function buildAnswerOptionsInputs(
         Language $lng,
         FieldFactory $ff,
-        Refinery $refinery,
-        ?string $carry,
+        Properties $properties,
+        bool $is_in_creation_context,
         array $selected_gaps
     ): Section {
         return $ff->section(
             array_reduce(
-                $selected_gaps !== []
-                    ? $this->filterGapsBySelected($selected_gaps)
-                    : $this->getGapsWithIncompleteAnswerOptions(),
+                $this->retrieveGapsForInputs(
+                    $is_in_creation_context,
+                    $selected_gaps
+                ),
                 function (array $c, Gap $v) use ($lng, $ff): array {
                     $c[$v->getAnswerInputId()->toString()] = $v->getEditAnswerOptionsSection(
                         $lng,
@@ -231,11 +249,13 @@ function (array $c, Gap $v) use ($lng, $ff): array {
             ),
             $lng->txt('add_answer_options')
         )->withAdditionalTransformation(
-            $refinery->custom()->transformation(
-                fn(array $vs): self => array_reduce(
-                    array_keys($vs),
-                    fn(self $c, string $v): self => $c->withGap($vs[$v]),
-                    $this
+            $this->refinery->custom()->transformation(
+                fn(array $vs): Properties => $properties->withGaps(
+                    array_reduce(
+                        array_keys($vs),
+                        fn(self $c, string $v): self => $c->withGap($vs[$v]),
+                        $this
+                    )
                 )
             )
         );
@@ -244,14 +264,16 @@ function (array $c, Gap $v) use ($lng, $ff): array {
     public function buildPointInputs(
         Language $lng,
         FieldFactory $ff,
-        Refinery $refinery,
+        Properties $properties,
+        bool $is_in_creation_context,
         array $selected_gaps
     ): Section {
         return $ff->section(
             array_reduce(
-                $selected_gaps !== []
-                    ? $this->filterGapsBySelected($selected_gaps)
-                    : $this->getGapsWithIncompleteAnswerOptions(),
+                $this->retrieveGapsForInputs(
+                    $is_in_creation_context,
+                    $selected_gaps
+                ),
                 function (array $c, Gap $v) use ($lng, $ff): array {
                     $c[$v->getAnswerInputId()->toString()] = $v->getEditPointsSection(
                         $lng,
@@ -263,11 +285,13 @@ function (array $c, Gap $v) use ($lng, $ff): array {
             ),
             $lng->txt('add_points')
         )->withAdditionalTransformation(
-            $refinery->custom()->transformation(
-                fn(array $vs): self => array_reduce(
-                    array_keys($vs),
-                    fn(self $c, string $v): self => $c->withGap($vs[$v]),
-                    $this
+            $this->refinery->custom()->transformation(
+                fn(array $vs): Properties => $properties->withGaps(
+                    array_reduce(
+                        array_keys($vs),
+                        fn(self $c, string $v): self => $c->withGap($vs[$v]),
+                        $this
+                    )
                 )
             )
         );
@@ -290,41 +314,25 @@ function (array $c, Gap $v): array {
         );
     }
 
-    public function getQueryCarry(): array
+    public function toCarry(): array
     {
         return array_reduce(
             $this->gaps,
             function (array $c, Gap $v): array {
-                $c[$v->getAnswerInputId()->toString()] = $v->getQueryCarry();
+                $c[$v->getAnswerInputId()->toString()] = $v->toCarry();
                 return $c;
             },
             []
         );
     }
 
-    public function getCarryInputs(
-        FieldFactory $ff
-    ): Group {
-        return $ff->group(
-            array_reduce(
-                $this->gaps,
-                function (array $c, Gap $v) use ($ff): array {
-                    $c[$v->getAnswerInputId()->toString()] = $v->getCarryInputs($ff);
-                    return $c;
-                },
-                []
-            )
-        );
-    }
-
-    public function withValuesFromQueryCarry(
-        Factory $gaps_factory,
+    public function withValuesFromCarry(
         array $carry
     ): self {
         $clone = clone $this;
         foreach ($carry as $answer_input_id => $gap_definition) {
             if (!isset($clone->gaps[$answer_input_id])) {
-                $clone->gaps[$answer_input_id] = $gaps_factory->getNewGap(
+                $clone->gaps[$answer_input_id] = $this->factory->getNewGap(
                     $this->answer_form_id,
                     0,
                     $answer_input_id
@@ -332,42 +340,21 @@ public function withValuesFromQueryCarry(
             }
 
             $clone->gaps[$answer_input_id] = $clone->gaps[$answer_input_id]
-                ->withValuesFromQueryCarry($this->factory, $gap_definition);
+                ->withValuesFromCarry(
+                    $this->refinery,
+                    $this->factory,
+                    $gap_definition
+                );
         }
 
         return $clone;
     }
 
-    public function getFromCarryTransformation(
-        Refinery $refinery,
-        Factory $gaps_factory
-    ): Transformation {
-        return $refinery->custom()->transformation(
-            function (?CarryWrapper $v) use ($refinery, $gaps_factory): self {
-                if ($v === null) {
-                    return $this;
-                }
-                $clone = clone $this;
-                $clone->gaps = array_map(
-                    fn(Gap $gap): Gap => $v->retrieve(
-                        $gap->getAnswerInputId()->toString(),
-                        $gap->getFromCarryTransformation(
-                            $refinery,
-                            $gaps_factory
-                        )
-                    ),
-                    $this->gaps
-                );
-                return $clone;
-            }
-        );
-    }
-
     public function toTableRows(
         DataRowBuilder $row_builder,
         Language $lng
     ): \Generator {
-        foreach ($this->gaps as $gap) {
+        foreach ($this->orderGapsByPosition($this->gaps) as $gap) {
             yield $gap->toTableRow(
                 $row_builder,
                 $lng
@@ -498,6 +485,7 @@ private function buildDeleteForDeletionOfAnswerForm(
             [
                 $persistence_factory->where(
                     $persistence->getForeignKeyColumn(
+                        $persistence_factory,
                         $table_name_builder,
                         $table_definition
                     ),
@@ -510,12 +498,15 @@ private function buildDeleteForDeletionOfAnswerForm(
         );
     }
 
-    private function getGapsWithIncompleteAnswerOptions(): array
-    {
-        return array_filter(
-            $this->gaps,
-            fn(Gap $v): bool => $v->getAnswerOptions()->isIncomplete()
+    private function orderGapsByPosition(
+        array $gaps
+    ): array {
+        usort(
+            $gaps,
+            fn(Gap $a, Gap $b) => $a->getPosition() <=> $b->getPosition()
         );
+
+        return $gaps;
     }
 
     private function extractIdFromTagName(
@@ -524,6 +515,21 @@ private function extractIdFromTagName(
         return mb_substr($tag_name, mb_strlen(Gap::GAP_PLACEHOLDER_NAME) + 1);
     }
 
+    private function retrieveGapsForInputs(
+        bool $is_in_creation_context,
+        array $selected_gaps
+    ): array {
+        if ($is_in_creation_context) {
+            return $this->gaps;
+        }
+
+        if ($selected_gaps === []) {
+            return $this->getIncompleteGaps();
+        }
+
+        return $this->filterGapsBySelected($selected_gaps);
+    }
+
     private function filterGapsBySelected(
         array $selected_gaps
     ): array {
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index 0ece42581068..f06049303ec6 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -45,18 +45,16 @@
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Section;
-use ILIAS\UI\Component\Input\Field\Group;
 use ILIAS\UI\Component\Table\Factory as TableFactory;
 use ILIAS\UI\Component\Table\Data as DataTable;
 use Psr\Http\Message\ServerRequestInterface;
 
 class Properties implements PropertiesInterface
 {
-    private const string KEY_ID = 'form_id';
     private const string KEY_CLOZE_TEXT = 'cloze_text';
-    private const string KEY_IDENTICAL_SCORING = 'identical_scoring';
+    private const string KEY_SCORING_IDENTICAL = 'identical_scoring';
     private const string KEY_ENABLE_COMBINATIONS = 'enable_combinations';
-    private const string KEY_GAPS_TO_EDIT = 'gaps';
+    private const string KEY_GAPS = 'gaps';
 
     private bool $updated_combinations = false;
 
@@ -210,14 +208,16 @@ public function buildBasicEditingInputs(
         Language $lng,
         FieldFactory $ff,
         Refinery $refinery,
-        Factory $propteries_factory,
+        Factory $properties_factory,
         ClozeTextFactory $cloze_text_factory,
         bool $add_legacy_cloze_text_to_input
     ): Section {
-        $cloze_text_input = $this->getClozeText()->getInput(
+        $cloze_text_input = $this->cloze_text->getInput(
             $lng,
             $ff,
-            $cloze_text_factory
+            $cloze_text_factory,
+            $this->legacy_cloze_text === ''
+                && $this->cloze_text->getRawRepresentation() !== ''
         );
 
         if ($add_legacy_cloze_text_to_input) {
@@ -229,7 +229,7 @@ public function buildBasicEditingInputs(
         return $ff->section(
             [
                 self::KEY_CLOZE_TEXT => $cloze_text_input,
-                self::KEY_IDENTICAL_SCORING => ScoringIdentical::buildInput(
+                self::KEY_SCORING_IDENTICAL => ScoringIdentical::buildInput(
                     $lng,
                     $ff,
                     $refinery,
@@ -241,110 +241,45 @@ public function buildBasicEditingInputs(
             $lng->txt('create_answer_form')
         )->withAdditionalTransformation(
             $refinery->custom()->transformation(
-                fn(array $vs): self => $propteries_factory->fromForm(
+                fn(array $vs): self => $properties_factory->fromBasicEditingForm(
                     $this,
                     $vs[self::KEY_CLOZE_TEXT],
-                    $vs[self::KEY_IDENTICAL_SCORING],
+                    $vs[self::KEY_SCORING_IDENTICAL],
                     $vs[self::KEY_ENABLE_COMBINATIONS]
                 )
             )
         );
     }
 
-    public function buildQueryCarry(): string
+    public function toCarry(): string
     {
-        return json_encode($this->gaps->getQueryCarry());
+        return json_encode([
+            self::KEY_CLOZE_TEXT => $this->cloze_text->getRawRepresentation(),
+            self::KEY_GAPS => $this->gaps->toCarry(),
+            self::KEY_SCORING_IDENTICAL => $this->scoring_identical->value,
+            self::KEY_ENABLE_COMBINATIONS => $this->combinations
+                ->areCombinationsEnabled() ? 1 : 0
+        ]);
     }
 
-    public function withValuesFromQueryCarry(
+    public function withValuesFromCarry(
         ClozeTextFactory $cloze_text_factory,
-        ?string $carry
+        array $carry
     ): self {
-        if ($carry === null
-            || !is_array(
-                ($carry_array = json_decode($carry))
-            )) {
-            return $this;
-        }
-
         $clone = clone $this;
-        $clone->gaps = $this->getGaps()->withValuesFromQueryCarry(
-            $cloze_text_factory,
-            $carry_array
-        );
-        return $clone;
-    }
-
-    public function buildCarryInputs(
-        FieldFactory $ff
-    ): Group {
-        return $ff->group(
-            [
-                self::KEY_ID => $ff->hidden()->withValue($this->answer_form_id->toString()),
-                self::FORM_KEY_CLOZE_TEXT => $this->getClozeText()->getCarryInputs($ff),
-                self::KEY_GAPS_TO_EDIT => $this->gaps->getCarryInputs($ff),
-                self::KEY_IDENTICAL_SCORING => $ff->hidden()
-                    ->withValue($this->getScoringOfIdenticalResponses()->value),
-                self::KEY_ENABLE_COMBINATIONS => $ff->hidden()
-                    ->withValue($this->combinations->areCombinationsEnabled() ? 1 : 0)
-            ]
-        );
-    }
 
-    public function withValuesFromInputs(
-        Refinery $refinery,
-        ClozeTextFactory $cloze_text_factory,
-        GapsFactory $gaps_factory,
-        CarryWrapper $carry
-    ): Properties {
-        $clone = clone $this;
-        $clone->cloze_text = $carry->retrieve(
-            self::KEY_CLOZE_TEXT,
-            $refinery->byTrying([
-                $refinery->custom()->transformation(
-                    fn(?string $v): Text => $v === null
-                        ? throw new \InvalidArgumentException()
-                        : $cloze_text_factory->buildFromHiddenInputString($v)
-                ),
-                $refinery->always($clone->cloze_text)
-            ])
+        $clone->cloze_text = $cloze_text_factory->buildFromTextString(
+            $carry[self::KEY_CLOZE_TEXT]
         );
-
-        $clone->scoring_identical = $carry->retrieve(
-            self::KEY_IDENTICAL_SCORING,
-            $refinery->byTrying([
-                $refinery->custom()->transformation(
-                    fn(?string $v): ScoringIdentical => $v === null
-                        ? throw new \InvalidArgumentException()
-                        : ScoringIdentical::tryFrom($v) ?? $clone->scoring_identical
-                ),
-                $refinery->always($clone->scoring_identical)
-            ])
+        $clone->gaps = $this->getGaps()->withValuesFromCarry(
+            $carry[self::KEY_GAPS]
         );
-
-        $clone->combinations = $carry->retrieve(
-            self::KEY_ENABLE_COMBINATIONS,
-            $refinery->byTrying([
-                $refinery->custom()->transformation(
-                    fn($v): Combinations => $clone->combinations->withCombinationsEnabled(
-                        $refinery->kindlyTo()->bool()->transform($v)
-                    )
-                ),
-                $refinery->always($clone->combinations)
-            ])
+        $clone->scoring_identical = ScoringIdentical::tryFrom(
+            $carry[self::KEY_SCORING_IDENTICAL]
         );
-
-        $clone->gaps = $carry->retrieve(
-            self::KEY_GAPS_TO_EDIT,
-            $clone->cloze_text->updateGapsFromMarkdown(
-                $this->getAnswerFormId(),
-                $this->getGaps()
-            )->getFromCarryTransformation(
-                $refinery,
-                $gaps_factory
-            )
+        $clone->combinations = $this->combinations->withCombinationsEnabled(
+            $carry[self::KEY_ENABLE_COMBINATIONS] === 1
         );
-
         return $clone;
     }
 
@@ -465,6 +400,7 @@ private function buildUpdateAnswerFormStatement(
             [
                 $persistence_factory->where(
                     $persistence->getIdColumn(
+                        $persistence_factory,
                         $table_name_builder,
                         $table_definition
                     ),
@@ -509,6 +445,7 @@ private function buildDeleteAnswerFormStatement(
             [
                 $persistence_factory->where(
                     $persistence->getForeignKeyColumn(
+                        $persistence_factory,
                         $table_name_builder,
                         $table_definition
                     ),
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
index 7fe3308d2ce2..ffa5b42c4554 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/Edit.php
@@ -24,12 +24,12 @@
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Factory as PropertiesFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\ClozeText\Factory as ClozeTextFactory;
-use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
 use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Gap;
 use ILIAS\Questions\Presentation\Definitions\Environment;
 use ILIAS\Questions\Presentation\Layout\Async;
 use ILIAS\Questions\Presentation\Layout\EditForm;
 use ILIAS\Questions\Presentation\Layout\EditOverview;
+use ILIAS\Questions\Presentation\Layout\InputsBuilderSession;
 use ILIAS\Questions\Presentation\Layout\Renderable;
 use ILIAS\HTTP\Services as HTTPServices;
 use ILIAS\Language\Language;
@@ -43,15 +43,9 @@
 class Edit implements EditViewInterface
 {
     private const string STEP_EDIT_BASIC_PROPERTIES = 'ebp';
+    private const string STEP_PROCESS_BASIC_PROPERTIES = 'pbp';
     private const string STEP_ADD_LEGACY_TEXT_BASIC_PROPERTIES = 'altbp';
     private const string STEP_CONFIRMED_GAP_REMOVAL = 'cgr';
-    private const string STEP_SET_GAP_TYPES = 'sgt';
-    public const string STEP_JUMP_TO_SET_GAP_TYPES = 'jsgt';
-    private const string STEP_SET_ANSWER_OPTIONS = 'sao';
-    public const string STEP_JUMP_TO_SET_ANSWER_OPTIONS = 'jsao';
-    private const string STEP_SET_POINTS = 'sp';
-    public const string STEP_JUMP_TO_SET_POINTS = 'jsp';
-    private const string STEP_SAVE = 's';
 
     public function __construct(
         private readonly Language $lng,
@@ -61,7 +55,7 @@ public function __construct(
         private readonly HTTPServices $http,
         private readonly PropertiesFactory $properties_factory,
         private readonly ClozeTextFactory $cloze_text_factory,
-        private readonly GapFactory $gap_factory
+        private readonly EditGaps $edit_gaps
     ) {
     }
 
@@ -72,8 +66,14 @@ public function create(
         $step = $environment->getStep();
 
         return match($step) {
-            '' => $this->buildBasicEditingForm($environment, false),
-            default => $this->callIntermediateStep($environment, $step)
+            '' => $this->startEditing($environment),
+            self::STEP_PROCESS_BASIC_PROPERTIES => $this->processBasicEditingForm(
+                $environment
+            ),
+            default => $this->forwardCmdToEditGaps(
+                $environment,
+                $step
+            )
         };
     }
 
@@ -99,18 +99,23 @@ public function edit(
                 $environment,
                 $environment->withStepParameter(self::STEP_EDIT_BASIC_PROPERTIES)
                     ->getUrlBuilder()
-                    ->buildURI()
             );
         }
 
         $environment->setEditAnswerFormBackTarget();
 
         return match ($step) {
-            self::STEP_EDIT_BASIC_PROPERTIES =>
-                $this->buildBasicEditingForm($environment, false),
+            self::STEP_EDIT_BASIC_PROPERTIES => $this->startEditing($environment),
             self::STEP_ADD_LEGACY_TEXT_BASIC_PROPERTIES =>
                 $this->addLegacyTextToBasicProperties($environment),
-            default => $this->callIntermediateStep($environment, $step)
+            self::STEP_CONFIRMED_GAP_REMOVAL,
+            self::STEP_PROCESS_BASIC_PROPERTIES => $this->processBasicEditingForm(
+                $environment->withPreservedTableRowIdsParameter()
+            ),
+            default => $this->forwardCmdToEditGaps(
+                $environment->withPreservedTableRowIdsParameter(),
+                $step
+            )
         };
     }
 
@@ -136,71 +141,65 @@ public function getFinishEditingUrl(
         return $environment->getUrlBuilder();
     }
 
-    private function callIntermediateStep(
+    private function startEditing(
+        Environment $environment
+    ): EditForm {
+        $input_builder = $this->buildInputsBuilderForBasicInputs(
+            $environment,
+            false
+        );
+        $input_builder->resetCarry();
+
+        return $this->buildBasicEditingForm(
+            $environment,
+            $input_builder,
+            false
+        );
+    }
+
+    private function forwardCmdToEditGaps(
         Environment $environment,
         string $step
     ): EditForm|Properties {
-        $initialized_environment = $environment->withPreservedTableRowIdsParameter();
+        $processed_form = $this->edit_gaps->call($environment, $step);
+        if (is_string($processed_form)) {
+            $inputs_builder = $this->buildInputsBuilderForBasicInputs(
+                $environment,
+                false,
+                $processed_form
+            );
 
-        return match ($step) {
-            self::STEP_SET_GAP_TYPES,
-            self::STEP_CONFIRMED_GAP_REMOVAL => $this->processBasicEditingForm(
-                $initialized_environment
-            ),
-            self::STEP_JUMP_TO_SET_GAP_TYPES => $this->buildGapTypesForm(
-                $initialized_environment
-            ),
-            self::STEP_SET_ANSWER_OPTIONS => $this->processGapTypesForm(
-                $initialized_environment
-            ),
-            self::STEP_JUMP_TO_SET_ANSWER_OPTIONS => $this->buildAnswerOptionsForm(
-                $initialized_environment
-            ),
-            self::STEP_SET_POINTS => $this->processAnswerOptionsForm(
-                $initialized_environment
-            ),
-            self::STEP_JUMP_TO_SET_POINTS => $this->buildAssignPointsForm(
-                $initialized_environment
-            ),
-            self::STEP_SAVE => $this->processAssignPointsForm(
-                $initialized_environment
-            )
-        };
+            $inputs_builder->persistCarry();
+
+            return $this->buildBasicEditingForm(
+                $environment,
+                $inputs_builder,
+                false
+            );
+        }
+
+        return $processed_form;
     }
 
     private function buildBasicEditingForm(
         Environment $environment,
+        InputsBuilderSession $inputs_builder,
         bool $add_legacy_cloze_text_to_input
     ): EditForm {
-
-        /** @var \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties $answer_form_properties */
-        $answer_form_properties = $environment->getAnswerFormProperties();
-
-        $editing_form = $environment->getPresentationFactory()->getEditForm(
-            $environment->withStepParameter(self::STEP_SET_GAP_TYPES),
-            $environment->getPresentationFactory()->getInputsBuilder(
-                $this->refinery->custom()->transformation(
-                    fn(null $carry) => $answer_form_properties->buildBasicEditingInputs(
-                        $this->lng,
-                        $this->ui_factory->input()->field(),
-                        $this->refinery,
-                        $this->properties_factory,
-                        $this->cloze_text_factory,
-                        $add_legacy_cloze_text_to_input
-                    )
-                )
-            ),
-            false
+        $editing_form = $this->buildEditFormForBasicInputs(
+            $environment,
+            $inputs_builder
         );
 
+        /** @var \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties $properties */
+        $properties = $environment->getAnswerFormProperties();
         if (!$add_legacy_cloze_text_to_input
-            && $answer_form_properties->getLegacyClozeText() !== ''
-            && $answer_form_properties->getClozeText()->getRawRepresentation() === '') {
+            && $properties->getLegacyClozeText() !== ''
+            && $properties->getClozeText()->getRawRepresentation() === '') {
             return $editing_form->withInsertLegacyTextsButton(
                 $environment->withStepParameter(
                     self::STEP_ADD_LEGACY_TEXT_BASIC_PROPERTIES
                 )->getUrlBuilder()
-                ->buildURI()
             );
         }
 
@@ -210,8 +209,16 @@ private function buildBasicEditingForm(
     private function addLegacyTextToBasicProperties(
         Environment $environment
     ): EditForm {
+        $inputs_builder = $this->buildInputsBuilderForBasicInputs(
+            $environment,
+            true
+        );
+
+        $inputs_builder->persistCarry();
+
         return $this->buildBasicEditingForm(
             $environment,
+            $inputs_builder,
             true
         );
     }
@@ -219,13 +226,21 @@ private function addLegacyTextToBasicProperties(
     private function processBasicEditingForm(
         Environment $environment
     ): EditForm|Properties {
+        $inputs_builder = $this->buildInputsBuilderForBasicInputs(
+            $environment,
+            false,
+        );
+
         $form = $this->buildBasicEditingForm(
             $environment,
+            $inputs_builder,
             false
         )->withRequest($this->http->request());
 
+        /** @var \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties $data */
         $data = $form->getData();
         if ($data === null) {
+            $inputs_builder->persistCarry();
             return $form;
         }
 
@@ -248,152 +263,58 @@ private function processBasicEditingForm(
             return $data;
         }
 
-        return $this->buildGapTypesForm(
-            $environment->withAnswerFormProperties($data)
-        );
-    }
-
-    private function buildGapTypesForm(
-        Environment $environment
-    ): EditForm {
-        /** @var \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties $properties */
-        $properties = $environment->getAnswerFormProperties();
-        $ff = $this->ui_factory->input()->field();
-        return $environment->getPresentationFactory()->getEditForm(
-            $environment->withStepParameter(self::STEP_SET_ANSWER_OPTIONS),
-            $environment->getPresentationFactory()->getInputsBuilder(
-                $this->refinery->custom()->transformation(
-                    fn(?string $carry) => $properties
-                        ->withValuesFromQueryCarry($carry)
-                        ->getGaps()
-                        ->buildGapsTypeInputs(
-                            $this->lng,
-                            $ff,
-                            $this->refinery,
-                            $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng),
-                            $environment->getTableRowIds()
-                        )
+        return $this->edit_gaps->call(
+            $environment->withAnswerFormProperties(
+                $data->withGaps(
+                    $data->getGaps()->withMarkedIncompleteGaps()
                 )
-            )->withCarry(
-                $properties->buildQueryCarry()
-            ),
-            false
-        )->withContentBeforeForm(
-            $properties->getClozeText()->buildPanelForEditing(
-                $this->ui_factory,
-                $this->lng,
-                $properties->getGaps(),
-                $properties->getLegacyClozeText()
             )
         );
     }
 
-    private function processGapTypesForm(
-        Environment $environment
-    ): EditForm {
-        $form = $this->buildGapTypesForm(
-            $environment
-        )->withRequest($this->http->request());
-
-        $data = $form->getData();
-        return $data === null
-            ? $form
-            : $this->buildAnswerOptionsForm(
-                $environment->withAnswerFormProperties(
-                    $environment->getAnswerFormProperties()->withGaps($data)
-                )
-            );
-    }
-
-    private function buildAnswerOptionsForm(
-        Environment $environment
+    private function buildEditFormForBasicInputs(
+        Environment $environment,
+        InputsBuilderSession $inputs_builder
     ): EditForm {
-        $properties = $environment->getAnswerFormProperties();
-        $ff = $this->ui_factory->input()->field();
         return $environment->getPresentationFactory()->getEditForm(
-            $environment->withStepParameter(self::STEP_SET_POINTS),
-            $this->refinery->custom()->transformation(
-                fn(?string $carry): Section => $properties->getGaps()
-                    ->buildAnswerOptionsInputs(
-                        $this->lng,
-                        $ff,
-                        $this->refinery,
-                        $carry,
-                        $environment->getTableRowIds()
-                    )
-            ),
-            false,
-            $properties->buildCarryInputs($ff)
-        )->withContentBeforeForm(
-            $properties->getClozeText()->buildPanelForEditing(
-                $this->ui_factory,
-                $this->lng,
-                $properties->getGaps(),
-                $properties->getLegacyClozeText()
-            )
+            $inputs_builder,
+            $environment
+                ->withStepParameter(self::STEP_PROCESS_BASIC_PROPERTIES)
+                ->getUrlBuilder(),
+            null,
+            false
         );
     }
 
-    private function processAnswerOptionsForm(
-        Environment $environment
-    ): EditForm {
-        $form = $this->buildAnswerOptionsForm(
-            $environment
-        )->withRequest($this->http->request());
-
-        $data = $form->getData();
-        return $data === null
-            ? $form
-            : $this->buildAssignPointsForm(
-                $environment->withAnswerFormProperties(
-                    $environment->getAnswerFormProperties()->withGaps($data)
+    private function buildInputsBuilderForBasicInputs(
+        Environment $environment,
+        bool $add_legacy_cloze_text_to_input,
+        ?string $carry = null
+    ): InputsBuilderSession {
+        $inputs_builder = $environment->getPresentationFactory()
+            ->getSessionBasedInputsBuilder(
+                $environment->getAnswerFormId()->toString(),
+                $this->refinery->custom()->transformation(
+                    fn(?string $carry): Section => $this->properties_factory
+                        ->fromCarry(
+                            $environment->getAnswerFormProperties(),
+                            $carry
+                        )->buildBasicEditingInputs(
+                            $this->lng,
+                            $this->ui_factory->input()->field(),
+                            $this->refinery,
+                            $this->properties_factory,
+                            $this->cloze_text_factory,
+                            $add_legacy_cloze_text_to_input
+                        )
                 )
             );
-    }
-
-    private function buildAssignPointsForm(
-        Environment $environment
-    ): EditForm {
-        $properties = $environment->getAnswerFormProperties();
-        $ff = $this->ui_factory->input()->field();
-        return $environment->getPresentationFactory()->getEditForm(
-            $environment->withStepParameter(self::STEP_SAVE),
-            $properties->getGaps()->buildPointInputs(
-                $this->lng,
-                $ff,
-                $this->refinery,
-                $environment->getTableRowIds()
-            ),
-            true,
-            $properties->buildCarryInputs($ff)
-        )->withContentBeforeForm(
-            $properties->getClozeText()->buildPanelForEditing(
-                $this->ui_factory,
-                $this->lng,
-                $properties->getGaps(),
-                $properties->getLegacyClozeText()
-            )
-        );
-    }
 
-    private function processAssignPointsForm(
-        Environment $environment
-    ): EditForm|Properties {
-        $form = $this->buildAssignPointsForm(
-            $environment
-        )->withRequest($this->http->request());
+        if ($carry === null) {
+            return $inputs_builder;
+        }
 
-        $properties = $environment->getAnswerFormProperties();
-        $data = $form->getData();
-        return $data === null
-            ? $form->withContentBeforeForm(
-                $properties->getClozeText()->buildPanelForEditing(
-                    $this->ui_factory,
-                    $this->lng,
-                    $properties->getGaps(),
-                    $properties->getLegacyClozeText()
-                )
-            ) : $properties->withGaps($data);
+        return $inputs_builder->withCarry($carry);
     }
 
     /**
diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/EditGaps.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/EditGaps.php
new file mode 100644
index 000000000000..0f27a7ef3d55
--- /dev/null
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Views/EditGaps.php
@@ -0,0 +1,550 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\AnswerFormTypes\Cloze\Views;
+
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Factory as PropertiesFactory;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties;
+use ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Gaps\Factory as GapFactory;
+use ILIAS\Questions\Presentation\Definitions\Environment;
+use ILIAS\Questions\Presentation\Layout\EditForm;
+use ILIAS\Questions\Presentation\Layout\Factory as PresentationFactory;
+use ILIAS\Questions\Presentation\Layout\InputsBuilderSession;
+use ILIAS\HTTP\Services as HTTPServices;
+use ILIAS\Language\Language;
+use ILIAS\Refinery\Custom\Transformation as CustomTransformation;
+use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Component\Input\Field\Section;
+use ILIAS\UI\URLBuilder;
+
+class EditGaps
+{
+    private const string STEP_BACK_TO_EDIT_BASIC_PROPERTIES = 'bebp';
+    private const string STEP_SET_GAP_TYPES = 'sgt';
+    private const string STEP_BACK_TO_SET_GAP_TYPES = 'bsgt';
+    public const string STEP_JUMP_TO_SET_GAP_TYPES = 'jsgt';
+    private const string STEP_SET_ANSWER_OPTIONS = 'sao';
+    private const string STEP_BACK_TO_SET_ANSWER_OPTIONS = 'bsao';
+    public const string STEP_JUMP_TO_SET_ANSWER_OPTIONS = 'jsao';
+    private const string STEP_ASSIGN_POINTS = 'ap';
+    public const string STEP_JUMP_TO_ASSIGN_POINTS = 'jap';
+    private const string STEP_SAVE = 's';
+
+    private string $step;
+    private ?string $start_step;
+
+    public function __construct(
+        private readonly Language $lng,
+        private readonly UIFactory $ui_factory,
+        private readonly Refinery $refinery,
+        private readonly HTTPServices $http,
+        private readonly PropertiesFactory $properties_factory,
+        private readonly GapFactory $gap_factory
+    ) {
+    }
+
+    public function call(
+        Environment $environment,
+        string $step = self::STEP_SET_GAP_TYPES
+    ): EditForm|Properties|string {
+        $step_array = explode('_', $step);
+        $this->step = $step_array[0];
+        $this->start_step = $this->determineStartStepFromStep(
+            $step_array[1] ?? null
+        );
+
+        return match ($this->step) {
+            self::STEP_SET_GAP_TYPES,
+            self::STEP_JUMP_TO_SET_GAP_TYPES
+                => $this->buildGapTypesFormWithCarry(
+                    $environment,
+                    $environment->getAnswerFormProperties()
+                ),
+            self::STEP_BACK_TO_EDIT_BASIC_PROPERTIES
+                => $this->backToEditBasicProperties(
+                    $environment
+                ),
+            self::STEP_BACK_TO_SET_GAP_TYPES
+                => $this->backToGapTypesForm(
+                    $environment
+                ),
+            self::STEP_SET_ANSWER_OPTIONS
+                => $this->forwardToAnswerOptionsForm(
+                    $environment
+                ),
+            self::STEP_JUMP_TO_SET_ANSWER_OPTIONS
+                => $this->buildAnswerOptionsFormWithCarry(
+                    $environment,
+                    $environment->getAnswerFormProperties()
+                ),
+            self::STEP_BACK_TO_SET_ANSWER_OPTIONS
+                => $this->backToSetAnswerOptionsForm(
+                    $environment
+                ),
+            self::STEP_ASSIGN_POINTS
+                => $this->forwardToAssignPointsForm(
+                    $environment
+                ),
+            self::STEP_JUMP_TO_ASSIGN_POINTS
+                => $this->buildAssignPointsFormWithCarry(
+                    $environment,
+                    $environment->getAnswerFormProperties()
+                ),
+            self::STEP_SAVE
+                => $this->processAssignPointsForm(
+                    $environment
+                )
+        };
+    }
+
+    private function backToEditBasicProperties(
+        Environment $environment
+    ): EditForm|string {
+        $processed_form = $this->processGapTypesForm($environment);
+        if ($processed_form instanceof EditForm) {
+            return $processed_form;
+        }
+
+        return $processed_form->toCarry();
+    }
+
+    private function backToGapTypesForm(
+        Environment $environment
+    ): EditForm {
+        $processed_form = $this->processAnswerOptionsForm($environment);
+        if ($processed_form instanceof EditForm) {
+            return $processed_form;
+        }
+
+        return $this->buildGapTypesFormWithCarry(
+            $environment,
+            $processed_form
+        );
+    }
+
+    private function buildGapTypesFormWithCarry(
+        Environment $environment,
+        Properties $properties
+    ): EditForm {
+        $inputs_builder = $this->buildInputsBuilderForTypesForm(
+            $environment->getPresentationFactory(),
+            $environment->getAnswerFormProperties(),
+            $environment->isInCreationContext(),
+            $environment->getTableRowIds()
+        )->withCarry(
+            $properties->toCarry()
+        );
+
+        $inputs_builder->persistCarry();
+
+        return $this->buildGapTypesForm(
+            $environment,
+            $inputs_builder
+        );
+    }
+
+    private function buildGapTypesForm(
+        Environment $environment,
+        InputsBuilderSession $inputs_builder
+    ): EditForm {
+        /** @var \ILIAS\Questions\AnswerFormTypes\Cloze\Properties\Properties $properties */
+        $properties = $environment->getAnswerFormProperties();
+
+        $inputs_builder->persistCarry();
+
+        return $environment->getPresentationFactory()->getEditForm(
+            $inputs_builder,
+            $this->buildPostTarget(
+                $environment,
+                self::STEP_SET_ANSWER_OPTIONS
+            ),
+            $this->step === self::STEP_JUMP_TO_SET_GAP_TYPES
+            || $this->step === $this->start_step
+                ? null
+                : $this->buildPostTarget(
+                    $environment,
+                    self::STEP_BACK_TO_EDIT_BASIC_PROPERTIES
+                ),
+            false
+        )->withContentBeforeForm(
+            $properties->getClozeText()->buildPanelForEditing(
+                $this->ui_factory,
+                $this->lng,
+                $properties->getGaps(),
+                $properties->getLegacyClozeText()
+            )
+        );
+    }
+
+    private function processGapTypesForm(
+        Environment $environment
+    ): EditForm|Properties {
+        $inputs_builder_for_types = $this->buildInputsBuilderForTypesForm(
+            $environment->getPresentationFactory(),
+            $environment->getAnswerFormProperties(),
+            $environment->isInCreationContext(),
+            $environment->getTableRowIds()
+        );
+
+        $properties = $inputs_builder_for_types->retrieveCarry(
+            $this->buildRetrievePropertiesTransformation($environment)
+        );
+
+        $form = $this->buildGapTypesForm(
+            $environment->withAnswerFormProperties($properties),
+            $inputs_builder_for_types
+        )->withRequest($this->http->request());
+
+        $data = $form->getData();
+        if ($data === null) {
+            $inputs_builder_for_types->persistCarry();
+            return $form;
+        }
+
+        return $data;
+    }
+
+    private function buildInputsBuilderForTypesForm(
+        PresentationFactory $presentation_factory,
+        Properties $properties,
+        bool $is_in_creation_context,
+        array $table_row_ids
+    ): InputsBuilderSession {
+        return $presentation_factory->getSessionBasedInputsBuilder(
+            $properties->getAnswerFormId()->toString(),
+            $this->refinery->custom()->transformation(
+                function (?string $carry) use (
+                    $properties,
+                    $is_in_creation_context,
+                    $table_row_ids
+                ): Section {
+                    $properties_from_carry = $this->properties_factory
+                    ->fromCarry(
+                        $properties,
+                        $carry
+                    );
+                    return $properties_from_carry->getGaps()->buildGapsTypeInputs(
+                        $this->lng,
+                        $this->ui_factory->input()->field(),
+                        $this->gap_factory->getAvailableGapTypesOptionsArray($this->lng),
+                        $properties_from_carry,
+                        $is_in_creation_context,
+                        $table_row_ids
+                    );
+                }
+            )
+        );
+    }
+
+    private function forwardToAnswerOptionsForm(
+        Environment $environment
+    ): EditForm {
+        $processed_form = $this->processGapTypesForm($environment);
+        if ($processed_form instanceof EditForm) {
+            return $processed_form;
+        }
+
+        return $this->buildAnswerOptionsFormWithCarry(
+            $environment,
+            $processed_form
+        );
+    }
+
+    private function backToSetAnswerOptionsForm(
+        Environment $environment
+    ): EditForm {
+        $processed_form = $this->processAssignPointsForm($environment);
+        if ($processed_form instanceof EditForm) {
+            return $processed_form;
+        }
+
+        return $this->buildAnswerOptionsFormWithCarry(
+            $environment,
+            $processed_form
+        );
+    }
+
+    private function buildAnswerOptionsFormWithCarry(
+        Environment $environment,
+        Properties $properties
+    ): EditForm {
+        $inputs_builder = $this->buildInputsBuilderForAnswerOptionsForm(
+            $environment->getPresentationFactory(),
+            $properties,
+            $environment->isInCreationContext(),
+            $environment->getTableRowIds()
+        )->withCarry(
+            $properties->toCarry()
+        );
+
+        $inputs_builder->persistCarry();
+
+        return $this->buildAnswerOptionsForm(
+            $environment->withAnswerFormProperties($properties),
+            $inputs_builder
+        );
+    }
+
+    private function buildAnswerOptionsForm(
+        Environment $environment,
+        InputsBuilderSession $inputs_builder
+    ): EditForm {
+        $properties = $environment->getAnswerFormProperties();
+        return $environment->getPresentationFactory()->getEditForm(
+            $inputs_builder,
+            $this->buildPostTarget(
+                $environment,
+                self::STEP_ASSIGN_POINTS
+            ),
+            $this->step === self::STEP_JUMP_TO_SET_ANSWER_OPTIONS
+            || $this->step === $this->start_step
+                ? null
+                : $this->buildPostTarget(
+                    $environment,
+                    self::STEP_BACK_TO_SET_GAP_TYPES
+                ),
+            false
+        )->withContentBeforeForm(
+            $properties->getClozeText()->buildPanelForEditing(
+                $this->ui_factory,
+                $this->lng,
+                $properties->getGaps(),
+                $properties->getLegacyClozeText()
+            )
+        );
+    }
+
+    private function processAnswerOptionsForm(
+        Environment $environment
+    ): EditForm|Properties {
+        $inputs_builder_for_options = $this->buildInputsBuilderForAnswerOptionsForm(
+            $environment->getPresentationFactory(),
+            $environment->getAnswerFormProperties(),
+            $environment->isInCreationContext(),
+            $environment->getTableRowIds()
+        );
+
+        $form = $this->buildAnswerOptionsForm(
+            $environment,
+            $inputs_builder_for_options
+        )->withRequest($this->http->request());
+
+        $data = $form->getData();
+        if ($data === null) {
+            $inputs_builder_for_options->persistCarry();
+            return $form;
+        }
+
+        return $data;
+    }
+
+    private function buildInputsBuilderForAnswerOptionsForm(
+        PresentationFactory $presentation_factory,
+        Properties $properties,
+        bool $is_in_creation_context,
+        array $table_row_ids
+    ): InputsBuilderSession {
+        return $presentation_factory->getSessionBasedInputsBuilder(
+            $properties->getAnswerFormId()->toString(),
+            $this->refinery->custom()->transformation(
+                function (?string $carry) use (
+                    $properties,
+                    $is_in_creation_context,
+                    $table_row_ids
+                ): Section {
+                    $properties_from_carry = $this->properties_factory
+                        ->fromCarry(
+                            $properties,
+                            $carry
+                        );
+                    return $properties_from_carry->getGaps()
+                        ->buildAnswerOptionsInputs(
+                            $this->lng,
+                            $this->ui_factory->input()->field(),
+                            $properties_from_carry,
+                            $is_in_creation_context,
+                            $table_row_ids
+                        );
+                }
+            )
+        );
+    }
+
+    private function forwardToAssignPointsForm(
+        Environment $environment
+    ): EditForm {
+        $processed_form = $this->processAnswerOptionsForm($environment);
+        if ($processed_form instanceof EditForm) {
+            return $processed_form;
+        }
+
+        return $this->buildAssignPointsFormWithCarry(
+            $environment,
+            $processed_form
+        );
+    }
+
+    private function buildAssignPointsFormWithCarry(
+        Environment $environment,
+        Properties $properties
+    ): EditForm {
+        $inputs_builder_for_points = $this->buildInputsBuilderForPointsForm(
+            $environment->getPresentationFactory(),
+            $properties,
+            $environment->isInCreationContext(),
+            $environment->getTableRowIds()
+        )->withCarry(
+            $properties->toCarry()
+        );
+
+        $inputs_builder_for_points->persistCarry();
+
+        return $this->buildAssignPointsForm(
+            $environment->withAnswerFormProperties($properties),
+            $inputs_builder_for_points
+        );
+    }
+
+    private function buildAssignPointsForm(
+        Environment $environment,
+        InputsBuilderSession $inputs_builder
+    ): EditForm {
+        $properties = $environment->getAnswerFormProperties();
+        return $environment->getPresentationFactory()->getEditForm(
+            $inputs_builder,
+            $this->buildPostTarget(
+                $environment,
+                self::STEP_SAVE
+            ),
+            $this->step === self::STEP_JUMP_TO_ASSIGN_POINTS
+                ? null
+                : $this->buildPostTarget(
+                    $environment,
+                    self::STEP_BACK_TO_SET_ANSWER_OPTIONS
+                ),
+            true
+        )->withContentBeforeForm(
+            $properties->getClozeText()->buildPanelForEditing(
+                $this->ui_factory,
+                $this->lng,
+                $properties->getGaps(),
+                $properties->getLegacyClozeText()
+            )
+        );
+    }
+
+    private function processAssignPointsForm(
+        Environment $environment
+    ): EditForm|Properties {
+        $inputs_builder_for_points = $this->buildInputsBuilderForPointsForm(
+            $environment->getPresentationFactory(),
+            $environment->getAnswerFormProperties(),
+            $environment->isInCreationContext(),
+            $environment->getTableRowIds()
+        );
+
+        $form = $this->buildAssignPointsForm(
+            $environment,
+            $inputs_builder_for_points
+        )->withRequest($this->http->request());
+
+        $data = $form->getData();
+        if ($data === null) {
+            $inputs_builder_for_points->persistCarry();
+            return $form;
+        }
+
+        return $data;
+    }
+
+    private function buildInputsBuilderForPointsForm(
+        PresentationFactory $presentation_factory,
+        Properties $properties,
+        bool $is_in_creation_context,
+        array $table_row_ids
+    ): InputsBuilderSession {
+        return $presentation_factory->getSessionBasedInputsBuilder(
+            $properties->getAnswerFormId()->toString(),
+            $this->refinery->custom()->transformation(
+                function (?string $carry) use (
+                    $properties,
+                    $is_in_creation_context,
+                    $table_row_ids
+                ): Section {
+                    $properties_from_carry = $this->properties_factory
+                        ->fromCarry(
+                            $properties,
+                            $carry
+                        );
+                    return $properties_from_carry->getGaps()
+                        ->buildPointInputs(
+                            $this->lng,
+                            $this->ui_factory->input()->field(),
+                            $properties_from_carry,
+                            $is_in_creation_context,
+                            $table_row_ids
+                        );
+                }
+            )
+        );
+    }
+
+    private function buildPostTarget(
+        Environment $environment,
+        string $next_step
+    ): URLBuilder {
+        if ($this->start_step !== null) {
+            $next_step = "{$next_step}_{$this->start_step}";
+        }
+
+        return $environment->withStepParameter($next_step)->getUrlBuilder();
+    }
+
+    private function determineStartStepFromStep(
+        ?string $start_step_from_get
+    ): ?string {
+        if ($start_step_from_get !== null) {
+            return $start_step_from_get;
+        }
+
+        if ($this->step === self::STEP_JUMP_TO_SET_GAP_TYPES) {
+            return self::STEP_BACK_TO_SET_GAP_TYPES;
+        }
+
+        if ($this->step === self::STEP_JUMP_TO_SET_ANSWER_OPTIONS) {
+            return self::STEP_BACK_TO_SET_ANSWER_OPTIONS;
+        }
+
+        return null;
+    }
+
+    private function buildRetrievePropertiesTransformation(
+        Environment $environment
+    ): CustomTransformation {
+        return $this->refinery->custom()->transformation(
+            fn(?string $carry): Properties => $this->properties_factory
+                ->fromCarry(
+                    $environment->getAnswerFormProperties(),
+                    $carry
+                )
+        );
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php b/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
index 900612a6949a..4a3f3a8467c2 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/Environment.php
@@ -22,6 +22,7 @@
 
 use ILIAS\Questions\AnswerForm\Properties;
 use ILIAS\Questions\Presentation\Layout\Factory;
+use ILIAS\Data\UUID\Uuid;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
 
@@ -52,6 +53,16 @@ public function withDefaultStep(): self;
 
     public function getEditability(): Editability;
 
+    public function isInCreationContext(): bool;
+
+    /**
+     * Returns the answer form id of the current context either from the answer
+     * form properties, if available, or from the corresponding get parameter.
+     * There should always be one of the two ids availabe, but be aware that
+     * is not guaranteed, e.g. if somebody messed with the URI.
+     */
+    public function getAnswerFormId(): ?Uuid;
+
     public function getAnswerFormProperties(): ?Properties;
 
     public function withAnswerFormProperties(
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
index d33ec5be9737..185578cdc160 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
@@ -30,7 +30,6 @@
 use ILIAS\Language\Language;
 use ILIAS\Refinery\Factory as Refinery;
 use ILIAS\Refinery\Transformation;
-use ILIAS\UI\Component\Input\Input;
 use ILIAS\UI\URLBuilder;
 use ILIAS\UI\URLBuilderToken;
 
@@ -40,9 +39,9 @@ class EnvironmentImplementation implements Environment
     private const string TOKEN_STRING_ACTION = 'a';
     private const string TOKEN_STRING_STEP = 's';
     private const string TOKEN_STRING_QUESTION_ID = 'q';
-    private const string TOKEN_STRING_TYPE_HASH = 't';
     private const string TOKEN_STRING_TABLE_ROW_ID = 'r';
-    private const string TOKEN_STRING_CARRY_ID = 'c';
+    private const string TOKEN_STRING_TYPE_HASH = 't';
+    private const string TOKEN_STRING_ANSWER_FORM_ID = 'af';
     private const string TOKEN_STRING_CREATE_MODE = 'cm';
 
     private const string PARAMETER_STRING_HIER_ID = 'hier_id';
@@ -51,15 +50,19 @@ class EnvironmentImplementation implements Environment
 
     private const string TAB_ID_ANSWER_FORM = 'answer_form';
 
-    private ?Properties $properties = null;
+    private ?Properties $answer_form_properties = null;
 
     private bool $default_step = false;
+    private bool $is_in_creation_context = false;
 
     private URLBuilder $url_builder;
     private readonly URLBuilderToken $action_token;
     private readonly URLBuilderToken $step_token;
     private readonly URLBuilderToken $question_id_token;
     private readonly URLBuilderToken $table_row_token;
+    private ?URLBuilderToken $type_hash_token = null;
+    private ?URLBuilderToken $answer_form_id_token = null;
+    private ?URLBuilderToken $create_mode_token = null;
 
     private ?array $table_row_ids = null;
 
@@ -155,10 +158,41 @@ public function getEditability(): Editability
         return $this->editability;
     }
 
+    #[\Override]
+    public function isInCreationContext(): bool
+    {
+        return $this->is_in_creation_context;
+    }
+
+    #[\Override]
+    public function getAnswerFormId(): ?Uuid
+    {
+        if ($this->answer_form_properties !== null) {
+            return $this->answer_form_properties->getAnswerFormId();
+        }
+
+        $answer_form_id_token = $this->answer_form_id_token;
+        if ($answer_form_id_token === null) {
+            [,$answer_form_id_token] = $this->url_builder->acquireParameter(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::TOKEN_STRING_ANSWER_FORM_ID
+            );
+        }
+        return $this->http->wrapper()->query()->retrieve(
+            $answer_form_id_token->getName(),
+            $this->refinery->byTrying([
+                $this->refinery->custom()->transformation(
+                    $this->buildRetrieveUuidClosure()
+                ),
+                $this->refinery->always(null)
+            ])
+        );
+    }
+
     #[\Override]
     public function getAnswerFormProperties(): ?Properties
     {
-        return $this->properties;
+        return $this->answer_form_properties;
     }
 
     #[\Override]
@@ -166,7 +200,7 @@ public function withAnswerFormProperties(
         Properties $properties
     ): self {
         $clone = clone $this;
-        $clone->properties = $properties;
+        $clone->answer_form_properties = $properties;
         return $clone;
     }
 
@@ -211,6 +245,14 @@ public function withPreservedTableRowIdsParameter(): self
         return $clone;
     }
 
+    public function withIsInCreationContext(
+        bool $is_in_creation_context
+    ): self {
+        $clone = clone $this;
+        $clone->is_in_creation_context = $is_in_creation_context;
+        return $clone;
+    }
+
     public function getObjId(): int
     {
         return $this->obj_id;
@@ -242,50 +284,53 @@ public function withQuestionIdParameter(
     public function withAnswerFormTypeHashParameter(
         string $type_hash
     ): self {
+        $clone = clone $this;
         [
-            $url_builder,
-            $type_hash_token
+            $clone->url_builder,
+            $clone->type_hash_token
         ] = $this->url_builder->acquireParameter(
             self::QUERY_PARAMETER_NAME_SPACE,
             self::TOKEN_STRING_TYPE_HASH
         );
 
-        $clone = clone $this;
-        $clone->url_builder = $url_builder
-            ->withParameter($type_hash_token, $type_hash);
+        $clone->url_builder = $clone->url_builder
+            ->withParameter($clone->type_hash_token, $type_hash);
         return $clone;
     }
 
-    public function withCarryParameter(
-        string $carry
+    public function withAnswerFormIdParameter(
+        Uuid $answer_form_id
     ): self {
+        $clone = clone $this;
         [
-            $url_builder,
-            $carry_token
+            $clone->url_builder,
+            $clone->answer_form_id_token
         ] = $this->url_builder->acquireParameter(
             self::QUERY_PARAMETER_NAME_SPACE,
-            self::TOKEN_STRING_CARRY_ID
+            self::TOKEN_STRING_ANSWER_FORM_ID
         );
 
-        $clone = clone $this;
-        $clone->url_builder = $url_builder
-            ->withParameter($carry_token, $carry);
+        $clone->url_builder = $clone->url_builder->withParameter(
+            $clone->answer_form_id_token,
+            $answer_form_id->toString()
+        );
         return $clone;
     }
 
     public function withCreateModeParameter(): self
     {
+        $clone = clone $this;
+
         [
-            $url_builder,
-            $create_mode_token
+            $clone->url_builder,
+            $clone->create_mode_token
         ] = $this->url_builder->acquireParameter(
             self::QUERY_PARAMETER_NAME_SPACE,
             self::TOKEN_STRING_CREATE_MODE
         );
 
-        $clone = clone $this;
-        $clone->url_builder = $url_builder
-            ->withParameter($create_mode_token, '1');
+        $clone->url_builder = $clone->url_builder
+            ->withParameter($clone->create_mode_token, '1');
         return $clone;
     }
 
@@ -295,7 +340,7 @@ public function getQuestionId(): ?Uuid
             $this->question_id_token->getName(),
             $this->refinery->byTrying([
                 $this->refinery->custom()->transformation(
-                    $this->buildRetrieveQuestionIdClosure()
+                    $this->buildRetrieveUuidClosure()
                 ),
                 $this->refinery->always(null)
             ])
@@ -319,7 +364,7 @@ public function getQuestionIds(): array|string|null
                 ),
                 $this->refinery->kindlyTo()->listOf(
                     $this->refinery->custom()->transformation(
-                        $this->buildRetrieveQuestionIdClosure()
+                        $this->buildRetrieveUuidClosure()
                     )
                 ),
                 $this->refinery->always(null)
@@ -328,7 +373,7 @@ public function getQuestionIds(): array|string|null
             self::INTERRUPTIVE_ITEMS_KEY,
             $this->refinery->kindlyTo()->listOf(
                 $this->refinery->custom()->transformation(
-                    $this->buildRetrieveQuestionIdClosure()
+                    $this->buildRetrieveUuidClosure()
                 )
             ),
             $this->refinery->always(null)
@@ -337,32 +382,25 @@ public function getQuestionIds(): array|string|null
 
     public function getTypeClassHash(): string
     {
-        [,$type_hash_token] = $this->url_builder->acquireParameter(
-            self::QUERY_PARAMETER_NAME_SPACE,
-            self::TOKEN_STRING_TYPE_HASH
-        );
+        $type_hash_token = $this->type_hash_token;
+        if ($type_hash_token === null) {
+            [,$type_hash_token] = $this->url_builder->acquireParameter(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::TOKEN_STRING_TYPE_HASH
+            );
+        }
         return $this->retrieveStringValueForToken($type_hash_token);
     }
 
-    public function getCarry(
-        Transformation $to_form_transformation
-    ): Input|array|null {
-        [, $carry_token] = $this->url_builder->acquireParameter(
-            self::QUERY_PARAMETER_NAME_SPACE,
-            self::TOKEN_STRING_CARRY_ID
-        );
-        return $this->http->wrapper()->query()->retrieve(
-            $carry_token->getName(),
-            $to_form_transformation
-        );
-    }
-
     public function isCreateModeSimple(): bool
     {
-        [, $create_mode_token] = $this->url_builder->acquireParameter(
-            self::QUERY_PARAMETER_NAME_SPACE,
-            self::TOKEN_STRING_CREATE_MODE
-        );
+        $create_mode_token = $this->create_mode_token;
+        if ($create_mode_token === null) {
+            [, $create_mode_token] = $this->url_builder->acquireParameter(
+                self::QUERY_PARAMETER_NAME_SPACE,
+                self::TOKEN_STRING_CREATE_MODE
+            );
+        }
 
         return $this->http->wrapper()->query()->has(
             $create_mode_token->getName()
@@ -481,7 +519,7 @@ private function buildStringTrafo(): Transformation
         ]);
     }
 
-    private function buildRetrieveQuestionIdClosure(): \Closure
+    private function buildRetrieveUuidClosure(): \Closure
     {
         return fn($v): Uuid => is_string($v)
             ? $this->uuid_factory->fromString($v)
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
index 0b718c1d13cf..22ffaa90cd42 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
@@ -20,15 +20,15 @@
 
 namespace ILIAS\Questions\Presentation\Layout;
 
-use ILIAS\Questions\Presentation\Definitions\Environment;
-use ILIAS\Data\URI;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Component\MessageBox\MessageBox;
 use ILIAS\UI\Component\Input\Container\Form\Standard as StandardForm;
+use ILIAS\UI\Component\Input\Input;
 use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\UI\Renderer as UIRenderer;
+use ILIAS\UI\URLBuilder;
 use Psr\Http\Message\ServerRequestInterface;
 
 class EditForm implements Renderable
@@ -45,13 +45,15 @@ class EditForm implements Renderable
     public function __construct(
         private readonly UIFactory $ui_factory,
         private readonly Language $lng,
-        Environment $environment,
-        InputsBuilder $inputs_builder,
+        Input|InputsBuilder $inputs,
+        URLBuilder $default_form_action,
+        ?URLBuilder $back_form_action,
         bool $is_final_step
     ) {
         $this->form = $this->buildForm(
-            $environment,
-            $inputs_builder,
+            $inputs,
+            $default_form_action,
+            $back_form_action,
             $is_final_step
         );
     }
@@ -88,7 +90,7 @@ public function withConfirmation(
     }
 
     public function withInsertLegacyTextsButton(
-        URI $target_uri
+        URLBuilder $target_builder
     ): self {
         $clone = clone $this;
         $clone->insert_legacy_text_button = $this->ui_factory->messageBox()->info(
@@ -96,7 +98,7 @@ public function withInsertLegacyTextsButton(
         )->withButtons([
             $this->ui_factory->button()->standard(
                 $this->lng->txt('insert_legacy_texts'),
-                $target_uri->__toString()
+                $target_builder->buildURI()->__toString()
             )
         ]);
         return $clone;
@@ -152,27 +154,35 @@ function ($id) {
     }
 
     private function buildForm(
-        Environment $environment,
-        InputsBuilder $inputs_builder,
+        Input|InputsBuilder $inputs,
+        URLBuilder $default_form_action,
+        ?URLBuilder $back_form_action,
         bool $is_final_step
     ): StandardForm {
+        if ($inputs instanceof InputsBuilder) {
+            $inputs = $inputs->getInputs();
+        }
         $form = $this->ui_factory->input()->container()->form()->standard(
-            $inputs_builder
-                ->addCarryToEnvironment($environment)
-                ->getUrlBuilder()
-                ->buildURI()
-                ->__toString(),
+            $default_form_action->buildURI()->__toString(),
             [
-                self::MAIN_SECTION_NAME => $inputs_builder->getInputs(
-                    $environment
-                )
+                self::MAIN_SECTION_NAME => $inputs
             ]
         );
 
+        if ($back_form_action !== null) {
+            $form = $form->withAdditionalFormAction(
+                $back_form_action->buildURI()->__toString(),
+                $this->lng->txt('previous')
+            );
+        }
+
+        $submit_action_label = 'next';
         if ($is_final_step) {
-            return $form->withSubmitLabel($this->lng->txt('save'));
+            $submit_action_label = 'save';
         }
 
-        return $form->withSubmitLabel($this->lng->txt('next'));
+        return $form->withSubmitLabel(
+            $this->lng->txt($submit_action_label)
+        );
     }
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php b/components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php
index fe795f394183..95651e4c55c5 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/EditOverview.php
@@ -22,11 +22,11 @@
 
 use ILIAS\Questions\Presentation\Definitions\Editability;
 use ILIAS\Questions\Presentation\Definitions\Environment;
-use ILIAS\Data\URI;
 use ILIAS\Language\Language;
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\UI\Renderer as UIRenderer;
+use ILIAS\UI\URLBuilder;
 use Psr\Http\Message\ServerRequestInterface;
 
 class EditOverview implements Renderable
@@ -36,7 +36,7 @@ public function __construct(
         private readonly Language $lng,
         private readonly ServerRequestInterface $request,
         private readonly Environment $environment,
-        private readonly URI $uri_to_edit_basic_answer_form_properties
+        private readonly URLBuilder $target_to_edit_basic_answer_form_properties
     ) {
     }
 
@@ -70,7 +70,9 @@ private function buildBasicAnswerFormPanel(): StandardPanel
         if ($this->environment->getEditability() === Editability::Full) {
             $content[] = $this->ui_factory->button()->standard(
                 $this->lng->txt('edit_basic_answer_form_properties'),
-                $this->uri_to_edit_basic_answer_form_properties->__toString()
+                $this->target_to_edit_basic_answer_form_properties
+                    ->buildURI()
+                    ->__toString()
             );
         }
 
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
index b6848cfbcfe2..acb7c77337f9 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
@@ -20,28 +20,21 @@
 
 namespace ILIAS\Questions\Presentation\Layout;
 
-use ILIAS\Questions\Presentation\Definitions\CarryWrapper;
 use ILIAS\Questions\Presentation\Definitions\Environment;
-use ILIAS\Questions\Presentation\Definitions\Leaf;
-use ILIAS\Data\URI;
 use ILIAS\HTTP\Services as HttpService;
-use ILIAS\HTTP\Wrapper\ArrayBasedRequestWrapper;
 use ILIAS\Language\Language;
-use ILIAS\Refinery\Custom\Transformation as CustomTransformation;
-use ILIAS\Refinery\Factory as Refinery;
+use ILIAS\Refinery\Transformation;
 use ILIAS\UI\Factory as UIFactory;
-use ILIAS\UI\Component\Input\Field\Section;
-use ILIAS\UI\Component\Input\Field\Group;
 use ILIAS\UI\Component\Input\Input;
 use ILIAS\UI\Component\MessageBox\MessageBox;
 use ILIAS\UI\Component\Modal\Interruptive as InterruptiveModal;
 use ILIAS\UI\Component\Modal\RoundTrip as RoundTripModal;
+use ILIAS\UI\URLBuilder;
 
 class Factory
 {
     public function __construct(
         private readonly UIFactory $ui_factory,
-        private readonly Refinery $refinery,
         private readonly HttpService $http,
         private readonly Language $lng
     ) {
@@ -49,14 +42,14 @@ public function __construct(
 
     public function getEditOverview(
         Environment $environment,
-        URI $uri_to_edit_basic_answer_form_properties
+        URLBuilder $target_to_edit_basic_answer_form_properties
     ): EditOverview {
         return new EditOverview(
             $this->ui_factory,
             $this->lng,
             $this->http->request(),
             $environment,
-            $uri_to_edit_basic_answer_form_properties
+            $target_to_edit_basic_answer_form_properties
         );
     }
 
@@ -65,18 +58,18 @@ public function getEditOverview(
      * to which the form shall be sent.
      */
     public function getEditForm(
-        Environment $environment,
-        Section $main_section_inputs,
-        bool $is_final_step,
-        ?Group $carry_inputs = null
+        Input|InputsBuilder $main_section_inputs,
+        URLBuilder $default_form_action,
+        ?URLBuilder $back_form_action,
+        bool $is_final_step
     ): EditForm {
         return new EditForm(
             $this->ui_factory,
             $this->lng,
-            $environment,
             $main_section_inputs,
-            $is_final_step,
-            $carry_inputs
+            $default_form_action,
+            $back_form_action,
+            $is_final_step
         );
     }
 
@@ -89,18 +82,12 @@ public function getAsync(
         );
     }
 
-    /**
-     * @param CustomTransformation $to_inputs This MUST return an `array` of
-     * inputs that will then be used in the form. The transformation will receive
-     * the string produced by `$to_carry` as parameter.
-     * @param Input|array|null $inputs If you provide inputs it is assumed that no
-     * carry is present and you want to use them directly.
-     */
-    public function getInputsBuilder(
-        CustomTransformation $to_inputs
-    ): InputsBuilder {
-        return new InputsBuilder(
-            $this->refinery,
+    public function getSessionBasedInputsBuilder(
+        string $storage_key,
+        Transformation $to_inputs
+    ): InputsBuilderSession {
+        return new InputsBuilderSession(
+            $storage_key,
             $to_inputs
         );
     }
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php b/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php
index 3d11c950b940..10bcd3ec1389 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilder.php
@@ -20,74 +20,9 @@
 
 namespace ILIAS\Questions\Presentation\Layout;
 
-use ILIAS\Questions\Presentation\Definitions\Environment;
-use ILIAS\Questions\Presentation\Definitions\EnvironmentImplementation;
-use ILIAS\Refinery\Factory as Refinery;
-use ILIAS\Refinery\Custom\Transformation as CustomTransformation;
-use ILIAS\UI\Component\Input\Input;
+use ILIAS\UI\Component\Input\Field\Section;
 
-/**
- * This is a InputBuilder for multipart forms. It allows you to carry the necessary
- * information from one page of the form to the next in the query. Be aware that
- * you are thoroughly limited in the amount of information that you can carry over,
- * so make sure to just set the minimum you absolutely need.
- */
-class InputsBuilder
+interface InputsBuilder
 {
-    private ?string $carry = null;
-
-    /**
-     * @param CustomTransformation $to_inputs This Transformation receives the
-     * value set by `self::withCarry()` if it is available, otherwise the value
-     * will be null.
-     */
-    public function __construct(
-        private readonly Refinery $refinery,
-        private readonly CustomTransformation $to_inputs
-    ) {
-    }
-
-    /**
-     * @param string $carry The `string` will be `base64-encoded` before
-     * adding it to the `Query`. The string will be passed to the `$to_inputs`
-     * transformation to allow the recreation of the inputs.
-     */
-    public function withCarry(
-        string $carry
-    ): self {
-        $clone = clone $this;
-        $clone->carry = $carry;
-        return $clone;
-    }
-
-    public function addCarryToEnvironment(
-        EnvironmentImplementation $environment
-    ): Environment {
-        return $environment->withCarryParameter(
-            $this->carry === null
-                ? $environment->getCarry($this->refinery->identity())
-                : base64_encode($this->carry)
-        );
-    }
-
-    /**
-     * @return \ILIAS\UI\Component\Input\Input|array|null The return value will
-     * be null, if no inputs could be built. This is a sign that something is
-     * wrong with carry. This might mean that there is a mistake in the carry
-     * that was set, but it can also be the consequence of somebody messing
-     * with the query.
-     */
-    public function getInputs(
-        EnvironmentImplementation $environment
-    ): Input|array|null {
-        return $environment->getCarry(
-            $this->refinery->custom()->transformation(
-                fn(?string $v): Input|array|null => $this->to_inputs->transform(
-                    $v === null
-                        ? null
-                        : base64_decode($v)
-                )
-            )
-        );
-    }
+    public function getInputs(): Section;
 }
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilderSession.php b/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilderSession.php
new file mode 100644
index 000000000000..ee466a5b4c3f
--- /dev/null
+++ b/components/ILIAS/Questions/src/Presentation/Layout/InputsBuilderSession.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *********************************************************************/
+
+declare(strict_types=1);
+
+namespace ILIAS\Questions\Presentation\Layout;
+
+use ILIAS\Refinery\Transformation;
+use ILIAS\UI\Component\Input\Field\Section;
+
+/**
+ * This is a InputBuilder for multipart forms. It allows you to carry the necessary
+ * information from one page of the form to the next in the session.
+ */
+class InputsBuilderSession implements InputsBuilder
+{
+    private ?string $carry = null;
+
+    /**
+     * @param Transformation $to_inputs This Transformation receives the
+     * value previously set by `self::withCarry()` if it is available, otherwise
+     * the value will be null.
+     */
+    public function __construct(
+        private readonly string $storage_key,
+        private readonly Transformation $to_inputs
+    ) {
+    }
+
+    public function withCarry(
+        string $carry
+    ): self {
+        $clone = clone $this;
+        $clone->carry = $carry;
+        return $clone;
+    }
+
+    public function persistCarry(): void
+    {
+        if ($this->carry === null) {
+            $this->loadCarryFromSessionAndClear();
+        }
+        \ilSession::set($this->storage_key, $this->carry);
+    }
+
+    public function resetCarry(): void
+    {
+        \ilSession::clear($this->storage_key);
+    }
+
+    public function retrieveCarry(
+        Transformation $transformation
+    ): mixed {
+        if ($this->carry === null) {
+            $this->loadCarryFromSessionAndClear();
+        }
+
+        return $transformation->transform($this->carry);
+    }
+
+    public function getInputs(): Section
+    {
+        if ($this->carry === null) {
+            $this->loadCarryFromSessionAndClear();
+        }
+        return $this->to_inputs->transform($this->carry);
+    }
+
+    private function loadCarryFromSessionAndClear(): void
+    {
+        $this->carry = \ilSession::get($this->storage_key);
+        \ilSession::clear($this->storage_key);
+    }
+}
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 2aa339784cae..c13d3edf735e 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -129,7 +129,9 @@ public function show(
         );
 
         return match($environment->getAction()) {
-            self::ACTION_CREATE_QUESTION => $this->createQuestion($environment),
+            self::ACTION_CREATE_QUESTION => $this->createQuestion(
+                $environment->withIsInCreationContext(true)
+            ),
             self::ACTION_EDIT_QUESTION => $this->editQuestion($environment),
             self::ACTION_DELETE_QUESTIONS => $this->deleteQuestions($environment),
             default => $this->showTable($toolbar, $environment)
@@ -181,7 +183,8 @@ public function createAnswerForm(
         $environment = $this->buildEnvironment(
             $base_uri,
             $obj_id
-        )->withActionParameter(self::ACTION_CREATE_ANSWER_FORM)
+        )->withIsInCreationContext(true)
+        ->withActionParameter(self::ACTION_CREATE_ANSWER_FORM)
         ->withQuestionIdParameter($question->getId());
 
         $answer_form_type_class_hash = $environment->getTypeClassHash();
@@ -195,7 +198,8 @@ public function createAnswerForm(
                     $type->buildProperties(
                         $this->answer_form_factory->getDefaultTypeGenericProperties(
                             $question->getId(),
-                            $type
+                            $type,
+                            $environment->getAnswerFormId(),
                         ),
                         null
                     )
@@ -430,7 +434,11 @@ private function forwardCreateAnswerFormCmd(
         \ilPCAnswerForm $content_object,
         AnswerFormEditView $answer_form_edit_view
     ): ?EditForm {
-        $create = $answer_form_edit_view->create($environment);
+        $create = $answer_form_edit_view->create(
+            $environment->withAnswerFormIdParameter(
+                $environment->getAnswerFormId()
+            )
+        );
 
         if ($create instanceof EditForm) {
             return $create;
@@ -545,7 +553,6 @@ private function buildCreateAnswerForm(
         }
 
         return $environment->getPresentationFactory()->getEditForm(
-            $environment,
             $if->field()->section(
                 $inputs + [
                     'type' => $if->field()->select(
@@ -561,6 +568,8 @@ private function buildCreateAnswerForm(
                 ],
                 $this->lng->txt('create_answer_form')
             ),
+            $environment->getUrlBuilder(),
+            null,
             false
         );
     }
diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index f51e86f1b11e..9684c49010f2 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -107,11 +107,14 @@ private function buildBasicPropertiesCreateForm(
         }
 
         return $environment->getPresentationFactory()->getEditForm(
-            $environment->withStepParameter(self::CMD_SAVE_QUESTION),
             $ff->section(
                 $inputs,
                 $this->lng->txt('edit_basic_form_properties')
             ),
+            $environment
+                ->withStepParameter(self::CMD_SAVE_QUESTION)
+                ->getUrlBuilder(),
+            null,
             false
         );
     }
@@ -136,17 +139,18 @@ private function buildBasicPropertiesEditingForm(
         EnvironmentImplementation $environment
     ): EditForm {
         return $environment->getPresentationFactory()->getEditForm(
-            $environment->withStepParameter(self::CMD_SAVE_QUESTION),
-            $environment->getPresentationFactory()->getInputsBuilder(
-                $this->ui_factory->input()->field()->section(
-                    $this->buildBasicPropertiesInputs(),
-                    $this->lng->txt('edit_basic_form_properties')
-                )->withAdditionalTransformation(
-                    $this->buildAddBasicPropertiesToQuestionTrafo()
-                )->withValue(
-                    $this->buildBasicPropertiesBasicValuesArray()
-                )
+            $this->ui_factory->input()->field()->section(
+                $this->buildBasicPropertiesInputs(),
+                $this->lng->txt('edit_basic_form_properties')
+            )->withAdditionalTransformation(
+                $this->buildAddBasicPropertiesToQuestionTrafo()
+            )->withValue(
+                $this->buildBasicPropertiesBasicValuesArray()
             ),
+            $environment
+                ->withStepParameter(self::CMD_SAVE_QUESTION)
+                ->getUrlBuilder(),
+            null,
             true
         );
     }

From 68ee6149f13bb849582700c1d0ba99008f4c470e Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 18 Feb 2026 14:46:36 +0100
Subject: [PATCH 135/141] Questions: Make Create Button Primary

---
 components/ILIAS/Questions/src/Presentation/Views/Edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index c13d3edf735e..87722931dfdf 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -371,7 +371,7 @@ private function showTable(
         EnvironmentImplementation $environment
     ): QuestionsTable {
         $toolbar->addComponent(
-            $this->ui_factory->button()->standard(
+            $this->ui_factory->button()->primary(
                 $this->lng->txt('create'),
                 $environment->withActionParameter(self::ACTION_CREATE_QUESTION)
                     ->getUrlBuilder()

From f677bcd51b83c0932f08603c28d4cb591b81113f Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 18 Feb 2026 14:49:11 +0100
Subject: [PATCH 136/141] Questions: Change LangVar for Gap-Placeholder

---
 .../src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
index b1eba9f89ad4..54868bb3e3f7 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/ClozeText/Text.php
@@ -30,7 +30,6 @@
 use ILIAS\UI\Factory as UIFactory;
 use ILIAS\UI\Component\Input\Field\Factory as FieldFactory;
 use ILIAS\UI\Component\Input\Field\Markdown as MarkdownInput;
-use ILIAS\UI\Component\Input\Field\Hidden as HiddenInput;
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use Mustache\Engine;
 
@@ -54,7 +53,7 @@ public function getInput(
             new \ilUIMarkdownPreviewGUI(),
             $lng->txt('cloze_text')
         )->withMustacheVariables([
-            Gap::GAP_PLACEHOLDER_NAME => $lng->txt('gap')
+            Gap::GAP_PLACEHOLDER_NAME => $lng->txt('insert_a_gap')
         ])->withAdditionalTransformation(
             $this->refinery->custom()->transformation(
                 fn(string $v): self => $cloze_text_factory->buildFromTextString($v)

From a791c2480130c88cfbfd90153e223f2a2ef6f57f Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 18 Feb 2026 15:10:54 +0100
Subject: [PATCH 137/141] Questions: Fix Requirement of ClozeText

---
 .../src/AnswerFormTypes/Cloze/Properties/Properties.php        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index f06049303ec6..6a84e536af7d 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -217,7 +217,8 @@ public function buildBasicEditingInputs(
             $ff,
             $cloze_text_factory,
             $this->legacy_cloze_text === ''
-                && $this->cloze_text->getRawRepresentation() !== ''
+                || $this->legacy_cloze_text !== ''
+                    && $this->cloze_text->getRawRepresentation() !== ''
         );
 
         if ($add_legacy_cloze_text_to_input) {

From 57bdd8296af0c5c16d2133f79264fd4123914acd Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 18 Feb 2026 15:11:17 +0100
Subject: [PATCH 138/141] Questions: Change Title LangVars

---
 .../src/AnswerFormTypes/Cloze/Properties/Properties.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
index 6a84e536af7d..f3cb647494bb 100644
--- a/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
+++ b/components/ILIAS/Questions/src/AnswerFormTypes/Cloze/Properties/Properties.php
@@ -239,7 +239,7 @@ public function buildBasicEditingInputs(
                 self::KEY_ENABLE_COMBINATIONS => $ff->checkbox($lng->txt('cloze_enable_combinations'))
                     ->withValue($this->combinations->areCombinationsEnabled())
             ],
-            $lng->txt('create_answer_form')
+            $lng->txt('set_basic_properties')
         )->withAdditionalTransformation(
             $refinery->custom()->transformation(
                 fn(array $vs): self => $properties_factory->fromBasicEditingForm(

From 506622b8c491109bf2f12bdad270fa45d8cd5933 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Wed, 18 Feb 2026 15:24:45 +0100
Subject: [PATCH 139/141] Questions: Remove Tabs from Question Editing

---
 .../ILIAS/Questions/src/Presentation/Views/Edit.php    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index 87722931dfdf..a8c6aea49c34 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -264,6 +264,10 @@ private function createQuestion(
         EnvironmentImplementation $environment
     ): EditForm {
         $this->initializeEditMode($environment);
+        $this->tabs_gui->setBackTarget(
+            $this->lng->txt('cancel'),
+            $environment->withDefaultStep()->getUrlBuilder()->buildURI()->__toString()
+        );
 
         $create = $this->questions_repository->getNew(
             $environment->getObjId()
@@ -298,6 +302,10 @@ private function editQuestion(
         EnvironmentImplementation $environment
     ): EditForm {
         $this->initializeEditMode($environment);
+        $this->tabs_gui->setBackTarget(
+            $this->lng->txt('back'),
+            $environment->withDefaultStep()->getUrlBuilder()->buildURI()->__toString()
+        );
 
         $question_id = $environment->getQuestionId();
         $question = $this->questions_repository->getForQuestionId($question_id);
@@ -457,6 +465,8 @@ private function forwardCreateAnswerFormCmd(
     private function initializeEditMode(
         EnvironmentImplementation $environment
     ): void {
+        $this->tabs_gui->clearTargets();
+
         $this->global_screen->tool()->context()->current()->addAdditionalData(
             LayoutProvider::MODE_ENABLED,
             true

From 492b2984b11a24e8aca2522d6291e32019fad388 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 19 Feb 2026 11:00:38 +0100
Subject: [PATCH 140/141] Questions: Add Create and New and Fix Redirects

---
 .../PageEditor/class.ilPCAnswerFormGUI.php    |  9 ---
 .../Administration/class.ConfigurationGUI.php |  1 -
 .../Definitions/EnvironmentImplementation.php | 47 ++++++++++++++-
 .../src/Presentation/Layout/EditForm.php      | 26 ++++++++-
 .../src/Presentation/Layout/Factory.php       |  4 --
 .../Questions/src/Presentation/Views/Edit.php | 58 +++++++++++++++++--
 6 files changed, 122 insertions(+), 23 deletions(-)

diff --git a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
index ebf306f5b42d..97db48fcfafe 100644
--- a/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
+++ b/components/ILIAS/Questions/Legacy/PageEditor/class.ilPCAnswerFormGUI.php
@@ -58,7 +58,6 @@ public function executeCommand()
 
     public function insertCmd(): void
     {
-        $this->setInsertTabs();
         $content_obj = new ilPCAnswerForm($this->pg_obj);
         $content_obj->setHierId($this->hier_id);
         $this->tpl->setContent(
@@ -93,12 +92,4 @@ public function editCmd(): void
             )->render($this->ui_renderer)
         );
     }
-
-    private function setInsertTabs(): void
-    {
-        $this->tabs->setBackTarget(
-            $this->lng->txt('cancel'),
-            $this->ctrl->getLinkTargetByClass(\QstsQuestionPageGUI::class, 'edit')
-        );
-    }
 }
diff --git a/components/ILIAS/Questions/src/Administration/class.ConfigurationGUI.php b/components/ILIAS/Questions/src/Administration/class.ConfigurationGUI.php
index 763ff5f0ae82..adf3a315a0a7 100755
--- a/components/ILIAS/Questions/src/Administration/class.ConfigurationGUI.php
+++ b/components/ILIAS/Questions/src/Administration/class.ConfigurationGUI.php
@@ -20,7 +20,6 @@
 
 namespace ILIAS\Questions\Administration;
 
-use ILIAS\Questions\UserSettings\CreateMode;
 use ILIAS\Questions\UserSettings\CreateModes;
 use ILIAS\HTTP\Services as HTTP;
 use ILIAS\Language\Language;
diff --git a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
index 185578cdc160..31fcb85d3032 100644
--- a/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
+++ b/components/ILIAS/Questions/src/Presentation/Definitions/EnvironmentImplementation.php
@@ -43,6 +43,7 @@ class EnvironmentImplementation implements Environment
     private const string TOKEN_STRING_TYPE_HASH = 't';
     private const string TOKEN_STRING_ANSWER_FORM_ID = 'af';
     private const string TOKEN_STRING_CREATE_MODE = 'cm';
+    private const string TOKEN_STRING_CREATE_AND_NEW = 'can';
 
     private const string PARAMETER_STRING_HIER_ID = 'hier_id';
 
@@ -87,7 +88,7 @@ public function setEditAnswerFormBackTarget(): void
         $this->tabs_gui->clearTargets();
         $this->tabs_gui->setBackTarget(
             $this->lng->txt('cancel'),
-            $this->withDefaultStep()->getUrlBuilder()->buildURI()->__toString()
+            $this->buildEditAnswerFormBackUrl()->buildURI()->__toString()
         );
     }
 
@@ -473,6 +474,21 @@ public function setParamtersForSimpleCreateCmd(
         );
     }
 
+    public function isCreateAndNewAction(): bool
+    {
+        return $this->http->wrapper()->query()->has(
+            $this->buildURLBuilderTokenForCreateAndNew()->getName()
+        );
+    }
+
+    public function buildURLBuilderTokenForCreateAndNew(): URLBuilderToken
+    {
+        return new URLBuilderToken(
+            self::QUERY_PARAMETER_NAME_SPACE,
+            self::TOKEN_STRING_CREATE_AND_NEW
+        );
+    }
+
     private function setQuestionIdParamterForPageEditorCmds(
         Uuid $question_id
     ): void {
@@ -483,6 +499,35 @@ private function setQuestionIdParamterForPageEditorCmds(
         );
     }
 
+    private function buildEditAnswerFormBackUrl(): URLBuilder
+    {
+        if (!$this->is_in_creation_context) {
+            return $this->withDefaultStep()->getUrlBuilder();
+        }
+
+        if (!$this->isCreateModeSimple()) {
+            return new URLBuilder(
+                new URI(
+                    ILIAS_HTTP_PATH . '/' . $this->ctrl->getLinkTargetByClass(
+                        \QstsQuestionPageGUI::class,
+                        'edit'
+                    )
+                )
+            );
+        }
+
+        return $this->url_builder->withParameter(
+            $this->action_token,
+            Edit::ACTION_DELETE_QUESTIONS
+        )->withParameter(
+            $this->step_token,
+            Edit::ACTION_DELETE_QUESTIONS
+        )->withParameter(
+            $this->table_row_token,
+            [$this->getQuestionId()->toString()]
+        );
+    }
+
     private function acquireURLBuilderAndParameters(
         URI $base_uri
     ): void {
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
index 22ffaa90cd42..469b158eaaf0 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/EditForm.php
@@ -29,6 +29,7 @@
 use ILIAS\UI\Component\Panel\Standard as StandardPanel;
 use ILIAS\UI\Renderer as UIRenderer;
 use ILIAS\UI\URLBuilder;
+use ILIAS\UI\URLBuilderToken;
 use Psr\Http\Message\ServerRequestInterface;
 
 class EditForm implements Renderable
@@ -46,9 +47,9 @@ public function __construct(
         private readonly UIFactory $ui_factory,
         private readonly Language $lng,
         Input|InputsBuilder $inputs,
-        URLBuilder $default_form_action,
+        private URLBuilder $default_form_action,
         ?URLBuilder $back_form_action,
-        bool $is_final_step
+        private bool $is_final_step
     ) {
         $this->form = $this->buildForm(
             $inputs,
@@ -65,6 +66,11 @@ public function render(
         return $ui_renderer->render($this->buildContent());
     }
 
+    public function isFinalStep(): bool
+    {
+        return $this->is_final_step;
+    }
+
     public function withContentBeforeForm(
         StandardPanel $content
     ): self {
@@ -118,6 +124,22 @@ public function getData(): mixed
         return $data[self::MAIN_SECTION_NAME] ?? null;
     }
 
+    public function withAdditionalAction(
+        URLBuilderToken $parameter_token,
+        string $parameter_value,
+        string $label
+    ): self {
+        $clone = clone $this;
+        $clone->form = $this->form->withAdditionalFormAction(
+            $this->default_form_action->buildURI()->withParameter(
+                $parameter_token->getName(),
+                $parameter_value
+            )->__toString(),
+            $label
+        );
+        return $clone;
+    }
+
     private function buildContent(): array
     {
         $content = [];
diff --git a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
index acb7c77337f9..4857dcc5e158 100644
--- a/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
+++ b/components/ILIAS/Questions/src/Presentation/Layout/Factory.php
@@ -53,10 +53,6 @@ public function getEditOverview(
         );
     }
 
-    /**
-     * @param Environment $environment The environment MUST have the step set,
-     * to which the form shall be sent.
-     */
     public function getEditForm(
         Input|InputsBuilder $main_section_inputs,
         URLBuilder $default_form_action,
diff --git a/components/ILIAS/Questions/src/Presentation/Views/Edit.php b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
index a8c6aea49c34..4ea4d170f9d6 100644
--- a/components/ILIAS/Questions/src/Presentation/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Presentation/Views/Edit.php
@@ -36,7 +36,6 @@
 use ILIAS\Questions\AnswerForm\Views\Edit as AnswerFormEditView;
 use ILIAS\Questions\Persistence\Repository;
 use ILIAS\Questions\Question\QuestionImplementation;
-use ILIAS\Questions\UserSettings\CreateMode;
 use ILIAS\Questions\UserSettings\CreateModes;
 use ILIAS\Data\URI;
 use ILIAS\Data\UUID\Factory as UuidFactory;
@@ -148,6 +147,13 @@ public function forwardPageCmds(
             $base_uri,
             $obj_id
         );
+
+        if ($this->ctrl->getCmd() === 'insert'
+            && $environment->getAction() === self::ACTION_DELETE_QUESTIONS) {
+            $this->deleteQuestions($environment);
+            return;
+        }
+
         $this->initializeEditMode($environment);
         $environment->preserveParametersForPageEditorCmds();
 
@@ -187,6 +193,13 @@ public function createAnswerForm(
         ->withActionParameter(self::ACTION_CREATE_ANSWER_FORM)
         ->withQuestionIdParameter($question->getId());
 
+
+        $environment->setEditAnswerFormBackTarget();
+
+        if ($this->configuration_repository->isCreateModeSimple($environment)) {
+            $environment = $environment->withCreateModeParameter();
+        }
+
         $answer_form_type_class_hash = $environment->getTypeClassHash();
 
         if ($answer_form_type_class_hash !== '') {
@@ -288,7 +301,7 @@ private function createQuestion(
         }
 
         $this->questions_repository->create([$create]);
-        return $this->ctrl->redirectToURL(
+        $this->ctrl->redirectToURL(
             $this->buildAfterQuestionCreationRedirectUri(
                 $environment,
                 $create->getCreateMode(),
@@ -449,7 +462,12 @@ private function forwardCreateAnswerFormCmd(
         );
 
         if ($create instanceof EditForm) {
-            return $create;
+            return $create->isFinalStep()
+                ? $create->withAdditionalAction(
+                    $environment->buildURLBuilderTokenForCreateAndNew(),
+                    '1',
+                    $this->lng->txt('create_and_new')
+                ) : $create;
         }
 
         $this->questions_repository->create(
@@ -459,7 +477,9 @@ private function forwardCreateAnswerFormCmd(
         $content_object->create($create->getAnswerFormId());
         $content_object->getPage()->update();
 
-        $this->ctrl->redirectByClass(\QstsQuestionPageGUI::class, 'edit');
+        $this->ctrl->redirectToURL(
+            $this->buildAfterAnswerFormCreationRedirectUri($environment)
+        );
     }
 
     private function initializeEditMode(
@@ -558,8 +578,7 @@ private function buildCreateAnswerForm(
         if ($this->configuration_repository->isCreateModeSimple($environment)) {
             $inputs['question_text'] = $if->field()->textarea(
                 $this->lng->txt('question_text')
-            );
-            $environment = $environment->withCreateModeParameter();
+            )->withRequired(true);
         }
 
         return $environment->getPresentationFactory()->getEditForm(
@@ -679,4 +698,31 @@ private function buildAfterQuestionCreationRedirectUri(
             'insert'
         );
     }
+
+    private function buildAfterAnswerFormCreationRedirectUri(
+        EnvironmentImplementation $environment,
+    ): string {
+        if (!$this->configuration_repository->isCreateModeSimple($environment)) {
+            return $this->ctrl->getLinkTargetByClass(
+                \QstsQuestionPageGUI::class,
+                'edit'
+            );
+        }
+
+        $additonal_data = $this->global_screen
+            ->tool()
+            ->context()
+            ->current()
+            ->getAdditionalData();
+
+        if ($environment->isCreateAndNewAction()) {
+            return $additonal_data
+                ->get(LayoutProvider::URL_CREATE_QUESTION)
+                ->__toString();
+        }
+
+        return $additonal_data
+            ->get(LayoutProvider::URL_CLOSE_MODE_INFO)
+            ->__toString();
+    }
 }

From 8400a2a113072db9a303220feb0db71984f38479 Mon Sep 17 00:00:00 2001
From: Stephan Kergomard <webmaster@kergomard.ch>
Date: Thu, 19 Feb 2026 12:23:42 +0100
Subject: [PATCH 141/141] Questions: Fix Crash on Missing Question Title

---
 components/ILIAS/Questions/src/Question/Views/Edit.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/components/ILIAS/Questions/src/Question/Views/Edit.php b/components/ILIAS/Questions/src/Question/Views/Edit.php
index 9684c49010f2..34ad08af7d35 100644
--- a/components/ILIAS/Questions/src/Question/Views/Edit.php
+++ b/components/ILIAS/Questions/src/Question/Views/Edit.php
@@ -127,12 +127,9 @@ private function processBasicPropertiesCreateForm(
         )->withRequest($this->request);
 
         $data = $form->getData();
-
-        $mode = $data['create_mode'];
-
         return $data === null
             ? $form
-            : $data['question']->withCreateMode($mode);
+            : $data['question']->withCreateMode($data['create_mode']);
     }
 
     private function buildBasicPropertiesEditingForm(