diff --git a/bun.lock b/bun.lock
index 399ca184b..12d90212c 100644
--- a/bun.lock
+++ b/bun.lock
@@ -305,6 +305,7 @@
       },
       "dependencies": {
         "@abapify/adk": "0.4.19",
+        "@abapify/adt-atc": "0.4.20",
         "@abapify/adt-aunit": "0.4.19",
         "@abapify/adt-client": "0.4.19",
         "@abapify/adt-config": "0.4.19",
@@ -437,6 +438,7 @@
         "adt-server": "./dist/bin/adt-server.mjs",
       },
       "dependencies": {
+        "@abapify/adt-atc": "0.4.20",
         "@abapify/adt-client": "0.4.19",
         "@abapify/adt-mcp": "0.4.19",
         "@abapify/adt-services": "0.4.19",
diff --git a/packages/adt-atc/README.md b/packages/adt-atc/README.md
index 4354d59be..92db3ad2e 100644
--- a/packages/adt-atc/README.md
+++ b/packages/adt-atc/README.md
@@ -82,6 +82,9 @@ const result: AtcResult = {
       objectType: 'CLAS',
       objectName: 'ZCL_MY_CLASS',
       location: '/sap/bc/adt/oo/classes/zcl_my_class/source/main#start=10,0',
+      // Optional: resolved by the atc command from the run's check variant
+      // form template (check categories are best-effort enrichment)
+      checkCategory: 'CI_PERFORMANCE',
     },
   ],
 };
@@ -90,6 +93,40 @@ await outputSarifReport(result, 'atc-results.sarif');
 await outputGitLabCodeQuality(result, 'gl-code-quality.json');
 ```
 
+## Check Categories
+
+Each finding can carry a `checkCategory` (e.g., `CI_PERFORMANCE`,
+`CI_SECURITY`): the name of the ATC check category its check is assigned
+to. The `atc` command resolves it automatically from the run's check
+variant form template (`GET /sap/bc/adt/atc/checkvariants/formtemplate`)
+by mapping the finding's `checkId` (the check's implementing class name)
+to the category that contains it. The enrichment is best-effort: when
+the form template is unavailable, or the check is outside its catalog,
+findings simply carry no category and the run still succeeds.
+
+The enrichment helpers are exported for reuse:
+
+```typescript
+import {
+  parseCheckCategoryIndex,
+  fetchCheckCategoryIndex,
+  enrichResultWithCategories,
+} from '@abapify/adt-atc';
+
+// Build the checkId -> category name index from a parsed form template
+const index = parseCheckCategoryIndex(formTemplateDocument);
+
+// Or fetch it through an ADT client (never throws)
+const fetched = await fetchCheckCategoryIndex(client, 'DEFAULT');
+
+// Enrich a result in place
+enrichResultWithCategories(result, index);
+```
+
+The GitLab Code Quality formatter emits the category as `check_category`
+per finding; the SARIF formatter sets it on each rule's
+`properties.category`.
+
 ## Output Formats
 
 ### Console (default)
diff --git a/packages/adt-atc/src/check-categories.ts b/packages/adt-atc/src/check-categories.ts
new file mode 100644
index 000000000..dbeecdbde
--- /dev/null
+++ b/packages/adt-atc/src/check-categories.ts
@@ -0,0 +1,188 @@
+/**
+ * Check Category Enrichment
+ *
+ * Resolves ATC findings to their check category (e.g., 'CI_PERFORMANCE',
+ * 'CI_SECURITY') through the check variant form template
+ * (GET /sap/bc/adt/atc/checkvariants/formtemplate?chkvName={name}).
+ *
+ * The form template is the check catalog of the run's check variant: every
+ * available check category lists its checks, and each check carries its
+ * implementing class. When a finding's checkId matches a catalog
+ * implementing class, the index resolves it directly. Live worklist
+ * checkIds are check-instance GUIDs (observed on a live S/4 system,
+ * 2026-10-22); those resolve through the documentation bridge in
+ * ./documentation-bridge.ts.
+ *
+ * Enrichment is best-effort by design: without the form template, or for a
+ * checkId outside the catalog, findings keep no category and the run still
+ * succeeds.
+ */
+
+/**
+ * Structural shape of the parsed check variant form template document
+ * (GET /sap/bc/adt/atc/checkvariants/formtemplate).
+ *
+ * Only the fields needed for the checkId -> category index are declared.
+ */
+export interface FormTemplateDocument {
+  formTemplate?: {
+    availableCheckCategories?: {
+      availableCheckCategory?: FormTemplateCategoryEntry[];
+    };
+  };
+}
+
+/** One available check category with the checks it contains. */
+export interface FormTemplateCategoryEntry {
+  checkCategoryObject?: {
+    /** Category name (the enrichment key, e.g., 'CI_PERFORMANCE') */
+    name?: string;
+    /** Category display title (e.g., 'Performance') */
+    description?: string;
+  };
+  check?: FormTemplateCheckEntry[];
+}
+
+/** One check entry of a category. */
+export interface FormTemplateCheckEntry {
+  checkObject?: {
+    /** Check name (e.g., 'CI_ANALYZE_WHERE') */
+    name?: string;
+    content?: {
+      /** The check's category assignment (the category name) */
+      category?: { name?: string };
+      /**
+       * Implementing class of the check (e.g., 'CL_CI_TEST_SELECT_TAW_A').
+       * Worklist findings carry a check-instance GUID instead; the
+       * documentation bridge resolves that GUID to this class name.
+       */
+      implementingClass?: { name?: string };
+    };
+  };
+}
+
+/**
+ * Build a checkId -> check category name index from a parsed check variant
+ * form template document.
+ *
+ * The checkId key is the implementing class name; the value is the category
+ * object name (a stable key like 'CI_PERFORMANCE', not the display title).
+ *
+ * @param doc - Parsed form template document (nullable for convenience)
+ * @returns Map of checkId -> category name; empty when the document is
+ *   missing or malformed
+ */
+export function parseCheckCategoryIndex(
+  doc: FormTemplateDocument | null | undefined,
+): Map<string, string> {
+  const index = new Map<string, string>();
+  const categories =
+    doc?.formTemplate?.availableCheckCategories?.availableCheckCategory ?? [];
+  for (const category of categories) {
+    collectCategoryChecks(category, index);
+  }
+  return index;
+}
+
+/** Index every check of one category under the category's name. */
+function collectCategoryChecks(
+  category: FormTemplateCategoryEntry,
+  index: Map<string, string>,
+): void {
+  const categoryName = category.checkCategoryObject?.name;
+  if (!categoryName) return;
+  const checkIds = (category.check ?? [])
+    .map((check) => check.checkObject?.content?.implementingClass?.name)
+    .filter((checkId): checkId is string => !!checkId);
+  for (const checkId of checkIds) {
+    index.set(checkId, categoryName);
+  }
+}
+
+/** Structural client surface needed to fetch a form template. */
+export interface FormTemplateClient {
+  adt: {
+    atc: {
+      checkvariants: {
+        /** GET /sap/bc/adt/atc/checkvariants/formtemplate{?chkvName} */
+        formtemplate: (params?: {
+          chkvName?: string;
+        }) => Promise<FormTemplateDocument>;
+      };
+    };
+  };
+}
+
+/**
+ * Fetch the check variant form template and build the checkId -> category
+ * name index for a run.
+ *
+ * Best-effort: any error (network, 404, malformed document) is swallowed
+ * and reported through the optional logger so a failed enrichment never
+ * fails the ATC run itself.
+ *
+ * @param client - ADT client with the checkvariants.formtemplate surface
+ * @param checkVariant - The check variant name of the run (e.g., 'DEFAULT')
+ * @param logger - Optional CLI logger for diagnostics
+ * @returns checkId -> category name index; empty when unavailable
+ */
+export async function fetchCheckCategoryIndex(
+  client: FormTemplateClient,
+  checkVariant: string,
+  logger?: {
+    warn: (message: string) => void;
+    info?: (message: string) => void;
+  },
+): Promise<Map<string, string>> {
+  try {
+    const doc = await client.adt.atc.checkvariants.formtemplate({
+      chkvName: checkVariant,
+    });
+    return parseCheckCategoryIndex(doc);
+  } catch (error) {
+    logger?.warn?.(
+      `⚠️ Check category enrichment unavailable: ${
+        error instanceof Error ? error.message : String(error)
+      }`,
+    );
+    return new Map();
+  }
+}
+
+/**
+ * Enrich findings with their check category in place.
+ *
+ * Generic over any finding shape carrying a checkId (and an optional
+ * checkCategory field), so both the CLI plugin's AtcFinding and other
+ * canonical finding types can be enriched with the same index.
+ *
+ * @param findings - Findings to enrich (mutated in place)
+ * @param index - checkId -> category name index
+ * @returns Number of findings that received a category
+ */
+export function enrichFindingsWithCategories<
+  T extends { checkId: string; checkCategory?: string },
+>(findings: T[], index: Map<string, string>): number {
+  let enriched = 0;
+  for (const finding of findings) {
+    const checkCategory = index.get(finding.checkId);
+    if (checkCategory) {
+      finding.checkCategory = checkCategory;
+      enriched++;
+    }
+  }
+  return enriched;
+}
+
+/**
+ * Enrich an ATC result with check categories in place.
+ *
+ * @param result - The run result (findings mutated in place)
+ * @param index - checkId -> category name index
+ * @returns Number of findings that received a category
+ */
+export function enrichResultWithCategories<
+  T extends { checkId: string; checkCategory?: string },
+>(result: { findings?: T[] }, index: Map<string, string>): number {
+  return enrichFindingsWithCategories(result.findings ?? [], index);
+}
diff --git a/packages/adt-atc/src/commands/atc.ts b/packages/adt-atc/src/commands/atc.ts
index 9bd0687ce..4d10b57b8 100644
--- a/packages/adt-atc/src/commands/atc.ts
+++ b/packages/adt-atc/src/commands/atc.ts
@@ -8,6 +8,11 @@
 import type { CliCommandPlugin, CliContext } from '@abapify/adt-plugin';
 import chalk from 'chalk';
 import { outputSarifReport, outputGitLabCodeQuality } from '../formatters';
+import {
+  fetchCheckCategoryIndex,
+  enrichResultWithCategories,
+} from '../check-categories';
+import { resolveCategoriesViaDocumentation } from '../documentation-bridge';
 import type { AtcResult, AtcFinding, OutputFormat } from '../types';
 
 // Client type - the plugin receives a typed client from context
@@ -34,6 +39,11 @@ interface AdtClient {
           params: { includeExemptedFindings: string },
         ) => Promise<WorklistResponse>;
       };
+      checkvariants: {
+        formtemplate: (params?: {
+          chkvName?: string;
+        }) => Promise<import('../check-categories').FormTemplateDocument>;
+      };
       runs: {
         post: (
           params: { worklistId: string },
@@ -54,6 +64,15 @@ interface AdtClient {
       };
     };
   };
+  /**
+   * Bounded documentation text read (the real ADT client provides it).
+   * Optional: without it the documentation category bridge is skipped.
+   */
+  readTextBounded?: (
+    uri: string,
+    maxBytes: number,
+    options?: { headers?: Record<string, string> },
+  ) => Promise<string>;
 }
 
 // Worklist response type
@@ -75,6 +94,8 @@ interface WorklistResponse {
             checkTitle?: string;
             messageId?: string;
             messageTitle?: string;
+            /** Documentation link: the page that names the check class. */
+            link?: Array<{ href?: string; rel?: string }>;
           }>;
         };
       }>;
@@ -105,6 +126,25 @@ function adtLink(name: string, uri: string, systemName?: string): string {
   return hyperlink(chalk.cyan(name), url);
 }
 
+/**
+ * The trusted documentation link of one worklist finding.
+ *
+ * Live shape (2026-10-22): <atom:link rel="http://www.sap.com/adt/
+ * relations/documentation" href="/sap/bc/adt/documentation/atc/documents/
+ * itemid/{guid}/index/{n}"/> inside the atcfinding:finding element.
+ */
+function documentationUriFromFinding(
+  finding: NonNullable<
+    NonNullable<
+      NonNullable<WorklistResponse['worklist']>['objects']['object']
+    >[number]['findings']['finding']
+  >[number],
+): string | undefined {
+  return finding.link?.find(
+    (link) => link.rel === 'http://www.sap.com/adt/relations/documentation',
+  )?.href;
+}
+
 /**
  * Convert worklist response to AtcResult
  */
@@ -131,6 +171,7 @@ function convertWorklistToResult(
           objectName: obj.name || '',
           location: finding.location,
           findingUri: finding.uri,
+          documentationUri: documentationUriFromFinding(finding),
         });
       }
     }
@@ -406,6 +447,38 @@ export const atcCommand: CliCommandPlugin = {
       checkVariant,
     );
 
+    // Enrich findings with check categories from the run's check variant
+    // form template (best-effort: never fails the run itself)
+    const categoryIndex = await fetchCheckCategoryIndex(
+      client,
+      checkVariant,
+      ctx.logger,
+    );
+    const enriched = enrichResultWithCategories(result, categoryIndex);
+    if (enriched > 0) {
+      ctx.logger.info(
+        `🏷️ Enriched ${enriched}/${result.totalFindings} finding(s) with check categories`,
+      );
+    }
+
+    // Bridge remaining findings through their ATC documentation page: the
+    // worklist checkId is a check-instance GUID, not the implementing class
+    // the form-template catalog lists (live evidence, 2026-10-22), so
+    // the direct index match cannot resolve them. The documentation page
+    // names the check class, which resolves through the same index.
+    // Best-effort: never fails the run.
+    const bridged = await resolveCategoriesViaDocumentation(
+      client,
+      result.findings,
+      categoryIndex,
+      { logger: ctx.logger },
+    );
+    if (bridged > 0) {
+      ctx.logger.info(
+        `🏷 Bridged ${bridged} finding(s) to check categories via ATC documentation`,
+      );
+    }
+
     // Load finding resolver if requested
     let resolver: import('../types').FindingResolver | undefined;
     if (options.resolver) {
diff --git a/packages/adt-atc/src/documentation-bridge.ts b/packages/adt-atc/src/documentation-bridge.ts
new file mode 100644
index 000000000..8c47e3dc3
--- /dev/null
+++ b/packages/adt-atc/src/documentation-bridge.ts
@@ -0,0 +1,148 @@
+/**
+ * Documentation Bridge for Check Category Enrichment
+ *
+ * ATC worklist findings carry a check-instance GUID as their checkId — not
+ * the implementing class name the check variant form template catalog lists
+ * (observed on a live S/4 system, 2026-10-22). The finding's documentation
+ * page (the worklist atom:link) names the check class in its header line,
+ * which resolves through the form-template category index.
+ *
+ * Everything here is best-effort: fetch errors are reported through the
+ * optional logger and skipped; findings keep no category when their page
+ * cannot be fetched or parsed.
+ */
+
+/** Structural surface for a bounded documentation read. The real ADT client
+ * provides readTextBounded; mocks without it simply skip the bridge. */
+export interface DocumentationReadingClient {
+  readTextBounded?: (
+    uri: string,
+    maxBytes: number,
+    options?: { headers?: Record<string, string> },
+  ) => Promise<string>;
+}
+
+/**
+ * Parse the implementing check class from an ATC finding documentation page.
+ *
+ * Live shape (2026-10-22): the page opens with
+ * "Appl. Comp. Check / Check Class / Message Code" followed by
+ * `<p>BC-ABA-LA / CL_CI_TEST_SELECT_TAW_A / 0501</p>`. The check class in
+ * that line is the implementing class the check variant form template lists
+ * — the bridge from the finding's GUID checkId to the check catalog.
+ *
+ * The match is bounded (no unbounded quantifiers on page input) and accepts
+ * an optional ABAP namespace prefix (e.g. `/NSP/CL_EXAMPLE`).
+ *
+ * @param html - The documentation page HTML
+ * @returns The check class name, or undefined when the page does not carry it
+ */
+export function parseCheckClassFromDocumentation(
+  html: string,
+): string | undefined {
+  const match = html.match(
+    /Check\s*Class[^<]{0,80}<\/h3>\s*<p>\s*[^/<]{0,120}\/\s*((?:\/[A-Za-z0-9_]{1,8}\/)?[A-Za-z][A-Za-z0-9_]*)\s*\//u,
+  );
+  return match?.[1];
+}
+
+/** Finding shape the bridge enriches in place. */
+export interface DocumentationBridgeFinding {
+  checkId: string;
+  checkCategory?: string;
+  documentationUri?: string;
+}
+
+/** Shared state for the per-URI documentation fetch. */
+interface DocumentationFetchContext {
+  read: NonNullable<DocumentationReadingClient['readTextBounded']>;
+  maxBytes: number;
+  classByDocumentationUri: Map<string, string | undefined>;
+  logger?: { warn: (message: string) => void };
+}
+
+/**
+ * Read one documentation page and resolve its check class, with a shared
+ * per-URI cache so repeated findings never re-fetch the same page.
+ */
+async function resolveCheckClassForUri(
+  documentationUri: string,
+  context: DocumentationFetchContext,
+): Promise<void> {
+  if (context.classByDocumentationUri.has(documentationUri)) return;
+  try {
+    const html = await context.read(documentationUri, context.maxBytes, {
+      headers: { Accept: 'application/vnd.sap.adt.docu.v1+html' },
+    });
+    context.classByDocumentationUri.set(
+      documentationUri,
+      parseCheckClassFromDocumentation(html),
+    );
+  } catch (error) {
+    context.logger?.warn?.(
+      `⚠️ ATC documentation read failed for ${documentationUri}: ${
+        error instanceof Error ? error.message : String(error)
+      }`,
+    );
+    context.classByDocumentationUri.set(documentationUri, undefined);
+  }
+}
+
+/**
+ * Bridge finding categories through the ATC documentation page.
+ *
+ * After the direct form-template index pass (which resolves findings whose
+ * checkId already matches a catalog implementing class), this resolves the
+ * GUID-checkId findings: each finding's documentation page names the check
+ * class, which resolves through the same index.
+ *
+ * Best-effort: per-documentation-URI fetch errors are reported through the
+ * optional logger and skipped; a finding keeps no category when its page
+ * cannot be fetched or parsed. Reads are deduplicated per URI.
+ *
+ * @param client - ADT client with an optional bounded text read
+ * @param findings - Findings to enrich in place
+ * @param classToCategory - checkId/class -> category name index (the
+ *   form-template catalog: parseCheckCategoryIndex output)
+ * @param options - maxBytes (default 64 KiB) and an optional logger
+ * @returns Number of findings that received a category
+ */
+export async function resolveCategoriesViaDocumentation(
+  client: DocumentationReadingClient,
+  findings: DocumentationBridgeFinding[],
+  classToCategory: ReadonlyMap<string, string>,
+  options: {
+    maxBytes?: number;
+    logger?: { warn: (message: string) => void };
+  } = {},
+): Promise<number> {
+  const read = client.readTextBounded;
+  if (!read || classToCategory.size === 0) return 0;
+
+  const pending = findings.filter(
+    (finding) => !finding.checkCategory && finding.documentationUri,
+  );
+  if (pending.length === 0) return 0;
+
+  const context: DocumentationFetchContext = {
+    read,
+    maxBytes: options.maxBytes ?? 64 * 1024,
+    classByDocumentationUri: new Map<string, string | undefined>(),
+    logger: options.logger,
+  };
+  let enriched = 0;
+  for (const finding of pending) {
+    await resolveCheckClassForUri(finding.documentationUri!, context);
+    const checkClass = context.classByDocumentationUri.get(
+      finding.documentationUri!,
+    );
+    const checkCategory = checkClass
+      ? classToCategory.get(checkClass)
+      : undefined;
+    if (checkCategory) {
+      finding.checkCategory = checkCategory;
+      enriched++;
+    }
+  }
+  return enriched;
+}
diff --git a/packages/adt-atc/src/formatters/gitlab.ts b/packages/adt-atc/src/formatters/gitlab.ts
index 72de7992b..fedc8b47f 100644
--- a/packages/adt-atc/src/formatters/gitlab.ts
+++ b/packages/adt-atc/src/formatters/gitlab.ts
@@ -118,6 +118,12 @@ export async function outputGitLabCodeQuality(
       return {
         description: finding.messageText,
         check_name: finding.checkTitle || finding.checkId,
+        // The worklist checkId as SAP reports it. On live systems this is a
+        // per-instance GUID (stable for the finding, but not a catalog
+        // identity); checkTitle is a display name that SAP can rename, so
+        // downstream consumers should key on this field rather than the
+        // title.
+        check_id: finding.checkId || undefined,
         fingerprint,
         severity,
         location: {
@@ -130,6 +136,9 @@ export async function outputGitLabCodeQuality(
         // Extra fields for downstream processing
         ...(methodName && { method: methodName }),
         ...(finding.location && { atc_location: finding.location }),
+        ...(finding.checkCategory && {
+          check_category: finding.checkCategory,
+        }),
       };
     }),
   );
diff --git a/packages/adt-atc/src/formatters/sarif.ts b/packages/adt-atc/src/formatters/sarif.ts
index aefe27c14..112f0f5c2 100644
--- a/packages/adt-atc/src/formatters/sarif.ts
+++ b/packages/adt-atc/src/formatters/sarif.ts
@@ -33,6 +33,7 @@ export async function outputSarifReport(
           properties: {
             tags: ['abap', 'code-quality'],
             precision: 'high',
+            ...(f.checkCategory && { category: f.checkCategory }),
           },
         },
       ]),
diff --git a/packages/adt-atc/src/index.ts b/packages/adt-atc/src/index.ts
index 64852ea48..209c9080d 100644
--- a/packages/adt-atc/src/index.ts
+++ b/packages/adt-atc/src/index.ts
@@ -17,6 +17,26 @@
 export { atcCommand } from './commands/atc';
 export { atcCustomizingCommand } from './commands/atc-customizing';
 export { outputSarifReport, outputGitLabCodeQuality } from './formatters';
+export {
+  parseCheckCategoryIndex,
+  fetchCheckCategoryIndex,
+  enrichFindingsWithCategories,
+  enrichResultWithCategories,
+} from './check-categories';
+export type {
+  FormTemplateDocument,
+  FormTemplateCategoryEntry,
+  FormTemplateCheckEntry,
+  FormTemplateClient,
+} from './check-categories';
+export {
+  parseCheckClassFromDocumentation,
+  resolveCategoriesViaDocumentation,
+} from './documentation-bridge';
+export type {
+  DocumentationReadingClient,
+  DocumentationBridgeFinding,
+} from './documentation-bridge';
 export { createAbapGitResolver } from './resolvers/abapgit';
 export { adtUriToAbapGitPath } from './resolvers/adt-uri-to-abapgit-path';
 export type {
diff --git a/packages/adt-atc/src/types.ts b/packages/adt-atc/src/types.ts
index 6707665ea..e9f0c466d 100644
--- a/packages/adt-atc/src/types.ts
+++ b/packages/adt-atc/src/types.ts
@@ -18,6 +18,20 @@ export interface AtcFinding {
   objectName: string;
   location?: string;
   findingUri?: string;
+  /**
+   * Trusted ATC documentation link for this occurrence (the worklist
+   * atom:link). The documentation page names the check class
+   * ("Appl. Comp. Check / Check Class / Message Code" header line), which
+   * is the bridge from the finding's GUID checkId to the check catalog.
+   */
+  documentationUri?: string;
+  /**
+   * Check category name (e.g., 'CI_PERFORMANCE') the finding's check is
+   * assigned to, resolved from the run's check variant form template.
+   * Optional: enrichment is best-effort and absent when the form template
+   * is unavailable or the checkId is not in its catalog.
+   */
+  checkCategory?: string;
 }
 
 /**
diff --git a/packages/adt-atc/tests/check-categories.test.ts b/packages/adt-atc/tests/check-categories.test.ts
new file mode 100644
index 000000000..0056459f4
--- /dev/null
+++ b/packages/adt-atc/tests/check-categories.test.ts
@@ -0,0 +1,395 @@
+/**
+ * Check category enrichment tests
+ *
+ * parseCheckCategoryIndex: checkId -> category name index from a parsed
+ * check variant form template document.
+ * fetchCheckCategoryIndex: best-effort fetch (never throws).
+ * enrichFindingsWithCategories / enrichResultWithCategories: in-place
+ * enrichment.
+ * Formatters: check_category passthrough (GitLab) and rule properties
+ * category (SARIF).
+ */
+
+import assert from 'node:assert/strict';
+import { mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, it } from 'vitest';
+import { mkdtemp } from 'node:fs/promises';
+import {
+  parseCheckCategoryIndex,
+  fetchCheckCategoryIndex,
+  enrichFindingsWithCategories,
+  enrichResultWithCategories,
+  type FormTemplateDocument,
+} from '../src/check-categories';
+import {
+  parseCheckClassFromDocumentation,
+  resolveCategoriesViaDocumentation,
+} from '../src/documentation-bridge';
+import { outputGitLabCodeQuality } from '../src/formatters/gitlab';
+import { outputSarifReport } from '../src/formatters/sarif';
+import type { AtcFinding, AtcResult } from '../src/types';
+
+const temporaryDirectories: string[] = [];
+
+afterEach(() => {
+  for (const directory of temporaryDirectories.splice(0)) {
+    rmSync(directory, { recursive: true, force: true });
+  }
+});
+
+/** Structural parsed form template modeled after the sanitized fixture. */
+function formTemplateDocument(): FormTemplateDocument {
+  return {
+    formTemplate: {
+      availableCheckCategories: {
+        availableCheckCategory: [
+          {
+            checkCategoryObject: {
+              name: 'CI_PERFORMANCE',
+              description: 'Performance',
+            },
+            check: [
+              {
+                checkObject: {
+                  name: 'CI_ANALYZE_WHERE',
+                  content: {
+                    category: { name: 'CI_PERFORMANCE' },
+                    implementingClass: { name: 'CL_CI_TEST_SELECT_TAW_A' },
+                    remoteEnabled: true,
+                  },
+                },
+              },
+              {
+                checkObject: {
+                  name: 'CI_SELECT_TAW_BYBUF',
+                  content: {
+                    category: { name: 'CI_PERFORMANCE' },
+                    implementingClass: { name: 'CL_CI_TEST_SELECT_TAW_BYBUF' },
+                  },
+                },
+              },
+            ],
+          },
+          {
+            checkCategoryObject: {
+              name: 'ZEXAMPLE_CI_CATEGORY',
+              description: 'Example custom category',
+            },
+            check: [
+              {
+                checkObject: {
+                  name: 'ZEXAMPLE_CI_CHECK',
+                  content: {
+                    category: { name: 'ZEXAMPLE_CI_CATEGORY' },
+                    implementingClass: { name: 'ZEXAMPLE_CL_CHECK_IMPL' },
+                  },
+                },
+              },
+            ],
+          },
+          {
+            // Malformed entry: no category name, no checks
+            checkCategoryObject: { description: 'Broken entry' },
+            check: [],
+          },
+        ],
+      },
+    },
+  };
+}
+
+function finding(
+  checkId: string,
+  overrides: Partial<AtcFinding> = {},
+): AtcFinding {
+  return {
+    checkId,
+    checkTitle: `Check ${checkId}`,
+    messageId: '001',
+    priority: 3,
+    messageText: 'Some message',
+    objectUri: '/sap/bc/adt/oo/classes/zcl_sample',
+    objectType: 'CLAS',
+    objectName: 'ZCL_SAMPLE',
+    ...overrides,
+  };
+}
+
+describe('parseCheckCategoryIndex', () => {
+  it('maps implementing classes to category names', () => {
+    const index = parseCheckCategoryIndex(formTemplateDocument());
+    assert.equal(index.size, 3);
+    assert.equal(index.get('CL_CI_TEST_SELECT_TAW_A'), 'CI_PERFORMANCE');
+    assert.equal(index.get('CL_CI_TEST_SELECT_TAW_BYBUF'), 'CI_PERFORMANCE');
+    assert.equal(index.get('ZEXAMPLE_CL_CHECK_IMPL'), 'ZEXAMPLE_CI_CATEGORY');
+  });
+
+  it('returns an empty index for missing or malformed documents', () => {
+    assert.equal(parseCheckCategoryIndex(null).size, 0);
+    assert.equal(parseCheckCategoryIndex(undefined).size, 0);
+    assert.equal(parseCheckCategoryIndex({}).size, 0);
+    assert.equal(parseCheckCategoryIndex({ formTemplate: {} }).size, 0);
+    assert.equal(
+      parseCheckCategoryIndex({
+        formTemplate: { availableCheckCategories: {} },
+      }).size,
+      0,
+    );
+  });
+});
+
+describe('fetchCheckCategoryIndex', () => {
+  it('builds the index through the client', async () => {
+    const client = {
+      adt: {
+        atc: {
+          checkvariants: {
+            formtemplate: async () => formTemplateDocument(),
+          },
+        },
+      },
+    };
+    const index = await fetchCheckCategoryIndex(client, 'DEFAULT');
+    assert.equal(index.get('CL_CI_TEST_SELECT_TAW_A'), 'CI_PERFORMANCE');
+  });
+
+  it('never throws: client failures return an empty index', async () => {
+    const warnings: string[] = [];
+    const client = {
+      adt: {
+        atc: {
+          checkvariants: {
+            formtemplate: async () => {
+              throw new Error('HTTP 404');
+            },
+          },
+        },
+      },
+    };
+    const index = await fetchCheckCategoryIndex(client, 'DEFAULT', {
+      warn: (message) => warnings.push(message),
+    });
+    assert.equal(index.size, 0);
+    assert.equal(warnings.length, 1);
+    assert.match(warnings[0], /Check category enrichment unavailable/);
+  });
+});
+
+describe('enrichFindingsWithCategories', () => {
+  it('enriches findings with known checkIds and skips unknown ones', () => {
+    const index = parseCheckCategoryIndex(formTemplateDocument());
+    const findings = [
+      finding('CL_CI_TEST_SELECT_TAW_A'),
+      finding('CL_UNKNOWN_CHECK'),
+      finding('ZEXAMPLE_CL_CHECK_IMPL'),
+    ];
+    const enriched = enrichFindingsWithCategories(findings, index);
+    assert.equal(enriched, 2);
+    assert.equal(findings[0].checkCategory, 'CI_PERFORMANCE');
+    assert.equal(findings[1].checkCategory, undefined);
+    assert.equal(findings[2].checkCategory, 'ZEXAMPLE_CI_CATEGORY');
+  });
+
+  it('enriches a result in place', () => {
+    const index = parseCheckCategoryIndex(formTemplateDocument());
+    const result: AtcResult = {
+      checkVariant: 'DEFAULT',
+      totalFindings: 1,
+      errorCount: 0,
+      warningCount: 0,
+      infoCount: 1,
+      findings: [finding('CL_CI_TEST_SELECT_TAW_A')],
+    };
+    const enriched = enrichResultWithCategories(result, index);
+    assert.equal(enriched, 1);
+    assert.equal(result.findings[0].checkCategory, 'CI_PERFORMANCE');
+  });
+});
+
+describe('resolveCategoriesViaDocumentation', () => {
+  /** Live documentation page shape (2026-10-22), abridged. */
+  const documentationHtml = `<h3>Appl. Comp. Check / Check Class / Message Code</h3><p>BC-ABA-LA / CL_CI_TEST_SELECT_TAW_A / 0501<br> </p><h3>Details of Analysis</h3><ul><li>Large table MARA: No WHERE condition</li></ul>`;
+
+  it('parses the check class from the documentation page header line', () => {
+    assert.equal(
+      parseCheckClassFromDocumentation(documentationHtml),
+      'CL_CI_TEST_SELECT_TAW_A',
+    );
+    assert.equal(
+      parseCheckClassFromDocumentation('<p>no header</p>'),
+      undefined,
+    );
+    // Namespaced implementing classes keep their namespace prefix
+    assert.equal(
+      parseCheckClassFromDocumentation(
+        documentationHtml.replaceAll(
+          'CL_CI_TEST_SELECT_TAW_A',
+          '/NSP/CL_CI_EXAMPLE',
+        ),
+      ),
+      '/NSP/CL_CI_EXAMPLE',
+    );
+  });
+
+  it('bridges GUID checkIds to categories through the documentation page', async () => {
+    const fetched: string[] = [];
+    const client = {
+      readTextBounded: async (uri: string) => {
+        fetched.push(uri);
+        // The out-of-catalog finding's page names a different class.
+        if (uri.endsWith('/CCC/index/2')) {
+          return documentationHtml.replaceAll(
+            'CL_CI_TEST_SELECT_TAW_A',
+            'CL_SOME_UNCATALOGUED_CLASS',
+          );
+        }
+        return documentationHtml;
+      },
+    };
+    const classToCategory = new Map([
+      ['CL_CI_TEST_SELECT_TAW_A', 'CI_PERFORMANCE'],
+    ]);
+    const findings = [
+      {
+        // The real worklist shape: a GUID checkId, not a class name.
+        checkId: '2C3E62BB1A9457158CC55162E1BF7932',
+        documentationUri:
+          '/sap/bc/adt/documentation/atc/documents/itemid/AAA/index/698',
+      },
+      {
+        // Same documentation URI: the fetch is deduplicated.
+        checkId: '2C3E62BB1A9457158CC55162E1BF7932',
+        documentationUri:
+          '/sap/bc/adt/documentation/atc/documents/itemid/AAA/index/698',
+      },
+      {
+        // Already categorized: never re-fetched.
+        checkId: 'CL_KNOWN_CLASS',
+        checkCategory: 'CI_SYNTAX',
+        documentationUri:
+          '/sap/bc/adt/documentation/atc/documents/itemid/BBB/index/1',
+      },
+      {
+        // Class outside the catalog: stays uncategorized.
+        checkId: 'OTHER',
+        documentationUri:
+          '/sap/bc/adt/documentation/atc/documents/itemid/CCC/index/2',
+      },
+    ];
+    const enriched = await resolveCategoriesViaDocumentation(
+      client,
+      findings,
+      classToCategory,
+    );
+    assert.equal(enriched, 2);
+    assert.equal(findings[0]!.checkCategory, 'CI_PERFORMANCE');
+    assert.equal(findings[1]!.checkCategory, 'CI_PERFORMANCE');
+    assert.equal(findings[3]!.checkCategory, undefined);
+    // The deduplicated + skipped fetches: AAA once + CCC once (BBB skipped).
+    assert.deepEqual(fetched.sort(), [
+      '/sap/bc/adt/documentation/atc/documents/itemid/AAA/index/698',
+      '/sap/bc/adt/documentation/atc/documents/itemid/CCC/index/2',
+    ]);
+  });
+
+  it('skips the bridge without readTextBounded and never fails on fetch errors', async () => {
+    const withoutRead = await resolveCategoriesViaDocumentation(
+      {},
+      [{ checkId: 'X', documentationUri: '/doc' }],
+      new Map([['CL_X', 'CI_PERFORMANCE']]),
+    );
+    assert.equal(withoutRead, 0);
+
+    const warnings: string[] = [];
+    const failing = await resolveCategoriesViaDocumentation(
+      {
+        readTextBounded: async () => {
+          throw new Error('HTTP 404');
+        },
+      },
+      [{ checkId: 'X', documentationUri: '/doc' }],
+      new Map([['CL_X', 'CI_PERFORMANCE']]),
+      { logger: { warn: (message) => warnings.push(message) } },
+    );
+    assert.equal(failing, 0);
+    assert.equal(warnings.length, 1);
+    assert.match(warnings[0]!, /documentation read failed/);
+  });
+});
+
+describe('formatters', () => {
+  it('GitLab Code Quality exports check_category when enriched', async () => {
+    const directory = await mkdtemp(join(tmpdir(), 'adt-atc-categories-'));
+    temporaryDirectories.push(directory);
+    const output = join(directory, 'gl-code-quality.json');
+    const result: AtcResult = {
+      checkVariant: 'DEFAULT',
+      totalFindings: 2,
+      errorCount: 0,
+      warningCount: 0,
+      infoCount: 2,
+      findings: [
+        finding('CL_CI_TEST_SELECT_TAW_A'),
+        finding('CL_UNKNOWN_CHECK'),
+      ],
+    };
+    enrichResultWithCategories(
+      result,
+      parseCheckCategoryIndex(formTemplateDocument()),
+    );
+
+    await outputGitLabCodeQuality(result, output);
+    const report = JSON.parse(readFileSync(output, 'utf-8'));
+    assert.equal(report.length, 2);
+    assert.equal(report[0].check_category, 'CI_PERFORMANCE');
+    assert.equal('check_category' in report[1], false);
+    // The stable check identifier travels alongside the display title
+    assert.equal(report[0].check_id, 'CL_CI_TEST_SELECT_TAW_A');
+    assert.equal(report[1].check_id, 'CL_UNKNOWN_CHECK');
+  });
+
+  it('SARIF rule properties carry the category when enriched', async () => {
+    const directory = mkdtempSync(join(tmpdir(), 'adt-atc-categories-'));
+    temporaryDirectories.push(directory);
+    const output = join(directory, 'report.sarif');
+    const result: AtcResult = {
+      checkVariant: 'DEFAULT',
+      totalFindings: 1,
+      errorCount: 0,
+      warningCount: 0,
+      infoCount: 1,
+      findings: [finding('CL_CI_TEST_SELECT_TAW_A')],
+    };
+    enrichResultWithCategories(
+      result,
+      parseCheckCategoryIndex(formTemplateDocument()),
+    );
+
+    await outputSarifReport(result, output);
+    const sarif = JSON.parse(readFileSync(output, 'utf-8'));
+    const rule = sarif.runs[0].tool.driver.rules[0];
+    assert.equal(rule.id, 'CL_CI_TEST_SELECT_TAW_A');
+    assert.equal(rule.properties.category, 'CI_PERFORMANCE');
+  });
+
+  it('SARIF rule properties omit the category when not enriched', async () => {
+    const directory = mkdtempSync(join(tmpdir(), 'adt-atc-categories-'));
+    temporaryDirectories.push(directory);
+    const output = join(directory, 'report.sarif');
+    const result: AtcResult = {
+      checkVariant: 'DEFAULT',
+      totalFindings: 1,
+      errorCount: 0,
+      warningCount: 0,
+      infoCount: 1,
+      findings: [finding('CL_CI_TEST_SELECT_TAW_A')],
+    };
+
+    await outputSarifReport(result, output);
+    const sarif = JSON.parse(readFileSync(output, 'utf-8'));
+    const rule = sarif.runs[0].tool.driver.rules[0];
+    assert.equal('category' in rule.properties, false);
+  });
+});
diff --git a/packages/adt-contracts/src/adt/atc/index.ts b/packages/adt-contracts/src/adt/atc/index.ts
index 0631e3df9..c05ab60c2 100644
--- a/packages/adt-contracts/src/adt/atc/index.ts
+++ b/packages/adt-contracts/src/adt/atc/index.ts
@@ -8,10 +8,11 @@
  * - /sap/bc/adt/atc/runs → atc.runs (manual - POST with body)
  * - /sap/bc/adt/atc/results → atc.results (generated)
  * - /sap/bc/adt/atc/worklists → atc.worklists (generated + manual create)
+ * - /sap/bc/adt/atc/checkvariants → atc.checkvariants (manual - formtemplate)
  */
 
 import { http, contract } from '../../base';
-import { atcworklist, atc, atcRun } from '../../schemas';
+import { atcworklist, atc, atcRun, chkvFormTemplate } from '../../schemas';
 
 // Re-export generated contracts
 export { worklistsContract } from '../../generated/adt/sap/bc/adt/atc/worklists';
@@ -57,6 +58,31 @@ const runs = contract({
     }),
 });
 
+/**
+ * /sap/bc/adt/atc/checkvariants - Extended
+ *
+ * Adds the form template read endpoint not in generated contracts
+ */
+const checkvariantsExtended = contract({
+  /**
+   * GET /sap/bc/adt/atc/checkvariants/formtemplate{?chkvName}
+   *
+   * Reads a check variant's form template: the check catalog with every
+   * available check category and its checks. Each check carries its
+   * implementing class, whose name is the checkId that ATC worklist
+   * findings report — the basis for check category enrichment.
+   *
+   * NOTE: Not in SAP discovery - manually defined
+   * @source live S/4 system capture, 2026-10-21
+   */
+  formtemplate: (params?: { chkvName?: string }) =>
+    http.get('/sap/bc/adt/atc/checkvariants/formtemplate', {
+      query: params,
+      responses: { 200: chkvFormTemplate },
+      headers: { Accept: 'application/xml' },
+    }),
+});
+
 /**
  * /sap/bc/adt/atc/worklists - Extended
  *
@@ -88,11 +114,15 @@ import { resultsContract } from '../../generated/adt/sap/bc/adt/atc/results';
  * - customizing (not in discovery)
  * - runs POST (not in discovery)
  * - worklists.create (not in discovery)
+ * - checkvariants.formtemplate (not in discovery)
  */
 export const atcContract = {
   customizing,
   runs,
   results: resultsContract,
+  checkvariants: {
+    ...checkvariantsExtended,
+  },
   worklists: {
     ...worklistsContract,
     ...worklistsExtended,
diff --git a/packages/adt-contracts/src/generated/schemas.ts b/packages/adt-contracts/src/generated/schemas.ts
index fb7c53f6f..defba24b1 100644
--- a/packages/adt-contracts/src/generated/schemas.ts
+++ b/packages/adt-contracts/src/generated/schemas.ts
@@ -35,6 +35,7 @@ export const badi = toSpeciSchema(adtSchemas.badi);
 export const blueSource = toSpeciSchema(adtSchemas.blueSource);
 export const checklist = toSpeciSchema(adtSchemas.checklist);
 export const checkrun = toSpeciSchema(adtSchemas.checkrun);
+export const chkvFormTemplate = toSpeciSchema(adtSchemas.chkvFormTemplate);
 export const classes = toSpeciSchema(adtSchemas.classes);
 export const configuration = toSpeciSchema(adtSchemas.configuration);
 export const configurations = toSpeciSchema(adtSchemas.configurations);
diff --git a/packages/adt-contracts/tests/contracts/atc-typed.test.ts b/packages/adt-contracts/tests/contracts/atc-typed.test.ts
index 164eb530e..064259e03 100644
--- a/packages/adt-contracts/tests/contracts/atc-typed.test.ts
+++ b/packages/adt-contracts/tests/contracts/atc-typed.test.ts
@@ -121,3 +121,84 @@ class AtcWorklistGetScenario extends TypedContractScenario<WorklistGetContract>
 
 // Run the typed scenario
 runTypedScenario(new AtcWorklistGetScenario());
+
+// =============================================================================
+// ATC Check Variant Form Template - Typed Contract Scenario
+// =============================================================================
+
+import { atcContract } from '../../src/adt/atc';
+import { chkvFormTemplate } from '../../src/schemas';
+
+type FormtemplateContract = (typeof atcContract.checkvariants)['formtemplate'];
+type FormtemplateRequest = ExtractRequest<FormtemplateContract>;
+type FormtemplateResponse = InferTypedSchema<typeof chkvFormTemplate>;
+
+/**
+ * ATC Check Variant Form Template GET Scenario
+ *
+ * Validates the manually defined checkvariants.formtemplate contract with
+ * full type inference: the parsed form template gives typed access to
+ * category objects, checks, implementing classes (finding checkIds) and
+ * check parameters.
+ */
+class AtcFormtemplateGetScenario extends TypedContractScenario<FormtemplateContract> {
+  readonly name = 'ATC Check Variant Form Template GET - Typed';
+  readonly contract = atcContract.checkvariants.formtemplate;
+  readonly fixture = fixtures.atc.formtemplate;
+
+  override getContractParams(): Parameters<FormtemplateContract> {
+    return [{ chkvName: 'DEFAULT' }];
+  }
+
+  override assertRequest(req: FormtemplateRequest): void {
+    // ✅ TYPE CHECK: method is typed as 'GET'
+    expect(req.method).toBe('GET');
+
+    // ✅ TYPE CHECK: path is typed as a literal
+    expect(req.path).toBe('/sap/bc/adt/atc/checkvariants/formtemplate');
+
+    // ✅ TYPE CHECK: query params are typed from the contract definition
+    expect(req.query?.chkvName).toBe('DEFAULT');
+  }
+
+  override assertResponse(res: FormtemplateResponse): void {
+    // ✅ TYPE CHECK: response is typed from the chkvFormTemplate schema
+    expect(res).toBeDefined();
+    expect(typeof res).toBe('object');
+
+    // ✅ FULLY TYPED: category objects, checks, implementing classes
+    const categories =
+      res.formTemplate.availableCheckCategories.availableCheckCategory;
+    expect(categories.length).toBeGreaterThanOrEqual(2);
+
+    const performance = categories.find(
+      (c) => c.checkCategoryObject.name === 'CI_PERFORMANCE',
+    );
+    expect(performance).toBeDefined();
+    expect(performance!.checkCategoryObject.description).toBe('Performance');
+
+    const analyzeWhere = (performance!.check ?? []).find(
+      (c) => c.checkObject.name === 'CI_ANALYZE_WHERE',
+    );
+    expect(analyzeWhere).toBeDefined();
+    // The implementing class name is the checkId findings carry
+    expect(analyzeWhere!.checkObject.content?.implementingClass?.name).toBe(
+      'CL_CI_TEST_SELECT_TAW_A',
+    );
+    expect(analyzeWhere!.checkObject.content?.category?.name).toBe(
+      'CI_PERFORMANCE',
+    );
+    expect(analyzeWhere!.checkObject.content?.remoteEnabled).toBe(true);
+
+    // ✅ FULLY TYPED: check parameters
+    const parameters =
+      analyzeWhere!.checkObject.content?.parameters?.parameter ?? [];
+    expect(parameters.length).toBeGreaterThan(0);
+    expect(parameters.some((p) => p.parameterName === 'NoWhereCondition')).toBe(
+      true,
+    );
+  }
+}
+
+// Run the typed form template scenario
+runTypedScenario(new AtcFormtemplateGetScenario());
diff --git a/packages/adt-contracts/tests/contracts/atc.test.ts b/packages/adt-contracts/tests/contracts/atc.test.ts
index da9008407..5dc00567c 100644
--- a/packages/adt-contracts/tests/contracts/atc.test.ts
+++ b/packages/adt-contracts/tests/contracts/atc.test.ts
@@ -9,12 +9,14 @@
  */
 
 import { fixtures } from '@abapify/adt-fixtures';
-import { atcworklist } from '../../src/schemas';
+import { atcworklist, chkvFormTemplate } from '../../src/schemas';
 import { ContractScenario, runScenario, type ContractOperation } from './base';
 
 // Import GENERATED contracts
 import { worklistsContract } from '../../src/generated/adt/sap/bc/adt/atc/worklists';
 import { resultsContract } from '../../src/generated/adt/sap/bc/adt/atc/results';
+// Import MANUAL (extended) contract
+import { atcContract } from '../../src/adt/atc';
 
 // =============================================================================
 // Contract Definition Tests - using generated contracts
@@ -116,5 +118,35 @@ class AtcResultsScenario extends ContractScenario {
 // Run contract definition scenarios
 // =============================================================================
 
+class AtcCheckvariantsScenario extends ContractScenario {
+  readonly name = 'ATC Check Variants (Manual)';
+
+  readonly operations: ContractOperation[] = [
+    {
+      name: 'get form template for a check variant',
+      contract: () => atcContract.checkvariants.formtemplate(),
+      method: 'GET',
+      path: '/sap/bc/adt/atc/checkvariants/formtemplate',
+      headers: { Accept: 'application/xml' },
+      response: {
+        status: 200,
+        schema: chkvFormTemplate,
+        fixture: fixtures.atc.formtemplate,
+      },
+    },
+    {
+      name: 'get form template with a named variant',
+      contract: () =>
+        atcContract.checkvariants.formtemplate({ chkvName: 'DEFAULT' }),
+      method: 'GET',
+      path: '/sap/bc/adt/atc/checkvariants/formtemplate',
+      headers: { Accept: 'application/xml' },
+      query: { chkvName: 'DEFAULT' },
+      response: { status: 200, schema: chkvFormTemplate },
+    },
+  ];
+}
+
 runScenario(new AtcWorklistsScenario());
 runScenario(new AtcResultsScenario());
+runScenario(new AtcCheckvariantsScenario());
diff --git a/packages/adt-fixtures/src/fixtures/atc/formtemplate.xml b/packages/adt-fixtures/src/fixtures/atc/formtemplate.xml
new file mode 100644
index 000000000..434652dd4
--- /dev/null
+++ b/packages/adt-fixtures/src/fixtures/atc/formtemplate.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Source: GET /sap/bc/adt/atc/checkvariants/formtemplate?chkvName=DEFAULT
+  (a live S/4 system, read-only capture, 2026-10-21)
+
+  Sanitized: the customer-owned check category and its checks were renamed
+  to ZEXAMPLE_* and their descriptions paraphrased; SAP-standard
+  categories, checks, implementing classes and parameters are unchanged.
+  Truncated to three categories (CI_PERFORMANCE, CI_SECURITY, and the
+  sanitized custom category) to keep the fixture small; the retained check
+  entries keep their full real shape (parameters, parameterValueXml,
+  documentation/technicalsettings links).
+
+  The check variant form template is the ATC check catalog: each
+  availableCheckCategory lists its checks, and each check's
+  implementingClass name is the checkId that ATC worklist findings carry.
+-->
+<chkvFormTemplate:formTemplate xmlns:adtcore="http://www.sap.com/adt/core" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:chkc="http://www.sap.com/wbobj/atc/chkc" xmlns:chko="http://www.sap.com/wbobj/atc/chko" xmlns:chkoParameter="http://www.sap.com/wbobj/atc/chkoParameter" xmlns:chkvFormTemplate="http://www.sap.com/wbobj/atc/chkvFormTemplate" xmlns:chkvcheck="http://www.sap.com/wbobj/atc/chkvCheck">
+  <chkvFormTemplate:availableCheckCategories>
+    <chkvFormTemplate:availableCheckCategory>
+      <chkc:checkCategoryObject adtcore:name="CI_PERFORMANCE" adtcore:description="Performance">
+        <chkc:content>
+          <chkc:category adtcore:type="CHKC/TYP"/>
+        </chkc:content>
+      </chkc:checkCategoryObject>
+      <chkvcheck:check>
+        <chko:checkObject adtcore:name="CI_ANALYZE_WHERE" adtcore:description="Analysis of WHERE conditions of SELECT statements">
+          <chko:content>
+            <chko:category adtcore:name="CI_PERFORMANCE"/>
+            <chko:implementingClass adtcore:name="CL_CI_TEST_SELECT_TAW_A"/>
+            <chko:remoteEnabled>true</chko:remoteEnabled>
+            <chkoParameter:parameters>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>1</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>NoWhereCondition</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>No WHERE condition</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>2</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>NoIndexInWhereCondition</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>No index field in WHERE</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>3</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>NoFirstIndexFieldInWhereCondition</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>No first index field in WHERE</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>4</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>ClientSpecifiedWithoutMandt</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>CLIENT SPECIFIED without MANDT</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+            </chkoParameter:parameters>
+          </chko:content>
+        </chko:checkObject>
+        <chkvcheck:parameterValueXml/>
+        <atom:link href="/sap/bc/adt/documentation/atc/documents/test/CL_CI_TEST_SELECT_TAW_A" rel="http://www.sap.com/adt/relations/documentation" type="application/vnd.sap.adt.docu.v1+html"/>
+        <atom:link href="/sap/bc/adt/atc/checkvariants/formtemplate?test=CI_ANALYZE_WHERE" rel="http://www.sap.com/adt/relations/technicalsettings" type="text/plain"/>
+      </chkvcheck:check>
+      <chkvcheck:check>
+        <chko:checkObject adtcore:name="CI_ANALYZE_SELECT_HANA" adtcore:description="Search suboptimal SELECT * statements">
+          <chko:content>
+            <chko:category adtcore:name="CI_PERFORMANCE"/>
+            <chko:implementingClass adtcore:name="CL_CI_TEST_ANALYZE_SELECT_HANA"/>
+            <chko:remoteEnabled>true</chko:remoteEnabled>
+            <chkoParameter:parameters>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>10</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>DisplayDetails</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Display detail information</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>false</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>12</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>AssignmentEffort</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Effort for one assignment</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>13</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>AssignmentColumnAccess</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Effort for one column access</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>2</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>RestrictToTables</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Only search for these tables</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>3</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>MinimumTableSizeCategory</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Minimum table size category</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>4</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>MinimumNumberOfTableFields</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Minimum number of table fields</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>5</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>PercentageOfFields</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Percentage of fields</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>6</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>ExcludeBufferedReads</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Exclude buffered reads</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>7</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>OnlyLocalProcedures</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Analyze only local procedures</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>8</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>NonLocalAnalysisDepth</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Non-local analysis depth</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>9</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>DoNotTransformSelects</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Not to be transformed selects</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+            </chkoParameter:parameters>
+          </chko:content>
+        </chko:checkObject>
+        <chkvcheck:parameterValueXml/>
+        <atom:link href="/sap/bc/adt/documentation/atc/documents/test/CL_CI_TEST_ANALYZE_SELECT_HANA" rel="http://www.sap.com/adt/relations/documentation" type="application/vnd.sap.adt.docu.v1+html"/>
+        <atom:link href="/sap/bc/adt/atc/checkvariants/formtemplate?test=CI_ANALYZE_SELECT_HANA" rel="http://www.sap.com/adt/relations/technicalsettings" type="text/plain"/>
+      </chkvcheck:check>
+      <chkvcheck:check>
+        <chko:checkObject adtcore:name="CI_SELECT_TAW_BYBUF" adtcore:description="SELECT statements that bypass the table buffer">
+          <chko:content>
+            <chko:category adtcore:name="CI_PERFORMANCE"/>
+            <chko:implementingClass adtcore:name="CL_CI_TEST_SELECT_TAW_BYBUF"/>
+            <chko:remoteEnabled>true</chko:remoteEnabled>
+          </chko:content>
+        </chko:checkObject>
+        <chkvcheck:parameterValueXml/>
+        <atom:link href="/sap/bc/adt/documentation/atc/documents/test/CL_CI_TEST_SELECT_TAW_BYBUF" rel="http://www.sap.com/adt/relations/documentation" type="application/vnd.sap.adt.docu.v1+html"/>
+        <atom:link href="/sap/bc/adt/atc/checkvariants/formtemplate?test=CI_SELECT_TAW_BYBUF" rel="http://www.sap.com/adt/relations/technicalsettings" type="text/plain"/>
+      </chkvcheck:check>
+    </chkvFormTemplate:availableCheckCategory>
+    <chkvFormTemplate:availableCheckCategory>
+      <chkc:checkCategoryObject adtcore:name="CI_SECURITY" adtcore:description="Security">
+        <chkc:content>
+          <chkc:category adtcore:type="CHKC/TYP"/>
+        </chkc:content>
+      </chkc:checkCategoryObject>
+      <chkvcheck:check>
+        <chko:checkObject adtcore:name="BSP_SEC" adtcore:description="BSP Security Checks">
+          <chko:content>
+            <chko:category adtcore:name="CI_SECURITY"/>
+            <chko:implementingClass adtcore:name="CL_CI_TEST_CVA_BSP_SEC"/>
+            <chko:remoteEnabled>true</chko:remoteEnabled>
+          </chko:content>
+        </chko:checkObject>
+        <chkvcheck:parameterValueXml/>
+        <atom:link href="/sap/bc/adt/documentation/atc/documents/test/CL_CI_TEST_CVA_BSP_SEC" rel="http://www.sap.com/adt/relations/documentation" type="application/vnd.sap.adt.docu.v1+html"/>
+        <atom:link href="/sap/bc/adt/atc/checkvariants/formtemplate?test=BSP_SEC" rel="http://www.sap.com/adt/relations/technicalsettings" type="text/plain"/>
+      </chkvcheck:check>
+      <chkvcheck:check>
+        <chko:checkObject adtcore:name="CI_FIND_DYN_SQL" adtcore:description="Usage of ADBC-interface">
+          <chko:content>
+            <chko:category adtcore:name="CI_SECURITY"/>
+            <chko:implementingClass adtcore:name="CL_CI_TEST_FIND_DYN_SQL"/>
+            <chko:remoteEnabled>true</chko:remoteEnabled>
+            <chkoParameter:parameters>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>2</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>UsageOfADBCClasses</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Find usages of ADBC classes</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>3</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>UsageOfClasses</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Find usages of the following classes</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>MSGF</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>FindingGranularity</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Report findings on the level of programs, includes or statements</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+            </chkoParameter:parameters>
+          </chko:content>
+        </chko:checkObject>
+        <chkvcheck:parameterValueXml/>
+        <atom:link href="/sap/bc/adt/documentation/atc/documents/test/CL_CI_TEST_FIND_DYN_SQL" rel="http://www.sap.com/adt/relations/documentation" type="application/vnd.sap.adt.docu.v1+html"/>
+        <atom:link href="/sap/bc/adt/atc/checkvariants/formtemplate?test=CI_FIND_DYN_SQL" rel="http://www.sap.com/adt/relations/technicalsettings" type="text/plain"/>
+      </chkvcheck:check>
+    </chkvFormTemplate:availableCheckCategory>
+    <chkvFormTemplate:availableCheckCategory>
+      <chkc:checkCategoryObject adtcore:name="ZEXAMPLE_CI_CATEGORY" adtcore:description="Example custom category">
+        <chkc:content>
+          <chkc:category adtcore:type="CHKC/TYP"/>
+        </chkc:content>
+      </chkc:checkCategoryObject>
+      <chkvcheck:check>
+        <chko:checkObject adtcore:name="ZEXAMPLE_CI_CHECK" adtcore:description="Example custom check implementation">
+          <chko:content>
+            <chko:category adtcore:name="ZEXAMPLE_CI_CATEGORY"/>
+            <chko:implementingClass adtcore:name="ZEXAMPLE_CL_CHECK_IMPL"/>
+            <chko:remoteEnabled>true</chko:remoteEnabled>
+            <chkoParameter:parameters>
+              <chkoParameter:parameter>
+                <chkoParameter:parameterTechnicalId>1</chkoParameter:parameterTechnicalId>
+                <chkoParameter:parameterName>trackLanguageVersion</chkoParameter:parameterName>
+                <chkoParameter:parameterDescription>Track Language Version</chkoParameter:parameterDescription>
+                <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+              </chkoParameter:parameter>
+            </chkoParameter:parameters>
+          </chko:content>
+        </chko:checkObject>
+        <chkvcheck:parameterValueXml/>
+        <atom:link href="/sap/bc/adt/documentation/atc/documents/test/ZEXAMPLE_CL_CHECK_IMPL" rel="http://www.sap.com/adt/relations/documentation" type="application/vnd.sap.adt.docu.v1+html"/>
+        <atom:link href="/sap/bc/adt/atc/checkvariants/formtemplate?test=ZEXAMPLE_CI_CHECK" rel="http://www.sap.com/adt/relations/technicalsettings" type="text/plain"/>
+      </chkvcheck:check>
+    </chkvFormTemplate:availableCheckCategory>
+  </chkvFormTemplate:availableCheckCategories>
+</chkvFormTemplate:formTemplate>
diff --git a/packages/adt-fixtures/src/fixtures/mcp/atc/documentation-amdp-hdb-migration.html b/packages/adt-fixtures/src/fixtures/mcp/atc/documentation-amdp-hdb-migration.html
new file mode 100644
index 000000000..bc8e25054
--- /dev/null
+++ b/packages/adt-fixtures/src/fixtures/mcp/atc/documentation-amdp-hdb-migration.html
@@ -0,0 +1,8 @@
+<h3>Appl. Comp. Check / Check Class / Message Code</h3>
+<p>BC-ABA-LA / CL_CI_TEST_AMDP_HDB_MIGRATION / 0501<br /></p>
+<h3>Details of Analysis</h3>
+<ul>
+  <li>Consider migrating to AMDP</li>
+</ul>
+<h3>What is checked?</h3>
+<p>Usage of ABAP Managed Database Procedures.</p>
diff --git a/packages/adt-fixtures/src/fixtures/mcp/atc/formtemplate.xml b/packages/adt-fixtures/src/fixtures/mcp/atc/formtemplate.xml
new file mode 100644
index 000000000..a56e1d84e
--- /dev/null
+++ b/packages/adt-fixtures/src/fixtures/mcp/atc/formtemplate.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  MCP mock-server ATC check variant form template.
+
+  TODO-synthetic: minimal fabricated catalog for the mock server's ATC
+  worklist fixture. The worklist's first finding carries a GUID checkId
+  (the live worklist shape), so the atc_run tool resolves it through the
+  documentation bridge: the mock documentation page (documentation/
+  amdp-hdb-migration.html) names CL_CI_TEST_AMDP_HDB_MIGRATION, which
+  this catalog assigns to CI_SYNTAX. The second finding's checkId is
+  already a catalog class name and resolves directly to CI_PERFORMANCE.
+  Entry shapes follow the real sanitized fixture at
+  fixtures/atc/formtemplate.xml (source:
+  GET /sap/bc/adt/atc/checkvariants/formtemplate?chkvName=DEFAULT,
+  a live S/4 system, read-only capture, 2026-10-21).
+-->
+<chkvFormTemplate:formTemplate xmlns:chkvFormTemplate="http://www.sap.com/wbobj/atc/chkvFormTemplate"
+    xmlns:chkc="http://www.sap.com/wbobj/atc/chkc"
+    xmlns:chkvcheck="http://www.sap.com/wbobj/atc/chkvCheck"
+    xmlns:chko="http://www.sap.com/wbobj/atc/chko"
+    xmlns:adtcore="http://www.sap.com/adt/core">
+  <chkvFormTemplate:availableCheckCategories>
+    <chkvFormTemplate:availableCheckCategory>
+      <chkc:checkCategoryObject adtcore:name="CI_SYNTAX" adtcore:description="Syntax and activation">
+        <chkc:content>
+          <chkc:category adtcore:type="CHKC/TYP"/>
+        </chkc:content>
+      </chkc:checkCategoryObject>
+      <chkvcheck:check>
+        <chko:checkObject adtcore:name="CI_AMDP_HDB_MIGRATION" adtcore:description="Usage of ABAP Managed Database Procedures">
+          <chko:content>
+            <chko:category adtcore:name="CI_SYNTAX"/>
+            <chko:implementingClass adtcore:name="CL_CI_TEST_AMDP_HDB_MIGRATION"/>
+            <chko:remoteEnabled>true</chko:remoteEnabled>
+          </chko:content>
+        </chko:checkObject>
+        <chkvcheck:parameterValueXml/>
+      </chkvcheck:check>
+    </chkvFormTemplate:availableCheckCategory>
+    <chkvFormTemplate:availableCheckCategory>
+      <chkc:checkCategoryObject adtcore:name="CI_PERFORMANCE" adtcore:description="Performance">
+        <chkc:content>
+          <chkc:category adtcore:type="CHKC/TYP"/>
+        </chkc:content>
+      </chkc:checkCategoryObject>
+      <chkvcheck:check>
+        <chko:checkObject adtcore:name="CI_ANALYZE_WHERE" adtcore:description="Analysis of WHERE conditions of SELECT statements">
+          <chko:content>
+            <chko:category adtcore:name="CI_PERFORMANCE"/>
+            <chko:implementingClass adtcore:name="CL_CI_TEST_SELECT_TAW_A"/>
+            <chko:remoteEnabled>true</chko:remoteEnabled>
+          </chko:content>
+        </chko:checkObject>
+        <chkvcheck:parameterValueXml/>
+      </chkvcheck:check>
+    </chkvFormTemplate:availableCheckCategory>
+  </chkvFormTemplate:availableCheckCategories>
+</chkvFormTemplate:formTemplate>
diff --git a/packages/adt-fixtures/src/fixtures/mcp/atc/worklist.json b/packages/adt-fixtures/src/fixtures/mcp/atc/worklist.json
index 5699f32fb..d90258801 100644
--- a/packages/adt-fixtures/src/fixtures/mcp/atc/worklist.json
+++ b/packages/adt-fixtures/src/fixtures/mcp/atc/worklist.json
@@ -6,11 +6,24 @@
       "name": "ZCL_EXAMPLE",
       "findings": [
         {
-          "checkId": "CL_CI_TEST_AMDP_HDB_MIGRATION",
+          "checkId": "6A277D3B1C4E4F80A9B2C3D4E5F60718",
           "checkTitle": "AMDP HDB Migration",
           "messageTitle": "Consider migrating to AMDP",
           "priority": 2,
-          "uri": "/sap/bc/adt/oo/classes/zcl_example/source/main#start=10,0"
+          "uri": "/sap/bc/adt/oo/classes/zcl_example/source/main#start=10,0",
+          "link": [
+            {
+              "href": "/sap/bc/adt/documentation/atc/documents/itemid/6A277D3B/index/1",
+              "rel": "http://www.sap.com/adt/relations/documentation"
+            }
+          ]
+        },
+        {
+          "checkId": "CL_CI_TEST_SELECT_TAW_A",
+          "checkTitle": "Analysis of WHERE Condition for SELECT",
+          "messageTitle": "No WHERE condition",
+          "priority": 3,
+          "uri": "/sap/bc/adt/oo/classes/zcl_example/source/main#start=15,0"
         }
       ]
     }
diff --git a/packages/adt-fixtures/src/fixtures/registry.ts b/packages/adt-fixtures/src/fixtures/registry.ts
index 725fc32fc..82d32dae6 100644
--- a/packages/adt-fixtures/src/fixtures/registry.ts
+++ b/packages/adt-fixtures/src/fixtures/registry.ts
@@ -22,6 +22,10 @@ export const registry = {
     customizing: 'atc/customizing.xml',
     worklist: 'atc/worklist.xml',
     runsResponse: 'atc/runs-response.xml',
+    // Check variant form template (the ATC check catalog): categories,
+    // checks, implementing classes (= worklist finding checkIds) and check
+    // parameters. Sanitized from a live S/4 system capture (see file header).
+    formtemplate: 'atc/formtemplate.xml',
   },
   aunit: {
     runRequest: 'aunit/run-request.xml',
@@ -206,6 +210,10 @@ export const registry = {
     atc: {
       run: 'mcp/atc/run.json',
       worklist: 'mcp/atc/worklist.json',
+      // Synthetic minimal catalog + documentation page for the mock worklist
+      // fixture (TODO-synthetic; see file headers for the real sources).
+      formtemplate: 'mcp/atc/formtemplate.xml',
+      documentation: 'mcp/atc/documentation-amdp-hdb-migration.html',
     },
     source: {
       class: 'mcp/source/class.abap',
diff --git a/packages/adt-fixtures/src/mock-server/routes.ts b/packages/adt-fixtures/src/mock-server/routes.ts
index ced388618..726e0addc 100644
--- a/packages/adt-fixtures/src/mock-server/routes.ts
+++ b/packages/adt-fixtures/src/mock-server/routes.ts
@@ -222,6 +222,8 @@ export interface LoadedFixtures {
   searchconfigMetadata: string;
   atcRun: string;
   atcWorklist: string;
+  atcFormtemplate: string;
+  atcDocumentation: string;
   sourceClass: string;
   sourceTestClasses: string;
   lockResponse: string;
@@ -332,6 +334,8 @@ export async function loadRouteFixtures(): Promise<LoadedFixtures> {
     searchconfigMetadata,
     atcRun,
     atcWorklist,
+    atcFormtemplate,
+    atcDocumentation,
     sourceClass,
     sourceTestClasses,
     lockResponse,
@@ -421,6 +425,8 @@ export async function loadRouteFixtures(): Promise<LoadedFixtures> {
     fixtures.transport.searchconfigMetadata.load(),
     m.atc.run.load(),
     m.atc.worklist.load(),
+    m.atc.formtemplate.load(),
+    m.atc.documentation.load(),
     m.source.class.load(),
     m.source.testClasses.load(),
     m.lockResponse.load(),
@@ -516,6 +522,8 @@ export async function loadRouteFixtures(): Promise<LoadedFixtures> {
     searchconfigMetadata,
     atcRun,
     atcWorklist,
+    atcFormtemplate,
+    atcDocumentation,
     sourceClass,
     sourceTestClasses,
     lockResponse,
@@ -1685,6 +1693,32 @@ export function matchRoute(
     };
   }
 
+  // ATC check variant form template (the check catalog used for the
+  // atc_run tool's check category enrichment)
+  if (
+    m === 'GET' &&
+    pathname === '/sap/bc/adt/atc/checkvariants/formtemplate'
+  ) {
+    return {
+      status: 200,
+      body: f.atcFormtemplate,
+      contentType: 'application/xml',
+    };
+  }
+
+  // ATC finding documentation page (the documentation bridge for the
+  // atc_run tool's GUID checkId enrichment)
+  if (
+    m === 'GET' &&
+    url.startsWith('/sap/bc/adt/documentation/atc/documents/')
+  ) {
+    return {
+      status: 200,
+      body: f.atcDocumentation,
+      contentType: 'text/html',
+    };
+  }
+
   // Test classes include
   if (m === 'GET' && url.includes('/includes/testclasses')) {
     return {
diff --git a/packages/adt-mcp/package.json b/packages/adt-mcp/package.json
index 5ba8a4819..ff94229eb 100644
--- a/packages/adt-mcp/package.json
+++ b/packages/adt-mcp/package.json
@@ -32,6 +32,7 @@
   "dependencies": {
     "@abapify/adk": "0.4.20",
     "@abapify/adt-aunit": "0.4.20",
+    "@abapify/adt-atc": "0.4.20",
     "@abapify/adt-client": "0.4.20",
     "@abapify/adt-config": "0.4.20",
     "@abapify/adt-contracts": "0.4.20",
diff --git a/packages/adt-mcp/src/lib/tools/atc-run.ts b/packages/adt-mcp/src/lib/tools/atc-run.ts
index c75348862..65b10114e 100644
--- a/packages/adt-mcp/src/lib/tools/atc-run.ts
+++ b/packages/adt-mcp/src/lib/tools/atc-run.ts
@@ -9,6 +9,11 @@
 import { z } from 'zod';
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { AdtClient } from '@abapify/adt-client';
+import {
+  fetchCheckCategoryIndex,
+  enrichFindingsWithCategories,
+  resolveCategoriesViaDocumentation,
+} from '@abapify/adt-atc';
 import type { ToolContext } from '../types';
 import { sessionOrConnectionShape } from './shared-schemas';
 import { resolveClient } from './session-helpers';
@@ -96,7 +101,22 @@ function lineFromLocation(value: unknown): number | undefined {
   return Number.isSafeInteger(line) && line > 0 ? line : undefined;
 }
 
-function canonicalFindings(response: unknown): UnknownRecord[] {
+/** Canonical finding record: an unknown record with a guaranteed checkId. */
+type CanonicalFindingRecord = UnknownRecord & { checkId: string };
+
+/** The trusted documentation link of one worklist finding (atom:link). */
+function documentationUriFromFinding(
+  finding: UnknownRecord,
+): string | undefined {
+  const link = records(finding.link).find(
+    (entry) =>
+      stringField(entry, 'rel') ===
+      'http://www.sap.com/adt/relations/documentation',
+  );
+  return link ? stringField(link, 'href') : undefined;
+}
+
+function canonicalFindings(response: unknown): CanonicalFindingRecord[] {
   const root = record(response);
   const worklist = record(root?.worklist) ?? root;
   const objects = records(worklist?.objects).flatMap((entry) =>
@@ -108,6 +128,7 @@ function canonicalFindings(response: unknown): UnknownRecord[] {
     const findings = records(findingsContainer?.finding ?? object.findings);
     return findings.map((finding) => {
       const line = lineFromLocation(finding.location);
+      const documentationUri = documentationUriFromFinding(finding);
       return {
         checkId: stringField(finding, 'checkId') ?? '',
         checkTitle: stringField(finding, 'checkTitle') ?? '',
@@ -116,6 +137,7 @@ function canonicalFindings(response: unknown): UnknownRecord[] {
         objectType: stringField(object, 'type') ?? '',
         objectName: stringField(object, 'name') ?? '',
         ...(line ? { lineStart: line, lineEnd: line } : {}),
+        ...(documentationUri ? { documentationUri } : {}),
         ...(stringField(finding, 'messageId')
           ? { messageId: stringField(finding, 'messageId') }
           : {}),
@@ -240,6 +262,24 @@ export function registerAtcRunTool(server: McpServer, ctx: ToolContext): void {
           includeExemptedFindings: 'false',
         });
         const findings = canonicalFindings(worklist);
+        // Enrich findings with check categories from the run's check variant
+        // form template (best-effort: never fails the run). Live worklist
+        // checkIds are GUIDs, so unresolved findings go through the
+        // documentation bridge (each finding's documentation page names the
+        // check class).
+        const categoryIndex = await fetchCheckCategoryIndex(
+          client,
+          checkVariant,
+        );
+        enrichFindingsWithCategories(findings, categoryIndex);
+        await resolveCategoriesViaDocumentation(
+          client,
+          findings,
+          categoryIndex,
+        );
+        // The model-facing response must stay URI-free: the documentation
+        // link is internal enrichment state only.
+        for (const finding of findings) delete finding.documentationUri;
         if (safePolicy && findings.length > safePolicy.maxFindings) {
           return safeExecuteLimitResult('safe_execute_limit_exceeded');
         }
diff --git a/packages/adt-mcp/tests/integration.test.ts b/packages/adt-mcp/tests/integration.test.ts
index fcfde9a89..ea062e606 100644
--- a/packages/adt-mcp/tests/integration.test.ts
+++ b/packages/adt-mcp/tests/integration.test.ts
@@ -323,6 +323,49 @@ describe('adt-mcp integration tests', () => {
       );
     });
 
+    it('enriches findings with check categories, bridging GUID checkIds through the documentation page', async () => {
+      const { json, raw } = await callTool('atc_run', {
+        ...connArgs(),
+        scope: { kind: 'package', packageName: 'ZPACKAGE' },
+        variant: 'TEST_VARIANT',
+      });
+      assert.notStrictEqual((raw as { isError?: boolean }).isError, true);
+      const data = json as {
+        checkVariant: string;
+        findings: Array<{
+          checkId: string;
+          checkCategory?: string;
+          documentationUri?: string;
+        }>;
+      };
+      assert.ok(data.findings.length >= 2, 'should return both findings');
+      // The first finding carries a GUID checkId (the live worklist shape);
+      // the mock documentation page names CL_CI_TEST_AMDP_HDB_MIGRATION,
+      // which the catalog assigns to CI_SYNTAX — resolved via the bridge
+      assert.strictEqual(
+        data.findings[0]!.checkId,
+        '6A277D3B1C4E4F80A9B2C3D4E5F60718',
+      );
+      assert.strictEqual(
+        data.findings[0]!.checkCategory,
+        'CI_SYNTAX',
+        'the GUID-checkId finding should carry its category via the documentation bridge',
+      );
+      // The second finding's checkId is already a catalog class name and
+      // resolves directly
+      assert.strictEqual(data.findings[1]!.checkId, 'CL_CI_TEST_SELECT_TAW_A');
+      assert.strictEqual(
+        data.findings[1]!.checkCategory,
+        'CI_PERFORMANCE',
+        'the class-name finding should resolve directly through the catalog',
+      );
+      // The model-facing response must stay URI-free: the documentation
+      // link is internal enrichment state only
+      for (const finding of data.findings) {
+        assert.strictEqual(finding.documentationUri, undefined);
+      }
+    });
+
     it('rejects a raw ADT URI as an ATC target', async () => {
       const { raw } = await callTool('atc_run', {
         ...connArgs(),
diff --git a/packages/adt-schemas/.xsd/custom/chkc.xsd b/packages/adt-schemas/.xsd/custom/chkc.xsd
new file mode 100644
index 000000000..d17388fb1
--- /dev/null
+++ b/packages/adt-schemas/.xsd/custom/chkc.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ATC Check Category Object Schema (chkc)
+
+  The check category workbench object as it appears inside the check
+  variant form template (GET /sap/bc/adt/atc/checkvariants/formtemplate).
+
+  Live shape (sanitized):
+  <chkc:checkCategoryObject xmlns:chkc="http://www.sap.com/wbobj/atc/chkc"
+      xmlns:adtcore="http://www.sap.com/adt/core"
+      adtcore:name="CI_PERFORMANCE" adtcore:description="Performance">
+    <chkc:content><chkc:category adtcore:type="CHKC/TYP"/></chkc:content>
+  </chkc:checkCategoryObject>
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:chkc="http://www.sap.com/wbobj/atc/chkc"
+    xmlns:adtcore="http://www.sap.com/adt/core"
+    targetNamespace="http://www.sap.com/wbobj/atc/chkc"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified">
+
+  <xsd:import namespace="http://www.sap.com/adt/core" schemaLocation="../sap/adtcore.xsd"/>
+
+  <!-- The check category workbench object -->
+  <xsd:element name="checkCategoryObject" type="chkc:CheckCategoryObject"/>
+
+  <xsd:complexType name="CheckCategoryObject">
+    <xsd:sequence>
+      <xsd:element name="content" type="chkc:CheckCategoryContent" minOccurs="0" maxOccurs="1" form="unqualified"/>
+    </xsd:sequence>
+    <xsd:attribute ref="adtcore:name" use="required"/>
+    <xsd:attribute ref="adtcore:description"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="CheckCategoryContent">
+    <xsd:sequence>
+      <xsd:element name="category" type="chkc:CheckCategory" minOccurs="0" maxOccurs="1" form="unqualified"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="CheckCategory">
+    <xsd:attribute ref="adtcore:type"/>
+  </xsd:complexType>
+
+</xsd:schema>
diff --git a/packages/adt-schemas/.xsd/custom/chko.xsd b/packages/adt-schemas/.xsd/custom/chko.xsd
new file mode 100644
index 000000000..e7ee9722e
--- /dev/null
+++ b/packages/adt-schemas/.xsd/custom/chko.xsd
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ATC Check Object Schema (chko)
+
+  The check workbench object as it appears inside the check variant form
+  template (GET /sap/bc/adt/atc/checkvariants/formtemplate). The
+  ATC check catalog (its implementing class resolves a finding to its
+  category; see the documentation bridge in adt-atc for the GUID checkId
+  case).
+
+  Live shape (sanitized):
+  <chko:checkObject xmlns:chko="http://www.sap.com/wbobj/atc/chko"
+      xmlns:adtcore="http://www.sap.com/adt/core"
+      adtcore:name="CI_ANALYZE_WHERE"
+      adtcore:description="Analysis of WHERE conditions of SELECT statements">
+    <chko:content>
+      <chko:category adtcore:name="CI_PERFORMANCE"/>
+      <chko:implementingClass adtcore:name="CL_CI_TEST_SELECT_TAW_A"/>
+      <chko:remoteEnabled>true</chko:remoteEnabled>
+      <chkoParameter:parameters xmlns:chkoParameter="http://www.sap.com/wbobj/atc/chkoParameter">
+        <chkoParameter:parameter>
+          <chkoParameter:parameterTechnicalId>1</chkoParameter:parameterTechnicalId>
+          <chkoParameter:parameterName>NoWhereCondition</chkoParameter:parameterName>
+          <chkoParameter:parameterDescription>No WHERE condition</chkoParameter:parameterDescription>
+          <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+        </chkoParameter:parameter>
+      </chkoParameter:parameters>
+    </chko:content>
+  </chko:checkObject>
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:chko="http://www.sap.com/wbobj/atc/chko"
+    xmlns:chkoParameter="http://www.sap.com/wbobj/atc/chkoParameter"
+    xmlns:adtcore="http://www.sap.com/adt/core"
+    targetNamespace="http://www.sap.com/wbobj/atc/chko"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified">
+
+  <xsd:import namespace="http://www.sap.com/adt/core" schemaLocation="../sap/adtcore.xsd"/>
+  <xsd:import namespace="http://www.sap.com/wbobj/atc/chkoParameter" schemaLocation="chkoParameter.xsd"/>
+
+  <!-- The check workbench object -->
+  <xsd:element name="checkObject" type="chko:CheckObject"/>
+
+  <xsd:complexType name="CheckObject">
+    <xsd:sequence>
+      <xsd:element name="content" type="chko:CheckObjectContent" minOccurs="0" maxOccurs="1" form="unqualified"/>
+    </xsd:sequence>
+    <xsd:attribute ref="adtcore:name" use="required"/>
+    <xsd:attribute ref="adtcore:description"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="CheckObjectContent">
+    <xsd:sequence>
+      <xsd:element name="category" type="chko:CheckCategoryAssignment" minOccurs="0" maxOccurs="1" form="unqualified"/>
+      <xsd:element name="implementingClass" type="chko:ImplementingClass" minOccurs="0" maxOccurs="1" form="unqualified"/>
+      <xsd:element name="remoteEnabled" type="xsd:boolean" minOccurs="0" maxOccurs="1" form="unqualified"/>
+      <xsd:element ref="chkoParameter:parameters" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <!-- The category assignment of the check; named CheckCategoryAssignment
+       (not CheckCategory) so its generated interface name does not collide
+       with chkc:CheckCategory in flattened aggregates -->
+  <xsd:complexType name="CheckCategoryAssignment">
+    <xsd:attribute ref="adtcore:name"/>
+  </xsd:complexType>
+
+  <!-- The implementing class: worklist findings carry a GUID checkId, which
+       the documentation bridge resolves to this class name -->
+  <xsd:complexType name="ImplementingClass">
+    <xsd:attribute ref="adtcore:name" use="required"/>
+  </xsd:complexType>
+
+</xsd:schema>
diff --git a/packages/adt-schemas/.xsd/custom/chkoParameter.xsd b/packages/adt-schemas/.xsd/custom/chkoParameter.xsd
new file mode 100644
index 000000000..fce6fee2c
--- /dev/null
+++ b/packages/adt-schemas/.xsd/custom/chkoParameter.xsd
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ATC Check Parameter Schema (chkoParameter)
+
+  The check parameters block inside a check object (chko:content) in the
+  check variant form template. Describes each modifiable check parameter.
+
+  Live shape (sanitized):
+  <chkoParameter:parameters xmlns:chkoParameter="http://www.sap.com/wbobj/atc/chkoParameter">
+    <chkoParameter:parameter>
+      <chkoParameter:parameterTechnicalId>1</chkoParameter:parameterTechnicalId>
+      <chkoParameter:parameterName>NoWhereCondition</chkoParameter:parameterName>
+      <chkoParameter:parameterDescription>No WHERE condition</chkoParameter:parameterDescription>
+      <chkoParameter:parameterModifiable>true</chkoParameter:parameterModifiable>
+    </chkoParameter:parameter>
+  </chkoParameter:parameters>
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:chkoParameter="http://www.sap.com/wbobj/atc/chkoParameter"
+    targetNamespace="http://www.sap.com/wbobj/atc/chkoParameter"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified">
+
+  <!-- The parameters block of a check object -->
+  <xsd:element name="parameters" type="chkoParameter:Parameters"/>
+
+  <xsd:complexType name="Parameters">
+    <xsd:sequence>
+      <xsd:element name="parameter" type="chkoParameter:Parameter" minOccurs="0" maxOccurs="unbounded" form="unqualified"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="Parameter">
+    <xsd:sequence>
+      <xsd:element name="parameterTechnicalId" type="xsd:string" minOccurs="0" maxOccurs="1" form="unqualified"/>
+      <xsd:element name="parameterName" type="xsd:string" minOccurs="0" maxOccurs="1" form="unqualified"/>
+      <xsd:element name="parameterDescription" type="xsd:string" minOccurs="0" maxOccurs="1" form="unqualified"/>
+      <xsd:element name="parameterModifiable" type="xsd:boolean" minOccurs="0" maxOccurs="1" form="unqualified"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+</xsd:schema>
diff --git a/packages/adt-schemas/.xsd/custom/chkvFormTemplate.xsd b/packages/adt-schemas/.xsd/custom/chkvFormTemplate.xsd
new file mode 100644
index 000000000..f48062188
--- /dev/null
+++ b/packages/adt-schemas/.xsd/custom/chkvFormTemplate.xsd
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ATC Check Variant Form Template Schema
+
+  GET /sap/bc/adt/atc/checkvariants/formtemplate?chkvName={name}
+
+  The form template is the check variant editor's catalog: every check
+  category the variant can select, each with the checks it contains.
+  A check carries its category assignment and implementing class; the
+  implementing class name is the checkId used in ATC worklist findings,
+  so the form template is the source for checkId -> check category
+  enrichment.
+
+  Example (live shape, sanitized):
+  <chkvFormTemplate:formTemplate xmlns:chkvFormTemplate="http://www.sap.com/wbobj/atc/chkvFormTemplate">
+    <chkvFormTemplate:availableCheckCategories>
+      <chkvFormTemplate:availableCheckCategory>
+        <chkc:checkCategoryObject xmlns:chkc="http://www.sap.com/wbobj/atc/chkc"
+            adtcore:name="CI_PERFORMANCE" adtcore:description="Performance"
+            xmlns:adtcore="http://www.sap.com/adt/core">
+          <chkc:content><chkc:category adtcore:type="CHKC/TYP"/></chkc:content>
+        </chkc:checkCategoryObject>
+        <chkvcheck:check xmlns:chkvcheck="http://www.sap.com/wbobj/atc/chkvCheck">
+          <chko:checkObject xmlns:chko="http://www.sap.com/wbobj/atc/chko"
+              adtcore:name="CI_ANALYZE_WHERE"
+              adtcore:description="Analysis of WHERE conditions of SELECT statements">
+            <chko:content>
+              <chko:category adtcore:name="CI_PERFORMANCE"/>
+              <chko:implementingClass adtcore:name="CL_CI_TEST_SELECT_TAW_A"/>
+              <chko:remoteEnabled>true</chko:remoteEnabled>
+            </chko:content>
+          </chko:checkObject>
+          <chkvcheck:parameterValueXml/>
+        </chkvcheck:check>
+      </chkvFormTemplate:availableCheckCategory>
+    </chkvFormTemplate:availableCheckCategories>
+  </chkvFormTemplate:formTemplate>
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:chkvFormTemplate="http://www.sap.com/wbobj/atc/chkvFormTemplate"
+    targetNamespace="http://www.sap.com/wbobj/atc/chkvFormTemplate"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified">
+
+  <xsd:import namespace="http://www.sap.com/adt/core" schemaLocation="../sap/adtcore.xsd"/>
+  <xsd:import namespace="http://www.w3.org/2005/Atom" schemaLocation="../sap/atom.xsd"/>
+  <xsd:import namespace="http://www.sap.com/wbobj/atc/chkc" schemaLocation="chkc.xsd"/>
+  <xsd:import namespace="http://www.sap.com/wbobj/atc/chko" schemaLocation="chko.xsd"/>
+  <xsd:import namespace="http://www.sap.com/wbobj/atc/chkvCheck" schemaLocation="chkvcheck.xsd"/>
+  <!-- Direct import of chkoParameter: chko's content references its elements,
+       and interface generation resolves element refs only against direct
+       imports. Without this, the check parameters are dropped from the
+       generated form template types. -->
+  <xsd:import namespace="http://www.sap.com/wbobj/atc/chkoParameter" schemaLocation="chkoParameter.xsd"/>
+
+  <!-- Root element: the check variant form template -->
+  <xsd:element name="formTemplate" type="chkvFormTemplate:FormTemplate"/>
+
+  <xsd:complexType name="FormTemplate">
+    <xsd:sequence>
+      <xsd:element name="availableCheckCategories" type="chkvFormTemplate:AvailableCheckCategories" minOccurs="1" maxOccurs="1" form="unqualified"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="AvailableCheckCategories">
+    <xsd:sequence>
+      <xsd:element name="availableCheckCategory" type="chkvFormTemplate:AvailableCheckCategory" minOccurs="1" maxOccurs="unbounded" form="unqualified"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <!-- One category plus the checks it contains -->
+  <xsd:complexType name="AvailableCheckCategory">
+    <xsd:sequence>
+      <xsd:element ref="chkc:checkCategoryObject" minOccurs="1" maxOccurs="1"/>
+      <xsd:element ref="chkvcheck:check" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+</xsd:schema>
diff --git a/packages/adt-schemas/.xsd/custom/chkvcheck.xsd b/packages/adt-schemas/.xsd/custom/chkvcheck.xsd
new file mode 100644
index 000000000..c4e01ac42
--- /dev/null
+++ b/packages/adt-schemas/.xsd/custom/chkvcheck.xsd
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ATC Check Variant Check Schema (chkvCheck)
+
+  One check entry inside the check variant form template
+  (GET /sap/bc/adt/atc/checkvariants/formtemplate): the check workbench
+  object plus the variant's parameter values for it.
+
+  Live shape (sanitized):
+  <chkvcheck:check xmlns:chkvcheck="http://www.sap.com/wbobj/atc/chkvCheck">
+    <chko:checkObject xmlns:chko="http://www.sap.com/wbobj/atc/chko"
+        adtcore:name="CI_ANALYZE_WHERE" adtcore:description="Analysis of WHERE conditions"
+        xmlns:adtcore="http://www.sap.com/adt/core">
+      <chko:content>...</chko:content>
+    </chko:checkObject>
+    <chkvcheck:parameterValueXml/>
+    <atom:link xmlns:atom="http://www.w3.org/2005/Atom" href="/sap/bc/adt/documentation/..."
+        rel="http://www.sap.com/adt/relations/documentation" type="application/vnd.sap.adt.docu.v1+html"/>
+  </chkvcheck:check>
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:chkvcheck="http://www.sap.com/wbobj/atc/chkvCheck"
+    xmlns:chko="http://www.sap.com/wbobj/atc/chko"
+    xmlns:atom="http://www.w3.org/2005/Atom"
+    targetNamespace="http://www.sap.com/wbobj/atc/chkvCheck"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified">
+
+  <xsd:import namespace="http://www.sap.com/wbobj/atc/chko" schemaLocation="chko.xsd"/>
+  <!-- Direct import of chkoParameter: chko's content references its elements,
+       and interface generation resolves element refs only against direct
+       imports. Without this, the check parameters are dropped from
+       generated types of dependent schemas. -->
+  <xsd:import namespace="http://www.sap.com/wbobj/atc/chkoParameter" schemaLocation="chkoParameter.xsd"/>
+  <xsd:import namespace="http://www.w3.org/2005/Atom" schemaLocation="../sap/atom.xsd"/>
+
+  <!-- One check entry of the form template -->
+  <xsd:element name="check" type="chkvcheck:Check"/>
+
+  <xsd:complexType name="Check">
+    <xsd:sequence>
+      <xsd:element ref="chko:checkObject" minOccurs="1" maxOccurs="1"/>
+      <xsd:element name="parameterValueXml" type="xsd:string" minOccurs="0" maxOccurs="1" form="unqualified"/>
+      <xsd:element ref="atom:link" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+</xsd:schema>
diff --git a/packages/adt-schemas/src/schemas/generated/index.ts b/packages/adt-schemas/src/schemas/generated/index.ts
index c38afc6fd..76eefcbbb 100644
--- a/packages/adt-schemas/src/schemas/generated/index.ts
+++ b/packages/adt-schemas/src/schemas/generated/index.ts
@@ -1,13 +1,13 @@
 /**
  * Auto-generated schema index
  * DO NOT EDIT - Generated by ts-xsd codegen
- * 
+ *
  * Typed schemas with parse/build methods.
  * Each schema exports a corresponding Data type (e.g., DiscoveryData, ClassesData).
- * 
+ *
  * @example
  * import { classes, type ClassesData } from 'adt-schemas';
- * 
+ *
  * const data: ClassesData = classes.parse(xml);
  */
 
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/acoverageResult.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/acoverageResult.ts
index 73333e55c..e30808753 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/acoverageResult.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/acoverageResult.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/acoverageResult.xsd
  */
@@ -15,10 +15,7 @@ export default {
     adtcore: 'http://www.sap.com/adt/core',
     atom: 'http://www.w3.org/2005/Atom',
   },
-  $imports: [
-    adtcore,
-    atom,
-  ],
+  $imports: [adtcore, atom],
   targetNamespace: 'http://www.sap.com/adt/cov',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/acoverageStatements.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/acoverageStatements.ts
index dfded927b..768381e35 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/acoverageStatements.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/acoverageStatements.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/acoverageStatements.xsd
  */
@@ -15,10 +15,7 @@ export default {
     adtcore: 'http://www.sap.com/adt/core',
     atom: 'http://www.w3.org/2005/Atom',
   },
-  $imports: [
-    adtcore,
-    atom,
-  ],
+  $imports: [adtcore, atom],
   targetNamespace: 'http://www.sap.com/adt/cov',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/adtcoreObjectSets.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/adtcoreObjectSets.ts
index f59c06819..8dface1d0 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/adtcoreObjectSets.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/adtcoreObjectSets.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/adtcoreObjectSets.xsd
  */
@@ -12,9 +12,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     adtcore: 'http://www.sap.com/adt/core',
   },
-  $includes: [
-    adtcore,
-  ],
+  $includes: [adtcore],
   targetNamespace: 'http://www.sap.com/adt/core',
   element: [
     {
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/atcRun.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/atcRun.ts
index 5097680d4..c8efbcad5 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/atcRun.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/atcRun.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/atcRun.xsd
  */
@@ -13,9 +13,7 @@ export default {
     atc: 'http://www.sap.com/adt/atc',
     adtcore: 'http://www.sap.com/adt/core',
   },
-  $imports: [
-    adtcore,
-  ],
+  $imports: [adtcore],
   targetNamespace: 'http://www.sap.com/adt/atc',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/atomExtended.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/atomExtended.ts
index ad34d813c..31004c597 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/atomExtended.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/atomExtended.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/atomExtended.xsd
  */
@@ -12,9 +12,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     atom: 'http://www.w3.org/2005/Atom',
   },
-  $includes: [
-    atom,
-  ],
+  $includes: [atom],
   targetNamespace: 'http://www.w3.org/2005/Atom',
   elementFormDefault: 'qualified',
   element: [
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/atomFeed.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/atomFeed.ts
index c3d2ea0a4..ad2929239 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/atomFeed.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/atomFeed.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/atomFeed.xsd
  */
@@ -12,9 +12,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     atom: 'http://www.w3.org/2005/Atom',
   },
-  $includes: [
-    atomExtended,
-  ],
+  $includes: [atomExtended],
   targetNamespace: 'http://www.w3.org/2005/Atom',
   elementFormDefault: 'qualified',
   element: [
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/aunitResult.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/aunitResult.ts
index 0be75e07e..c0fa9a6bc 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/aunitResult.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/aunitResult.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/aunitResult.xsd
  */
@@ -15,10 +15,7 @@ export default {
     adtcore: 'http://www.sap.com/adt/core',
     atom: 'http://www.w3.org/2005/Atom',
   },
-  $imports: [
-    atom,
-    adtcoreObjectSets,
-  ],
+  $imports: [atom, adtcoreObjectSets],
   targetNamespace: 'http://www.sap.com/adt/aunit',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/aunitRun.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/aunitRun.ts
index 742cbdd27..487fd76e0 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/aunitRun.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/aunitRun.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/aunitRun.xsd
  */
@@ -13,9 +13,7 @@ export default {
     aunit: 'http://www.sap.com/adt/aunit',
     adtcore: 'http://www.sap.com/adt/core',
   },
-  $imports: [
-    adtcoreObjectSets,
-  ],
+  $imports: [adtcoreObjectSets],
   targetNamespace: 'http://www.sap.com/adt/aunit',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/badi.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/badi.ts
index 6ca5db85f..8fde579c7 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/badi.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/badi.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/badi.xsd
  */
@@ -14,9 +14,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     enh: 'http://www.sap.com/adt/abapsource/enhancements',
   },
-  $imports: [
-    adtcore,
-  ],
+  $imports: [adtcore],
   targetNamespace: 'http://www.sap.com/adt/abapsource/enhancements',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/blueSource.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/blueSource.ts
index 87dcdc6e7..f5729b169 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/blueSource.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/blueSource.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/blueSource.xsd
  */
@@ -16,10 +16,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     blue: 'http://www.sap.com/wbobj/blue',
   },
-  $imports: [
-    adtcore,
-    abapsource,
-  ],
+  $imports: [adtcore, abapsource],
   targetNamespace: 'http://www.sap.com/wbobj/blue',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/chkc.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/chkc.ts
new file mode 100644
index 000000000..e21e55c5b
--- /dev/null
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/chkc.ts
@@ -0,0 +1,73 @@
+/**
+ * Auto-generated schema from XSD
+ *
+ * DO NOT EDIT - Generated by ts-xsd codegen
+ * Source: xsd/custom/chkc.xsd
+ */
+
+import adtcore from '../sap/adtcore';
+
+export default {
+  $xmlns: {
+    xsd: 'http://www.w3.org/2001/XMLSchema',
+    chkc: 'http://www.sap.com/wbobj/atc/chkc',
+    adtcore: 'http://www.sap.com/adt/core',
+  },
+  $imports: [adtcore],
+  targetNamespace: 'http://www.sap.com/wbobj/atc/chkc',
+  attributeFormDefault: 'unqualified',
+  elementFormDefault: 'qualified',
+  element: [
+    {
+      name: 'checkCategoryObject',
+      type: 'chkc:CheckCategoryObject',
+    },
+  ],
+  complexType: [
+    {
+      name: 'CheckCategoryObject',
+      sequence: {
+        element: [
+          {
+            name: 'content',
+            type: 'chkc:CheckCategoryContent',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+        ],
+      },
+      attribute: [
+        {
+          ref: 'adtcore:name',
+          use: 'required',
+        },
+        {
+          ref: 'adtcore:description',
+        },
+      ],
+    },
+    {
+      name: 'CheckCategoryContent',
+      sequence: {
+        element: [
+          {
+            name: 'category',
+            type: 'chkc:CheckCategory',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+        ],
+      },
+    },
+    {
+      name: 'CheckCategory',
+      attribute: [
+        {
+          ref: 'adtcore:type',
+        },
+      ],
+    },
+  ],
+} as const;
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/chko.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/chko.ts
new file mode 100644
index 000000000..0966b973f
--- /dev/null
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/chko.ts
@@ -0,0 +1,103 @@
+/**
+ * Auto-generated schema from XSD
+ *
+ * DO NOT EDIT - Generated by ts-xsd codegen
+ * Source: xsd/custom/chko.xsd
+ */
+
+import adtcore from '../sap/adtcore';
+import chkoParameter from './chkoParameter';
+
+export default {
+  $xmlns: {
+    xsd: 'http://www.w3.org/2001/XMLSchema',
+    chko: 'http://www.sap.com/wbobj/atc/chko',
+    chkoParameter: 'http://www.sap.com/wbobj/atc/chkoParameter',
+    adtcore: 'http://www.sap.com/adt/core',
+  },
+  $imports: [adtcore, chkoParameter],
+  targetNamespace: 'http://www.sap.com/wbobj/atc/chko',
+  attributeFormDefault: 'unqualified',
+  elementFormDefault: 'qualified',
+  element: [
+    {
+      name: 'checkObject',
+      type: 'chko:CheckObject',
+    },
+  ],
+  complexType: [
+    {
+      name: 'CheckObject',
+      sequence: {
+        element: [
+          {
+            name: 'content',
+            type: 'chko:CheckObjectContent',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+        ],
+      },
+      attribute: [
+        {
+          ref: 'adtcore:name',
+          use: 'required',
+        },
+        {
+          ref: 'adtcore:description',
+        },
+      ],
+    },
+    {
+      name: 'CheckObjectContent',
+      sequence: {
+        element: [
+          {
+            name: 'category',
+            type: 'chko:CheckCategoryAssignment',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+          {
+            name: 'implementingClass',
+            type: 'chko:ImplementingClass',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+          {
+            name: 'remoteEnabled',
+            type: 'xsd:boolean',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+          {
+            ref: 'chkoParameter:parameters',
+            minOccurs: '0',
+            maxOccurs: '1',
+          },
+        ],
+      },
+    },
+    {
+      name: 'CheckCategoryAssignment',
+      attribute: [
+        {
+          ref: 'adtcore:name',
+        },
+      ],
+    },
+    {
+      name: 'ImplementingClass',
+      attribute: [
+        {
+          ref: 'adtcore:name',
+          use: 'required',
+        },
+      ],
+    },
+  ],
+} as const;
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/chkoParameter.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/chkoParameter.ts
new file mode 100644
index 000000000..1cd83b25b
--- /dev/null
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/chkoParameter.ts
@@ -0,0 +1,73 @@
+/**
+ * Auto-generated schema from XSD
+ *
+ * DO NOT EDIT - Generated by ts-xsd codegen
+ * Source: xsd/custom/chkoParameter.xsd
+ */
+
+export default {
+  $xmlns: {
+    xsd: 'http://www.w3.org/2001/XMLSchema',
+    chkoParameter: 'http://www.sap.com/wbobj/atc/chkoParameter',
+  },
+  targetNamespace: 'http://www.sap.com/wbobj/atc/chkoParameter',
+  attributeFormDefault: 'unqualified',
+  elementFormDefault: 'qualified',
+  element: [
+    {
+      name: 'parameters',
+      type: 'chkoParameter:Parameters',
+    },
+  ],
+  complexType: [
+    {
+      name: 'Parameters',
+      sequence: {
+        element: [
+          {
+            name: 'parameter',
+            type: 'chkoParameter:Parameter',
+            minOccurs: '0',
+            maxOccurs: 'unbounded',
+            form: 'unqualified',
+          },
+        ],
+      },
+    },
+    {
+      name: 'Parameter',
+      sequence: {
+        element: [
+          {
+            name: 'parameterTechnicalId',
+            type: 'xsd:string',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+          {
+            name: 'parameterName',
+            type: 'xsd:string',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+          {
+            name: 'parameterDescription',
+            type: 'xsd:string',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+          {
+            name: 'parameterModifiable',
+            type: 'xsd:boolean',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+        ],
+      },
+    },
+  ],
+} as const;
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/chkvFormTemplate.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/chkvFormTemplate.ts
new file mode 100644
index 000000000..477849ead
--- /dev/null
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/chkvFormTemplate.ts
@@ -0,0 +1,77 @@
+/**
+ * Auto-generated schema from XSD
+ *
+ * DO NOT EDIT - Generated by ts-xsd codegen
+ * Source: xsd/custom/chkvFormTemplate.xsd
+ */
+
+import adtcore from '../sap/adtcore';
+import atom from '../sap/atom';
+import chkc from './chkc';
+import chko from './chko';
+import chkvcheck from './chkvcheck';
+import chkoParameter from './chkoParameter';
+
+export default {
+  $xmlns: {
+    xsd: 'http://www.w3.org/2001/XMLSchema',
+    chkvFormTemplate: 'http://www.sap.com/wbobj/atc/chkvFormTemplate',
+  },
+  $imports: [adtcore, atom, chkc, chko, chkvcheck, chkoParameter],
+  targetNamespace: 'http://www.sap.com/wbobj/atc/chkvFormTemplate',
+  attributeFormDefault: 'unqualified',
+  elementFormDefault: 'qualified',
+  element: [
+    {
+      name: 'formTemplate',
+      type: 'chkvFormTemplate:FormTemplate',
+    },
+  ],
+  complexType: [
+    {
+      name: 'FormTemplate',
+      sequence: {
+        element: [
+          {
+            name: 'availableCheckCategories',
+            type: 'chkvFormTemplate:AvailableCheckCategories',
+            minOccurs: '1',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+        ],
+      },
+    },
+    {
+      name: 'AvailableCheckCategories',
+      sequence: {
+        element: [
+          {
+            name: 'availableCheckCategory',
+            type: 'chkvFormTemplate:AvailableCheckCategory',
+            minOccurs: '1',
+            maxOccurs: 'unbounded',
+            form: 'unqualified',
+          },
+        ],
+      },
+    },
+    {
+      name: 'AvailableCheckCategory',
+      sequence: {
+        element: [
+          {
+            ref: 'chkc:checkCategoryObject',
+            minOccurs: '1',
+            maxOccurs: '1',
+          },
+          {
+            ref: 'chkvcheck:check',
+            minOccurs: '1',
+            maxOccurs: 'unbounded',
+          },
+        ],
+      },
+    },
+  ],
+} as const;
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/chkvcheck.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/chkvcheck.ts
new file mode 100644
index 000000000..60cd44b6f
--- /dev/null
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/chkvcheck.ts
@@ -0,0 +1,55 @@
+/**
+ * Auto-generated schema from XSD
+ *
+ * DO NOT EDIT - Generated by ts-xsd codegen
+ * Source: xsd/custom/chkvcheck.xsd
+ */
+
+import chko from './chko';
+import chkoParameter from './chkoParameter';
+import atom from '../sap/atom';
+
+export default {
+  $xmlns: {
+    xsd: 'http://www.w3.org/2001/XMLSchema',
+    chkvcheck: 'http://www.sap.com/wbobj/atc/chkvCheck',
+    chko: 'http://www.sap.com/wbobj/atc/chko',
+    atom: 'http://www.w3.org/2005/Atom',
+  },
+  $imports: [chko, chkoParameter, atom],
+  targetNamespace: 'http://www.sap.com/wbobj/atc/chkvCheck',
+  attributeFormDefault: 'unqualified',
+  elementFormDefault: 'qualified',
+  element: [
+    {
+      name: 'check',
+      type: 'chkvcheck:Check',
+    },
+  ],
+  complexType: [
+    {
+      name: 'Check',
+      sequence: {
+        element: [
+          {
+            ref: 'chko:checkObject',
+            minOccurs: '1',
+            maxOccurs: '1',
+          },
+          {
+            name: 'parameterValueXml',
+            type: 'xsd:string',
+            minOccurs: '0',
+            maxOccurs: '1',
+            form: 'unqualified',
+          },
+          {
+            ref: 'atom:link',
+            minOccurs: '0',
+            maxOccurs: 'unbounded',
+          },
+        ],
+      },
+    },
+  ],
+} as const;
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/dataelementWrapper.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/dataelementWrapper.ts
index f4dfa4f47..1a1b954eb 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/dataelementWrapper.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/dataelementWrapper.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/dataelementWrapper.xsd
  */
@@ -16,10 +16,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     blue: 'http://www.sap.com/wbobj/dictionary/dtel',
   },
-  $imports: [
-    adtcore,
-    dataelements,
-  ],
+  $imports: [adtcore, dataelements],
   targetNamespace: 'http://www.sap.com/wbobj/dictionary/dtel',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/dclSource.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/dclSource.ts
index fda54995f..1dc9df571 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/dclSource.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/dclSource.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/dclSource.xsd
  */
@@ -13,9 +13,7 @@ export default {
     dcl: 'http://www.sap.com/adt/dcl',
     abapsource: 'http://www.sap.com/adt/abapsource',
   },
-  $imports: [
-    abapsource,
-  ],
+  $imports: [abapsource],
   targetNamespace: 'http://www.sap.com/adt/dcl',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/ddlSource.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/ddlSource.ts
index 08927aef2..b02c4d348 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/ddlSource.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/ddlSource.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/ddlSource.xsd
  */
@@ -13,9 +13,7 @@ export default {
     ddl: 'http://www.sap.com/adt/ddl',
     abapsource: 'http://www.sap.com/adt/abapsource',
   },
-  $imports: [
-    abapsource,
-  ],
+  $imports: [abapsource],
   targetNamespace: 'http://www.sap.com/adt/ddl',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/ddlxSource.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/ddlxSource.ts
index 36f292ec4..ce88be7d8 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/ddlxSource.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/ddlxSource.ts
@@ -13,9 +13,7 @@ export default {
     ddlx: 'http://www.sap.com/adt/ddic/ddlx',
     abapsource: 'http://www.sap.com/adt/abapsource',
   },
-  $imports: [
-    abapsource,
-  ],
+  $imports: [abapsource],
   targetNamespace: 'http://www.sap.com/adt/ddic/ddlx',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/discovery.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/discovery.ts
index 3e6f2d0f4..06441e014 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/discovery.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/discovery.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/discovery.xsd
  */
@@ -15,10 +15,7 @@ export default {
     atom: 'http://www.w3.org/2005/Atom',
     adtcomp: 'http://www.sap.com/adt/compatibility',
   },
-  $imports: [
-    atomExtended,
-    templatelinkExtended,
-  ],
+  $imports: [atomExtended, templatelinkExtended],
   targetNamespace: 'http://www.w3.org/2007/app',
   elementFormDefault: 'qualified',
   element: [
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/dtebSource.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/dtebSource.ts
index ad6539c74..0b8c14980 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/dtebSource.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/dtebSource.ts
@@ -13,9 +13,7 @@ export default {
     dteb: 'http://www.sap.com/adt/ddic/dteb',
     abapsource: 'http://www.sap.com/adt/abapsource',
   },
-  $imports: [
-    abapsource,
-  ],
+  $imports: [abapsource],
   targetNamespace: 'http://www.sap.com/adt/ddic/dteb',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/http.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/http.ts
index 6b27a616b..61b56a3e0 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/http.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/http.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/http.xsd
  */
@@ -13,9 +13,7 @@ export default {
     http: 'http://www.sap.com/adt/http',
     atom: 'http://www.w3.org/2005/Atom',
   },
-  $imports: [
-    atom,
-  ],
+  $imports: [atom],
   targetNamespace: 'http://www.sap.com/adt/http',
   elementFormDefault: 'qualified',
   element: [
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/index.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/index.ts
index eec7ba0df..668072e5c 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/index.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/index.ts
@@ -26,4 +26,9 @@ export { default as srvdSource } from './srvdSource';
 export { default as acoverageResult } from './acoverageResult';
 export { default as acoverageStatements } from './acoverageStatements';
 export { default as badi } from './badi';
+export { default as chkvFormTemplate } from './chkvFormTemplate';
 export { default as adtcoreObjectSets } from './adtcoreObjectSets';
+export { default as chkc } from './chkc';
+export { default as chko } from './chko';
+export { default as chkvcheck } from './chkvcheck';
+export { default as chkoParameter } from './chkoParameter';
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/objectProperties.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/objectProperties.ts
index f8180ed0a..973e0f8fc 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/objectProperties.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/objectProperties.ts
@@ -11,12 +11,12 @@ export default {
   $xmlns: {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     atom: 'http://www.w3.org/2005/Atom',
-    objprops: 'http://www.sap.com/adt/repository/informationsystem/objectproperties',
+    objprops:
+      'http://www.sap.com/adt/repository/informationsystem/objectproperties',
   },
-  $imports: [
-    atom,
-  ],
-  targetNamespace: 'http://www.sap.com/adt/repository/informationsystem/objectproperties',
+  $imports: [atom],
+  targetNamespace:
+    'http://www.sap.com/adt/repository/informationsystem/objectproperties',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'qualified',
   element: [
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/srvdSource.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/srvdSource.ts
index 934c56b65..4d2dae93a 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/srvdSource.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/srvdSource.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/srvdSource.xsd
  */
@@ -13,9 +13,7 @@ export default {
     srvd: 'http://www.sap.com/adt/ddic/srvd',
     abapsource: 'http://www.sap.com/adt/abapsource',
   },
-  $imports: [
-    abapsource,
-  ],
+  $imports: [abapsource],
   targetNamespace: 'http://www.sap.com/adt/ddic/srvd',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/templatelinkExtended.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/templatelinkExtended.ts
index a20ec0cc7..459b50c3b 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/templatelinkExtended.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/templatelinkExtended.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/templatelinkExtended.xsd
  */
@@ -12,9 +12,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     adtcomp: 'http://www.sap.com/adt/compatibility',
   },
-  $includes: [
-    templatelink,
-  ],
+  $includes: [templatelink],
   targetNamespace: 'http://www.sap.com/adt/compatibility',
   elementFormDefault: 'qualified',
   element: [
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/transportUseraction.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/transportUseraction.ts
index 916fe74e1..6dc2d10fc 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/transportUseraction.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/transportUseraction.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/transportUseraction.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/transportfind.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/transportfind.ts
index 2586d9768..a885a13fe 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/transportfind.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/transportfind.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/transportfind.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/transportmanagmentCreate.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/transportmanagmentCreate.ts
index 4a92d6703..2288cdd8e 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/transportmanagmentCreate.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/transportmanagmentCreate.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/transportmanagmentCreate.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/custom/transportmanagmentSingle.ts b/packages/adt-schemas/src/schemas/generated/schemas/custom/transportmanagmentSingle.ts
index 6679aa28a..379d00312 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/custom/transportmanagmentSingle.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/custom/transportmanagmentSingle.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/custom/transportmanagmentSingle.xsd
  */
@@ -15,10 +15,7 @@ export default {
     atom: 'http://www.w3.org/2005/Atom',
     adtcore: 'http://www.sap.com/adt/core',
   },
-  $imports: [
-    atom,
-    adtcore,
-  ],
+  $imports: [atom, adtcore],
   targetNamespace: 'http://www.sap.com/cts/adt/tm',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/Ecore.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/Ecore.ts
index 3360408c0..173a7b0d2 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/Ecore.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/Ecore.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/Ecore.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/abapoo.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/abapoo.ts
index 06123e785..ed5227180 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/abapoo.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/abapoo.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/abapoo.xsd
  */
@@ -16,10 +16,7 @@ export default {
     ecore: 'http://www.eclipse.org/emf/2002/Ecore',
     xsd: 'http://www.w3.org/2001/XMLSchema',
   },
-  $imports: [
-    adtcore,
-    abapsource,
-  ],
+  $imports: [adtcore, abapsource],
   targetNamespace: 'http://www.sap.com/adt/oo',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/abapsource.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/abapsource.ts
index f73ee677d..7a8969c37 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/abapsource.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/abapsource.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/abapsource.xsd
  */
@@ -16,10 +16,7 @@ export default {
     adtcore: 'http://www.sap.com/adt/core',
     abapsource: 'http://www.sap.com/adt/abapsource',
   },
-  $imports: [
-    adtcore,
-    atom,
-  ],
+  $imports: [adtcore, atom],
   targetNamespace: 'http://www.sap.com/adt/abapsource',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/adtcore.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/adtcore.ts
index 5e3aa7cb2..641695b2a 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/adtcore.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/adtcore.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/adtcore.xsd
  */
@@ -14,9 +14,7 @@ export default {
     adtcore: 'http://www.sap.com/adt/core',
     atom: 'http://www.w3.org/2005/Atom',
   },
-  $imports: [
-    atom,
-  ],
+  $imports: [atom],
   targetNamespace: 'http://www.sap.com/adt/core',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/atc.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/atc.ts
index 4e14ebe89..9c432dd10 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/atc.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/atc.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/atc.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcexemption.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcexemption.ts
index ba20f4fbc..9a27662e4 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcexemption.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcexemption.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/atcexemption.xsd
  */
@@ -16,10 +16,7 @@ export default {
     atcfinding: 'http://www.sap.com/adt/atc/finding',
     atc: 'http://www.sap.com/adt/atc',
   },
-  $imports: [
-    atcfinding,
-    atc,
-  ],
+  $imports: [atcfinding, atc],
   targetNamespace: 'http://www.sap.com/adt/atc/exemption',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcfinding.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcfinding.ts
index eee75f196..c673e1c5d 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcfinding.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcfinding.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/atcfinding.xsd
  */
@@ -16,10 +16,7 @@ export default {
     atom: 'http://www.w3.org/2005/Atom',
     atcfinding: 'http://www.sap.com/adt/atc/finding',
   },
-  $imports: [
-    adtcore,
-    atom,
-  ],
+  $imports: [adtcore, atom],
   targetNamespace: 'http://www.sap.com/adt/atc/finding',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcinfo.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcinfo.ts
index 7286cd792..19341e94f 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcinfo.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcinfo.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/atcinfo.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcobject.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcobject.ts
index d3bfc376a..2cc660eb3 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcobject.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcobject.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/atcobject.xsd
  */
@@ -16,10 +16,7 @@ export default {
     atcfinding: 'http://www.sap.com/adt/atc/finding',
     atcobject: 'http://www.sap.com/adt/atc/object',
   },
-  $imports: [
-    adtcore,
-    atcfinding,
-  ],
+  $imports: [adtcore, atcfinding],
   targetNamespace: 'http://www.sap.com/adt/atc/object',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcresult.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcresult.ts
index 16f0cd26b..e80a9d777 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcresult.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcresult.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/atcresult.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcresultquery.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcresultquery.ts
index 417b76064..cc871856b 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcresultquery.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcresultquery.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/atcresultquery.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/atctagdescription.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/atctagdescription.ts
index 2204fa2ca..87a5ab268 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/atctagdescription.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/atctagdescription.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/atctagdescription.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcworklist.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcworklist.ts
index 106f971ba..17b948e94 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/atcworklist.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/atcworklist.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/atcworklist.xsd
  */
@@ -20,12 +20,7 @@ export default {
     atcworklist: 'http://www.sap.com/adt/atc/worklist',
     atc: 'http://www.sap.com/adt/atc',
   },
-  $imports: [
-    atcinfo,
-    atcobject,
-    atctagdescription,
-    atc,
-  ],
+  $imports: [atcinfo, atcobject, atctagdescription, atc],
   targetNamespace: 'http://www.sap.com/adt/atc/worklist',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/atom.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/atom.ts
index 732df0d44..3768d28cb 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/atom.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/atom.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/atom.xsd
  */
@@ -14,9 +14,7 @@ export default {
     atom: 'http://www.w3.org/2005/Atom',
     xml: 'http://www.w3.org/XML/1998/namespace',
   },
-  $imports: [
-    xml,
-  ],
+  $imports: [xml],
   targetNamespace: 'http://www.w3.org/2005/Atom',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/checklist.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/checklist.ts
index 354a83b61..3d39299e8 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/checklist.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/checklist.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/checklist.xsd
  */
@@ -14,9 +14,7 @@ export default {
     ecore: 'http://www.eclipse.org/emf/2002/Ecore',
     atom: 'http://www.w3.org/2005/Atom',
   },
-  $imports: [
-    atom,
-  ],
+  $imports: [atom],
   targetNamespace: 'http://www.sap.com/abapxml/checklist',
   elementFormDefault: 'unqualified',
   element: [
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/checkrun.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/checkrun.ts
index 32efc4d60..f4bf5eb9f 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/checkrun.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/checkrun.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/checkrun.xsd
  */
@@ -16,10 +16,7 @@ export default {
     adtcore: 'http://www.sap.com/adt/core',
     chkrun: 'http://www.sap.com/adt/checkrun',
   },
-  $imports: [
-    atom,
-    adtcore,
-  ],
+  $imports: [atom, adtcore],
   targetNamespace: 'http://www.sap.com/adt/checkrun',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/classes.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/classes.ts
index e35f5b5c0..0bcf794ca 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/classes.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/classes.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/classes.xsd
  */
@@ -14,15 +14,11 @@ export default {
     adtcore: 'http://www.sap.com/adt/core',
     abapsource: 'http://www.sap.com/adt/abapsource',
     abapoo: 'http://www.sap.com/adt/oo',
-    'class': 'http://www.sap.com/adt/oo/classes',
+    class: 'http://www.sap.com/adt/oo/classes',
     ecore: 'http://www.eclipse.org/emf/2002/Ecore',
     xsd: 'http://www.w3.org/2001/XMLSchema',
   },
-  $imports: [
-    adtcore,
-    abapoo,
-    abapsource,
-  ],
+  $imports: [adtcore, abapoo, abapsource],
   targetNamespace: 'http://www.sap.com/adt/oo/classes',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/configuration.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/configuration.ts
index 602c1aa14..a64e5a9cd 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/configuration.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/configuration.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/configuration.xsd
  */
@@ -15,9 +15,7 @@ export default {
     ecore: 'http://www.eclipse.org/emf/2002/Ecore',
     atom: 'http://www.w3.org/2005/Atom',
   },
-  $imports: [
-    atom,
-  ],
+  $imports: [atom],
   targetNamespace: 'http://www.sap.com/adt/configuration',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/configurations.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/configurations.ts
index d376c5191..80164914e 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/configurations.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/configurations.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/configurations.xsd
  */
@@ -17,10 +17,7 @@ export default {
     atom: 'http://www.w3.org/2005/Atom',
     configuration: 'http://www.sap.com/adt/configuration',
   },
-  $imports: [
-    atom,
-    configuration,
-  ],
+  $imports: [atom, configuration],
   targetNamespace: 'http://www.sap.com/adt/configurations',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/dataelements.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/dataelements.ts
index 0d9cf93d4..f3cdc881f 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/dataelements.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/dataelements.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/dataelements.xsd
  */
@@ -10,7 +10,7 @@ export default {
     dtel: 'http://www.sap.com/adt/dictionary/dataelements',
     ecore: 'http://www.eclipse.org/emf/2002/Ecore',
     xsd: 'http://www.w3.org/2001/XMLSchema',
-    'package': 'http://www.sap.com/adt/dictionary/dataelements',
+    package: 'http://www.sap.com/adt/dictionary/dataelements',
   },
   targetNamespace: 'http://www.sap.com/adt/dictionary/dataelements',
   attributeFormDefault: 'unqualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/debugger.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/debugger.ts
index fbae3d599..4b924e713 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/debugger.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/debugger.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/debugger.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/domain.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/domain.ts
index 9c462dee8..da011bd74 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/domain.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/domain.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/domain.xsd
  */
@@ -14,9 +14,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     doma: 'http://www.sap.com/dictionary/domain',
   },
-  $imports: [
-    adtcore,
-  ],
+  $imports: [adtcore],
   targetNamespace: 'http://www.sap.com/dictionary/domain',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/exception.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/exception.ts
index 8196290c3..5569980d1 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/exception.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/exception.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/exception.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/fincludes.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/fincludes.ts
index fa9a090c6..d615f7daa 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/fincludes.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/fincludes.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/fincludes.xsd
  */
@@ -14,9 +14,7 @@ export default {
     abapsource: 'http://www.sap.com/adt/abapsource',
     finclude: 'http://www.sap.com/adt/functions/fincludes',
   },
-  $imports: [
-    abapsource,
-  ],
+  $imports: [abapsource],
   targetNamespace: 'http://www.sap.com/adt/functions/fincludes',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/fmodules.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/fmodules.ts
index be4bc3af3..7c1bdd51b 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/fmodules.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/fmodules.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/fmodules.xsd
  */
@@ -14,9 +14,7 @@ export default {
     abapsource: 'http://www.sap.com/adt/abapsource',
     fmodule: 'http://www.sap.com/adt/functions/fmodules',
   },
-  $imports: [
-    abapsource,
-  ],
+  $imports: [abapsource],
   targetNamespace: 'http://www.sap.com/adt/functions/fmodules',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/groups.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/groups.ts
index ac2e41e25..ba8509228 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/groups.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/groups.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/groups.xsd
  */
@@ -14,9 +14,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     group: 'http://www.sap.com/adt/functions/groups',
   },
-  $imports: [
-    abapsource,
-  ],
+  $imports: [abapsource],
   targetNamespace: 'http://www.sap.com/adt/functions/groups',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/includes.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/includes.ts
index ff248729d..bd7fdc477 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/includes.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/includes.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/includes.xsd
  */
@@ -16,10 +16,7 @@ export default {
     abapsource: 'http://www.sap.com/adt/abapsource',
     include: 'http://www.sap.com/adt/programs/includes',
   },
-  $imports: [
-    adtcore,
-    abapsource,
-  ],
+  $imports: [adtcore, abapsource],
   targetNamespace: 'http://www.sap.com/adt/programs/includes',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/interfaces.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/interfaces.ts
index 97f81f67d..5fd7c699a 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/interfaces.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/interfaces.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/interfaces.xsd
  */
@@ -16,10 +16,7 @@ export default {
     ecore: 'http://www.eclipse.org/emf/2002/Ecore',
     xsd: 'http://www.w3.org/2001/XMLSchema',
   },
-  $imports: [
-    abapsource,
-    abapoo,
-  ],
+  $imports: [abapsource, abapoo],
   targetNamespace: 'http://www.sap.com/adt/oo/interfaces',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/log.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/log.ts
index ef6c9cf7f..d1ca9426c 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/log.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/log.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/log.xsd
  */
@@ -17,10 +17,7 @@ export default {
     atom: 'http://www.w3.org/2005/Atom',
     Q1: 'http://www.sap.com/adt/categories/dynamiclogpoints',
   },
-  $imports: [
-    atom,
-    logpoint,
-  ],
+  $imports: [atom, logpoint],
   targetNamespace: 'http://www.sap.com/adt/categories/dynamiclogpoints/logs',
   element: [
     {
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/logpoint.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/logpoint.ts
index df4270916..9babb199b 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/logpoint.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/logpoint.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/logpoint.xsd
  */
@@ -16,10 +16,7 @@ export default {
     adtcore: 'http://www.sap.com/adt/core',
     atom: 'http://www.w3.org/2005/Atom',
   },
-  $imports: [
-    atom,
-    adtcore,
-  ],
+  $imports: [atom, adtcore],
   targetNamespace: 'http://www.sap.com/adt/categories/dynamiclogpoints',
   simpleType: [
     {
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/packagesV1.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/packagesV1.ts
index affe73ca9..7ec5c9bb1 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/packagesV1.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/packagesV1.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/packagesV1.xsd
  */
@@ -14,9 +14,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     pak: 'http://www.sap.com/adt/packages',
   },
-  $imports: [
-    adtcore,
-  ],
+  $imports: [adtcore],
   targetNamespace: 'http://www.sap.com/adt/packages',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/programs.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/programs.ts
index 2119fec80..110c4fe4f 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/programs.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/programs.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/programs.xsd
  */
@@ -18,11 +18,7 @@ export default {
     atom: 'http://www.w3.org/2005/Atom',
     program: 'http://www.sap.com/adt/programs/programs',
   },
-  $imports: [
-    adtcore,
-    abapsource,
-    atom,
-  ],
+  $imports: [adtcore, abapsource, atom],
   targetNamespace: 'http://www.sap.com/adt/programs/programs',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/quickfixes.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/quickfixes.ts
index d00d6ea54..edc4a53e7 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/quickfixes.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/quickfixes.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/quickfixes.xsd
  */
@@ -16,10 +16,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     ecore: 'http://www.eclipse.org/emf/2002/Ecore',
   },
-  $imports: [
-    adtcore,
-    atom,
-  ],
+  $imports: [adtcore, atom],
   targetNamespace: 'http://www.sap.com/adt/quickfixes',
   attributeFormDefault: 'unqualified',
   elementFormDefault: 'unqualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/servicebinding.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/servicebinding.ts
index e6e5b8ecc..b634e8c44 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/servicebinding.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/servicebinding.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/servicebinding.xsd
  */
@@ -16,10 +16,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     Q1: 'http://www.w3.org/2005/Atom',
   },
-  $imports: [
-    adtcore,
-    atom,
-  ],
+  $imports: [adtcore, atom],
   targetNamespace: 'http://www.sap.com/adt/ddic/ServiceBindings',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/tablesettings.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/tablesettings.ts
index b2f51218a..a97fa1443 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/tablesettings.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/tablesettings.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/tablesettings.xsd
  */
@@ -14,9 +14,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     ts: 'http://www.sap.com/dictionary/table/settings',
   },
-  $imports: [
-    adtcore,
-  ],
+  $imports: [adtcore],
   targetNamespace: 'http://www.sap.com/dictionary/table/settings',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/tabletype.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/tabletype.ts
index 3a316e0bb..2a5e7f730 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/tabletype.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/tabletype.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/tabletype.xsd
  */
@@ -14,9 +14,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     ttyp: 'http://www.sap.com/dictionary/tabletype',
   },
-  $imports: [
-    adtcore,
-  ],
+  $imports: [adtcore],
   targetNamespace: 'http://www.sap.com/dictionary/tabletype',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/templatelink.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/templatelink.ts
index e22239b9b..2d18fb7cd 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/templatelink.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/templatelink.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/templatelink.xsd
  */
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/traces.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/traces.ts
index 366886791..1f1f5a2c6 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/traces.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/traces.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/traces.xsd
  */
@@ -14,9 +14,7 @@ export default {
     xsd: 'http://www.w3.org/2001/XMLSchema',
     sxt: 'http://www.sap.com/adt/crosstrace/traces',
   },
-  $imports: [
-    adtcore,
-  ],
+  $imports: [adtcore],
   targetNamespace: 'http://www.sap.com/adt/crosstrace/traces',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/transportmanagment.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/transportmanagment.ts
index 75e483e5a..c4e605281 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/transportmanagment.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/transportmanagment.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/transportmanagment.xsd
  */
@@ -18,11 +18,7 @@ export default {
     atom: 'http://www.w3.org/2005/Atom',
     xs: 'http://www.w3.org/2001/XMLSchema',
   },
-  $imports: [
-    atom,
-    adtcore,
-    checkrun,
-  ],
+  $imports: [atom, adtcore, checkrun],
   targetNamespace: 'http://www.sap.com/cts/adt/tm',
   attributeFormDefault: 'qualified',
   elementFormDefault: 'qualified',
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/transportsearch.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/transportsearch.ts
index 3e6751fef..1308bd3ed 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/transportsearch.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/transportsearch.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/transportsearch.xsd
  */
@@ -15,10 +15,7 @@ export default {
     transports: 'http://www.sap.com/cts/adt/transports/search',
     xsd: 'http://www.w3.org/2001/XMLSchema',
   },
-  $imports: [
-    atom,
-    Ecore,
-  ],
+  $imports: [atom, Ecore],
   targetNamespace: 'http://www.sap.com/cts/adt/transports/search',
   element: [
     {
diff --git a/packages/adt-schemas/src/schemas/generated/schemas/sap/xml.ts b/packages/adt-schemas/src/schemas/generated/schemas/sap/xml.ts
index 2690c7968..dc032137f 100644
--- a/packages/adt-schemas/src/schemas/generated/schemas/sap/xml.ts
+++ b/packages/adt-schemas/src/schemas/generated/schemas/sap/xml.ts
@@ -1,6 +1,6 @@
 /**
  * Auto-generated schema from XSD
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
  * Source: xsd/sap/xml.xsd
  */
@@ -18,7 +18,7 @@ export default {
     },
     {
       name: 'space',
-      'default': 'preserve',
+      default: 'preserve',
       simpleType: {
         restriction: {
           base: 'xs:NCName',
diff --git a/packages/adt-schemas/src/schemas/generated/typed.ts b/packages/adt-schemas/src/schemas/generated/typed.ts
index a2f9ae9c8..c31503693 100644
--- a/packages/adt-schemas/src/schemas/generated/typed.ts
+++ b/packages/adt-schemas/src/schemas/generated/typed.ts
@@ -1,11 +1,11 @@
 /**
  * Auto-generated typed schema exports
- * 
+ *
  * DO NOT EDIT - Generated by ts-xsd codegen
- * 
+ *
  * Only target schemas are exported here.
  * Internal schemas (xml, abapoo, etc.) are used for type resolution only.
- * 
+ *
  * @example
  * import { classes } from 'adt-schemas';
  * const data = classes.parse(xml);  // data is fully typed!
@@ -74,127 +74,186 @@ import type { SrvdSourceSchema } from './types/custom/srvdSource.types';
 import type { AcoverageResultSchema } from './types/custom/acoverageResult.types';
 import type { AcoverageStatementsSchema } from './types/custom/acoverageStatements.types';
 import type { BadiSchema } from './types/custom/badi.types';
+import type { ChkvFormTemplateSchema } from './types/custom/chkvFormTemplate.types';
 
 // SAP schemas
 import _atom from './schemas/sap/atom';
 export const atom: TypedSchema<AtomSchema> = typedSchema<AtomSchema>(_atom);
 import _adtcore from './schemas/sap/adtcore';
-export const adtcore: TypedSchema<AdtcoreSchema> = typedSchema<AdtcoreSchema>(_adtcore);
+export const adtcore: TypedSchema<AdtcoreSchema> =
+  typedSchema<AdtcoreSchema>(_adtcore);
 import _exception from './schemas/sap/exception';
-export const exception: TypedSchema<ExceptionSchema> = typedSchema<ExceptionSchema>(_exception);
+export const exception: TypedSchema<ExceptionSchema> =
+  typedSchema<ExceptionSchema>(_exception);
 import _classes from './schemas/sap/classes';
-export const classes: TypedSchema<ClassesSchema> = typedSchema<ClassesSchema>(_classes);
+export const classes: TypedSchema<ClassesSchema> =
+  typedSchema<ClassesSchema>(_classes);
 import _interfaces from './schemas/sap/interfaces';
-export const interfaces: TypedSchema<InterfacesSchema> = typedSchema<InterfacesSchema>(_interfaces);
+export const interfaces: TypedSchema<InterfacesSchema> =
+  typedSchema<InterfacesSchema>(_interfaces);
 import _packagesV1 from './schemas/sap/packagesV1';
-export const packagesV1: TypedSchema<PackagesV1Schema> = typedSchema<PackagesV1Schema>(_packagesV1);
+export const packagesV1: TypedSchema<PackagesV1Schema> =
+  typedSchema<PackagesV1Schema>(_packagesV1);
 import _programs from './schemas/sap/programs';
-export const programs: TypedSchema<ProgramsSchema> = typedSchema<ProgramsSchema>(_programs);
+export const programs: TypedSchema<ProgramsSchema> =
+  typedSchema<ProgramsSchema>(_programs);
 import _includes from './schemas/sap/includes';
-export const includes: TypedSchema<IncludesSchema> = typedSchema<IncludesSchema>(_includes);
+export const includes: TypedSchema<IncludesSchema> =
+  typedSchema<IncludesSchema>(_includes);
 import _groups from './schemas/sap/groups';
-export const groups: TypedSchema<GroupsSchema> = typedSchema<GroupsSchema>(_groups);
+export const groups: TypedSchema<GroupsSchema> =
+  typedSchema<GroupsSchema>(_groups);
 import _fmodules from './schemas/sap/fmodules';
-export const fmodules: TypedSchema<FmodulesSchema> = typedSchema<FmodulesSchema>(_fmodules);
+export const fmodules: TypedSchema<FmodulesSchema> =
+  typedSchema<FmodulesSchema>(_fmodules);
 import _fincludes from './schemas/sap/fincludes';
-export const fincludes: TypedSchema<FincludesSchema> = typedSchema<FincludesSchema>(_fincludes);
+export const fincludes: TypedSchema<FincludesSchema> =
+  typedSchema<FincludesSchema>(_fincludes);
 import _atc from './schemas/sap/atc';
 export const atc: TypedSchema<AtcSchema> = typedSchema<AtcSchema>(_atc);
 import _atcexemption from './schemas/sap/atcexemption';
-export const atcexemption: TypedSchema<AtcexemptionSchema> = typedSchema<AtcexemptionSchema>(_atcexemption);
+export const atcexemption: TypedSchema<AtcexemptionSchema> =
+  typedSchema<AtcexemptionSchema>(_atcexemption);
 import _atcfinding from './schemas/sap/atcfinding';
-export const atcfinding: TypedSchema<AtcfindingSchema> = typedSchema<AtcfindingSchema>(_atcfinding);
+export const atcfinding: TypedSchema<AtcfindingSchema> =
+  typedSchema<AtcfindingSchema>(_atcfinding);
 import _atcinfo from './schemas/sap/atcinfo';
-export const atcinfo: TypedSchema<AtcinfoSchema> = typedSchema<AtcinfoSchema>(_atcinfo);
+export const atcinfo: TypedSchema<AtcinfoSchema> =
+  typedSchema<AtcinfoSchema>(_atcinfo);
 import _atcobject from './schemas/sap/atcobject';
-export const atcobject: TypedSchema<AtcobjectSchema> = typedSchema<AtcobjectSchema>(_atcobject);
+export const atcobject: TypedSchema<AtcobjectSchema> =
+  typedSchema<AtcobjectSchema>(_atcobject);
 import _atcresult from './schemas/sap/atcresult';
-export const atcresult: TypedSchema<AtcresultSchema> = typedSchema<AtcresultSchema>(_atcresult);
+export const atcresult: TypedSchema<AtcresultSchema> =
+  typedSchema<AtcresultSchema>(_atcresult);
 import _atcresultquery from './schemas/sap/atcresultquery';
-export const atcresultquery: TypedSchema<AtcresultquerySchema> = typedSchema<AtcresultquerySchema>(_atcresultquery);
+export const atcresultquery: TypedSchema<AtcresultquerySchema> =
+  typedSchema<AtcresultquerySchema>(_atcresultquery);
 import _atctagdescription from './schemas/sap/atctagdescription';
-export const atctagdescription: TypedSchema<AtctagdescriptionSchema> = typedSchema<AtctagdescriptionSchema>(_atctagdescription);
+export const atctagdescription: TypedSchema<AtctagdescriptionSchema> =
+  typedSchema<AtctagdescriptionSchema>(_atctagdescription);
 import _atcworklist from './schemas/sap/atcworklist';
-export const atcworklist: TypedSchema<AtcworklistSchema> = typedSchema<AtcworklistSchema>(_atcworklist);
+export const atcworklist: TypedSchema<AtcworklistSchema> =
+  typedSchema<AtcworklistSchema>(_atcworklist);
 import _transportmanagment from './schemas/sap/transportmanagment';
-export const transportmanagment: TypedSchema<TransportmanagmentSchema> = typedSchema<TransportmanagmentSchema>(_transportmanagment);
+export const transportmanagment: TypedSchema<TransportmanagmentSchema> =
+  typedSchema<TransportmanagmentSchema>(_transportmanagment);
 import _transportsearch from './schemas/sap/transportsearch';
-export const transportsearch: TypedSchema<TransportsearchSchema> = typedSchema<TransportsearchSchema>(_transportsearch);
+export const transportsearch: TypedSchema<TransportsearchSchema> =
+  typedSchema<TransportsearchSchema>(_transportsearch);
 import _configuration from './schemas/sap/configuration';
-export const configuration: TypedSchema<ConfigurationSchema> = typedSchema<ConfigurationSchema>(_configuration);
+export const configuration: TypedSchema<ConfigurationSchema> =
+  typedSchema<ConfigurationSchema>(_configuration);
 import _configurations from './schemas/sap/configurations';
-export const configurations: TypedSchema<ConfigurationsSchema> = typedSchema<ConfigurationsSchema>(_configurations);
+export const configurations: TypedSchema<ConfigurationsSchema> =
+  typedSchema<ConfigurationsSchema>(_configurations);
 import _checkrun from './schemas/sap/checkrun';
-export const checkrun: TypedSchema<CheckrunSchema> = typedSchema<CheckrunSchema>(_checkrun);
+export const checkrun: TypedSchema<CheckrunSchema> =
+  typedSchema<CheckrunSchema>(_checkrun);
 import _checklist from './schemas/sap/checklist';
-export const checklist: TypedSchema<ChecklistSchema> = typedSchema<ChecklistSchema>(_checklist);
+export const checklist: TypedSchema<ChecklistSchema> =
+  typedSchema<ChecklistSchema>(_checklist);
 import _debugger from './schemas/sap/debugger';
-export const debuggerSchema: TypedSchema<DebuggerSchema> = typedSchema<DebuggerSchema>(_debugger);
+export const debuggerSchema: TypedSchema<DebuggerSchema> =
+  typedSchema<DebuggerSchema>(_debugger);
 import _logpoint from './schemas/sap/logpoint';
-export const logpoint: TypedSchema<LogpointSchema> = typedSchema<LogpointSchema>(_logpoint);
+export const logpoint: TypedSchema<LogpointSchema> =
+  typedSchema<LogpointSchema>(_logpoint);
 import _traces from './schemas/sap/traces';
-export const traces: TypedSchema<TracesSchema> = typedSchema<TracesSchema>(_traces);
+export const traces: TypedSchema<TracesSchema> =
+  typedSchema<TracesSchema>(_traces);
 import _quickfixes from './schemas/sap/quickfixes';
-export const quickfixes: TypedSchema<QuickfixesSchema> = typedSchema<QuickfixesSchema>(_quickfixes);
+export const quickfixes: TypedSchema<QuickfixesSchema> =
+  typedSchema<QuickfixesSchema>(_quickfixes);
 import _log from './schemas/sap/log';
 export const log: TypedSchema<LogSchema> = typedSchema<LogSchema>(_log);
 import _templatelink from './schemas/sap/templatelink';
-export const templatelink: TypedSchema<TemplatelinkSchema> = typedSchema<TemplatelinkSchema>(_templatelink);
+export const templatelink: TypedSchema<TemplatelinkSchema> =
+  typedSchema<TemplatelinkSchema>(_templatelink);
 import _domain from './schemas/sap/domain';
-export const domain: TypedSchema<DomainSchema> = typedSchema<DomainSchema>(_domain);
+export const domain: TypedSchema<DomainSchema> =
+  typedSchema<DomainSchema>(_domain);
 import _dataelements from './schemas/sap/dataelements';
-export const dataelements: TypedSchema<DataelementsSchema> = typedSchema<DataelementsSchema>(_dataelements);
+export const dataelements: TypedSchema<DataelementsSchema> =
+  typedSchema<DataelementsSchema>(_dataelements);
 import _tabletype from './schemas/sap/tabletype';
-export const tabletype: TypedSchema<TabletypeSchema> = typedSchema<TabletypeSchema>(_tabletype);
+export const tabletype: TypedSchema<TabletypeSchema> =
+  typedSchema<TabletypeSchema>(_tabletype);
 import _tablesettings from './schemas/sap/tablesettings';
-export const tablesettings: TypedSchema<TablesettingsSchema> = typedSchema<TablesettingsSchema>(_tablesettings);
+export const tablesettings: TypedSchema<TablesettingsSchema> =
+  typedSchema<TablesettingsSchema>(_tablesettings);
 import _servicebinding from './schemas/sap/servicebinding';
-export const servicebinding: TypedSchema<ServicebindingSchema> = typedSchema<ServicebindingSchema>(_servicebinding);
+export const servicebinding: TypedSchema<ServicebindingSchema> =
+  typedSchema<ServicebindingSchema>(_servicebinding);
 
 // Custom schemas
 import _dataelementWrapper from './schemas/custom/dataelementWrapper';
-export const dataelementWrapper: TypedSchema<DataelementWrapperSchema> = typedSchema<DataelementWrapperSchema>(_dataelementWrapper);
+export const dataelementWrapper: TypedSchema<DataelementWrapperSchema> =
+  typedSchema<DataelementWrapperSchema>(_dataelementWrapper);
 import _blueSource from './schemas/custom/blueSource';
-export const blueSource: TypedSchema<BlueSourceSchema> = typedSchema<BlueSourceSchema>(_blueSource);
+export const blueSource: TypedSchema<BlueSourceSchema> =
+  typedSchema<BlueSourceSchema>(_blueSource);
 import _atomExtended from './schemas/custom/atomExtended';
-export const atomExtended: TypedSchema<AtomExtendedSchema> = typedSchema<AtomExtendedSchema>(_atomExtended);
+export const atomExtended: TypedSchema<AtomExtendedSchema> =
+  typedSchema<AtomExtendedSchema>(_atomExtended);
 import _discovery from './schemas/custom/discovery';
-export const discovery: TypedSchema<DiscoverySchema> = typedSchema<DiscoverySchema>(_discovery);
+export const discovery: TypedSchema<DiscoverySchema> =
+  typedSchema<DiscoverySchema>(_discovery);
 import _http from './schemas/custom/http';
 export const http: TypedSchema<HttpSchema> = typedSchema<HttpSchema>(_http);
 import _templatelinkExtended from './schemas/custom/templatelinkExtended';
-export const templatelinkExtended: TypedSchema<TemplatelinkExtendedSchema> = typedSchema<TemplatelinkExtendedSchema>(_templatelinkExtended);
+export const templatelinkExtended: TypedSchema<TemplatelinkExtendedSchema> =
+  typedSchema<TemplatelinkExtendedSchema>(_templatelinkExtended);
 import _transportfind from './schemas/custom/transportfind';
-export const transportfind: TypedSchema<TransportfindSchema> = typedSchema<TransportfindSchema>(_transportfind);
+export const transportfind: TypedSchema<TransportfindSchema> =
+  typedSchema<TransportfindSchema>(_transportfind);
 import _transportmanagmentCreate from './schemas/custom/transportmanagmentCreate';
-export const transportmanagmentCreate: TypedSchema<TransportmanagmentCreateSchema> = typedSchema<TransportmanagmentCreateSchema>(_transportmanagmentCreate);
+export const transportmanagmentCreate: TypedSchema<TransportmanagmentCreateSchema> =
+  typedSchema<TransportmanagmentCreateSchema>(_transportmanagmentCreate);
 import _transportmanagmentSingle from './schemas/custom/transportmanagmentSingle';
-export const transportmanagmentSingle: TypedSchema<TransportmanagmentSingleSchema> = typedSchema<TransportmanagmentSingleSchema>(_transportmanagmentSingle);
+export const transportmanagmentSingle: TypedSchema<TransportmanagmentSingleSchema> =
+  typedSchema<TransportmanagmentSingleSchema>(_transportmanagmentSingle);
 import _atcRun from './schemas/custom/atcRun';
-export const atcRun: TypedSchema<AtcRunSchema> = typedSchema<AtcRunSchema>(_atcRun);
+export const atcRun: TypedSchema<AtcRunSchema> =
+  typedSchema<AtcRunSchema>(_atcRun);
 import _aunitRun from './schemas/custom/aunitRun';
-export const aunitRun: TypedSchema<AunitRunSchema> = typedSchema<AunitRunSchema>(_aunitRun);
+export const aunitRun: TypedSchema<AunitRunSchema> =
+  typedSchema<AunitRunSchema>(_aunitRun);
 import _aunitResult from './schemas/custom/aunitResult';
-export const aunitResult: TypedSchema<AunitResultSchema> = typedSchema<AunitResultSchema>(_aunitResult);
+export const aunitResult: TypedSchema<AunitResultSchema> =
+  typedSchema<AunitResultSchema>(_aunitResult);
 import _atomFeed from './schemas/custom/atomFeed';
-export const atomFeed: TypedSchema<AtomFeedSchema> = typedSchema<AtomFeedSchema>(_atomFeed);
+export const atomFeed: TypedSchema<AtomFeedSchema> =
+  typedSchema<AtomFeedSchema>(_atomFeed);
 import _objectProperties from './schemas/custom/objectProperties';
-export const objectProperties: TypedSchema<ObjectPropertiesSchema> = typedSchema<ObjectPropertiesSchema>(_objectProperties);
+export const objectProperties: TypedSchema<ObjectPropertiesSchema> =
+  typedSchema<ObjectPropertiesSchema>(_objectProperties);
 import _transportUseraction from './schemas/custom/transportUseraction';
-export const transportUseraction: TypedSchema<TransportUseractionSchema> = typedSchema<TransportUseractionSchema>(_transportUseraction);
+export const transportUseraction: TypedSchema<TransportUseractionSchema> =
+  typedSchema<TransportUseractionSchema>(_transportUseraction);
 import _ddlSource from './schemas/custom/ddlSource';
-export const ddlSource: TypedSchema<DdlSourceSchema> = typedSchema<DdlSourceSchema>(_ddlSource);
+export const ddlSource: TypedSchema<DdlSourceSchema> =
+  typedSchema<DdlSourceSchema>(_ddlSource);
 import _ddlxSource from './schemas/custom/ddlxSource';
-export const ddlxSource: TypedSchema<DdlxSourceSchema> = typedSchema<DdlxSourceSchema>(_ddlxSource);
+export const ddlxSource: TypedSchema<DdlxSourceSchema> =
+  typedSchema<DdlxSourceSchema>(_ddlxSource);
 import _dtebSource from './schemas/custom/dtebSource';
-export const dtebSource: TypedSchema<DtebSourceSchema> = typedSchema<DtebSourceSchema>(_dtebSource);
+export const dtebSource: TypedSchema<DtebSourceSchema> =
+  typedSchema<DtebSourceSchema>(_dtebSource);
 import _dclSource from './schemas/custom/dclSource';
-export const dclSource: TypedSchema<DclSourceSchema> = typedSchema<DclSourceSchema>(_dclSource);
+export const dclSource: TypedSchema<DclSourceSchema> =
+  typedSchema<DclSourceSchema>(_dclSource);
 import _srvdSource from './schemas/custom/srvdSource';
-export const srvdSource: TypedSchema<SrvdSourceSchema> = typedSchema<SrvdSourceSchema>(_srvdSource);
+export const srvdSource: TypedSchema<SrvdSourceSchema> =
+  typedSchema<SrvdSourceSchema>(_srvdSource);
 import _acoverageResult from './schemas/custom/acoverageResult';
-export const acoverageResult: TypedSchema<AcoverageResultSchema> = typedSchema<AcoverageResultSchema>(_acoverageResult);
+export const acoverageResult: TypedSchema<AcoverageResultSchema> =
+  typedSchema<AcoverageResultSchema>(_acoverageResult);
 import _acoverageStatements from './schemas/custom/acoverageStatements';
-export const acoverageStatements: TypedSchema<AcoverageStatementsSchema> = typedSchema<AcoverageStatementsSchema>(_acoverageStatements);
+export const acoverageStatements: TypedSchema<AcoverageStatementsSchema> =
+  typedSchema<AcoverageStatementsSchema>(_acoverageStatements);
 import _badi from './schemas/custom/badi';
 export const badi: TypedSchema<BadiSchema> = typedSchema<BadiSchema>(_badi);
+import _chkvFormTemplate from './schemas/custom/chkvFormTemplate';
+export const chkvFormTemplate: TypedSchema<ChkvFormTemplateSchema> =
+  typedSchema<ChkvFormTemplateSchema>(_chkvFormTemplate);
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/acoverageResult.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/acoverageResult.types.ts
index 40b522693..1db1dffce 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/acoverageResult.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/acoverageResult.types.ts
@@ -6,48 +6,66 @@
  */
 
 export type AcoverageResultSchema = {
-    result: {
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
+  result: {
+    link?:
+      | undefined
+      | {
+          href: string;
+          rel?: string | undefined;
+          type?: string | undefined;
+          hreflang?: string | undefined;
+          title?: string | undefined;
+          length?: number | undefined;
+          etag?: string | undefined;
+          _text?: string | undefined;
         }[];
-        nodes?: undefined | {
-            node?: undefined | {
-                objectReference?: undefined | {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                };
-                coverages?: undefined | {
-                    coverage?: undefined | {
-                        type?: string | undefined;
-                        total?: number | undefined;
-                        executed?: number | undefined;
+    nodes?:
+      | undefined
+      | {
+          node?:
+            | undefined
+            | {
+                objectReference?:
+                  | undefined
+                  | {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                    };
+                coverages?:
+                  | undefined
+                  | {
+                      coverage?:
+                        | undefined
+                        | {
+                            type?: string | undefined;
+                            total?: number | undefined;
+                            executed?: number | undefined;
+                          }[];
+                    };
+                link?:
+                  | undefined
+                  | {
+                      href: string;
+                      rel?: string | undefined;
+                      type?: string | undefined;
+                      hreflang?: string | undefined;
+                      title?: string | undefined;
+                      length?: number | undefined;
+                      etag?: string | undefined;
+                      _text?: string | undefined;
                     }[];
-                };
-                link?: undefined | {
-                    href: string;
-                    rel?: string | undefined;
-                    type?: string | undefined;
-                    hreflang?: string | undefined;
-                    title?: string | undefined;
-                    length?: number | undefined;
-                    etag?: string | undefined;
-                    _text?: string | undefined;
-                }[];
                 nodes?: undefined | unknown;
-            }[];
+              }[];
         };
-        name?: string | undefined;
-    };
+    name?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/acoverageStatements.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/acoverageStatements.types.ts
index a8a6a4265..3978eaaf8 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/acoverageStatements.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/acoverageStatements.types.ts
@@ -6,9 +6,13 @@
  */
 
 export type AcoverageStatementsSchema = {
-    statementsBulkResponse: {
-        statementsResponse?: undefined | {
-            link?: undefined | {
+  statementsBulkResponse: {
+    statementsResponse?:
+      | undefined
+      | {
+          link?:
+            | undefined
+            | {
                 href: string;
                 rel?: string | undefined;
                 type?: string | undefined;
@@ -17,46 +21,70 @@ export type AcoverageStatementsSchema = {
                 length?: number | undefined;
                 etag?: string | undefined;
                 _text?: string | undefined;
-            }[];
-            procedure?: undefined | {
-                objectReference?: undefined | {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                };
+              }[];
+          procedure?:
+            | undefined
+            | {
+                objectReference?:
+                  | undefined
+                  | {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                    };
                 executed?: number | undefined;
-            }[];
-            statement?: undefined | {
-                objectReference?: undefined | {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                };
-                branch?: undefined | {
-                    objectReference?: undefined | {
-                        extension?: undefined | unknown;
-                        uri?: string | undefined;
-                        parentUri?: string | undefined;
-                        type?: string | undefined;
-                        name?: string | undefined;
-                        packageName?: string | undefined;
-                        description?: string | undefined;
+              }[];
+          statement?:
+            | undefined
+            | {
+                objectReference?:
+                  | undefined
+                  | {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
                     };
-                    kind?: string | undefined;
-                    executedTrue?: string | undefined;
-                    executedFalse?: string | undefined;
-                }[];
+                branch?:
+                  | undefined
+                  | {
+                      objectReference?:
+                        | undefined
+                        | {
+                            extension?:
+                              | undefined
+                              | {
+                                  [key: string]: unknown;
+                                };
+                            uri?: string | undefined;
+                            parentUri?: string | undefined;
+                            type?: string | undefined;
+                            name?: string | undefined;
+                            packageName?: string | undefined;
+                            description?: string | undefined;
+                          };
+                      kind?: string | undefined;
+                      executedTrue?: string | undefined;
+                      executedFalse?: string | undefined;
+                    }[];
                 executed?: number | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         }[];
-    };
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/adtcoreObjectSets.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/adtcoreObjectSets.types.ts
index 25af24887..e2d4cb176 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/adtcoreObjectSets.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/adtcoreObjectSets.types.ts
@@ -5,58 +5,92 @@
  * Mode: Flattened
  */
 
-export type AdtcoreObjectSetsSchema = {
-    objectSets: {
-        objectSet?: undefined | {
-            objectReferences?: undefined | {
-                objectReference: {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
+export type AdtcoreObjectSetsSchema =
+  | {
+      objectSets: {
+        objectSet?:
+          | undefined
+          | {
+              objectReferences?:
+                | undefined
+                | {
+                    objectReference: {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                    }[];
                     name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                }[];
-                name?: string | undefined;
-            };
-            kind?: string | undefined;
-        }[];
-    };
-} | {
-    mainObject: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
-                $value?: string | undefined;
-                key?: string | undefined;
+                  };
+              kind?: string | undefined;
             }[];
-            name?: string | undefined;
-        };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
+      };
+    }
+  | {
+      mainObject: {
+        containerRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
+        adtTemplate?:
+          | undefined
+          | {
+              adtProperty?:
+                | undefined
+                | {
+                    $value?: string | undefined;
+                    key?: string | undefined;
+                  }[];
+              name?: string | undefined;
+            };
+        packageRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
         name: string;
         type: string;
         changedBy?: string | undefined;
         changedAt?: string | undefined;
         createdAt?: string | undefined;
         createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
+        version?:
+          | undefined
+          | ''
+          | 'active'
+          | 'inactive'
+          | 'workingArea'
+          | 'new'
+          | 'partlyActive'
+          | 'activeWithInactiveVersion';
         description?: string | undefined;
         descriptionTextLimit?: number | undefined;
         language?: string | undefined;
@@ -64,34 +98,45 @@ export type AdtcoreObjectSetsSchema = {
         masterLanguage?: string | undefined;
         responsible?: string | undefined;
         abapLanguageVersion?: string | undefined;
-    };
-} | {
-    objectReferences: {
+      };
+    }
+  | {
+      objectReferences: {
         objectReference: {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         }[];
         name?: string | undefined;
-    };
-} | {
-    objectReference: {
-        extension?: undefined | unknown;
+      };
+    }
+  | {
+      objectReference: {
+        extension?:
+          | undefined
+          | {
+              [key: string]: unknown;
+            };
         uri?: string | undefined;
         parentUri?: string | undefined;
         type?: string | undefined;
         name?: string | undefined;
         packageName?: string | undefined;
         description?: string | undefined;
-    };
-} | {
-    content: {
+      };
+    }
+  | {
+      content: {
         $value?: string | undefined;
         type?: string | undefined;
         encoding?: string | undefined;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/atcRun.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/atcRun.types.ts
index f9c815fca..14c2d21a6 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/atcRun.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/atcRun.types.ts
@@ -6,24 +6,30 @@
  */
 
 export type AtcRunSchema = {
-    run: {
-        objectSets: {
-            objectSet: {
-                objectReferences?: undefined | {
-                    objectReference: {
-                        extension?: undefined | unknown;
-                        uri?: string | undefined;
-                        parentUri?: string | undefined;
-                        type?: string | undefined;
-                        name?: string | undefined;
-                        packageName?: string | undefined;
-                        description?: string | undefined;
-                    }[];
-                    name?: string | undefined;
-                };
-                kind?: string | undefined;
-            }[];
-        };
-        maximumVerdicts?: number | undefined;
+  run: {
+    objectSets: {
+      objectSet: {
+        objectReferences?:
+          | undefined
+          | {
+              objectReference: {
+                extension?:
+                  | undefined
+                  | {
+                      [key: string]: unknown;
+                    };
+                uri?: string | undefined;
+                parentUri?: string | undefined;
+                type?: string | undefined;
+                name?: string | undefined;
+                packageName?: string | undefined;
+                description?: string | undefined;
+              }[];
+              name?: string | undefined;
+            };
+        kind?: string | undefined;
+      }[];
     };
+    maximumVerdicts?: number | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/atomExtended.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/atomExtended.types.ts
index 7c70c29d8..b8101dbc6 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/atomExtended.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/atomExtended.types.ts
@@ -5,16 +5,19 @@
  * Mode: Flattened
  */
 
-export type AtomExtendedSchema = {
-    title: string;
-} | {
-    category: {
+export type AtomExtendedSchema =
+  | {
+      title: string;
+    }
+  | {
+      category: {
         term?: string | undefined;
         scheme?: string | undefined;
         label?: string | undefined;
-    };
-} | {
-    link: {
+      };
+    }
+  | {
+      link: {
         href: string;
         rel?: string | undefined;
         type?: string | undefined;
@@ -23,5 +26,5 @@ export type AtomExtendedSchema = {
         length?: number | undefined;
         etag?: string | undefined;
         _text?: string | undefined;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/atomFeed.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/atomFeed.types.ts
index 558aca43d..5843674a3 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/atomFeed.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/atomFeed.types.ts
@@ -5,88 +5,114 @@
  * Mode: Flattened
  */
 
-export type AtomFeedSchema = {
-    feed: {
-        author?: undefined | {
-            name?: string | undefined;
-        };
+export type AtomFeedSchema =
+  | {
+      feed: {
+        author?:
+          | undefined
+          | {
+              name?: string | undefined;
+            };
         title?: string | undefined;
         updated?: string | undefined;
         id?: string | undefined;
-        entry?: undefined | {
-            id?: string | undefined;
-            title?: string | undefined;
-            link?: undefined | {
-                href: string;
-                rel?: string | undefined;
-                type?: string | undefined;
-                hreflang?: string | undefined;
-                title?: string | undefined;
-                length?: number | undefined;
-                etag?: string | undefined;
-                _text?: string | undefined;
+        entry?:
+          | undefined
+          | {
+              id?: string | undefined;
+              title?: string | undefined;
+              link?:
+                | undefined
+                | {
+                    href: string;
+                    rel?: string | undefined;
+                    type?: string | undefined;
+                    hreflang?: string | undefined;
+                    title?: string | undefined;
+                    length?: number | undefined;
+                    etag?: string | undefined;
+                    _text?: string | undefined;
+                  }[];
+              updated?: string | undefined;
+              author?:
+                | undefined
+                | {
+                    name?: string | undefined;
+                  };
+              content?:
+                | undefined
+                | {
+                    type?: string | undefined;
+                    src?: string | undefined;
+                    _text?: string | undefined;
+                  };
             }[];
-            updated?: string | undefined;
-            author?: undefined | {
-                name?: string | undefined;
-            };
-            content?: undefined | {
-                type?: string | undefined;
-                src?: string | undefined;
-                _text?: string | undefined;
-            };
-        }[];
-    };
-} | {
-    entry: {
+      };
+    }
+  | {
+      entry: {
         id?: string | undefined;
         title?: string | undefined;
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
-        }[];
+        link?:
+          | undefined
+          | {
+              href: string;
+              rel?: string | undefined;
+              type?: string | undefined;
+              hreflang?: string | undefined;
+              title?: string | undefined;
+              length?: number | undefined;
+              etag?: string | undefined;
+              _text?: string | undefined;
+            }[];
         updated?: string | undefined;
-        author?: undefined | {
-            name?: string | undefined;
-        };
-        content?: undefined | {
-            type?: string | undefined;
-            src?: string | undefined;
-            _text?: string | undefined;
-        };
-    };
-} | {
-    id: string;
-} | {
-    updated: string;
-} | {
-    author: {
+        author?:
+          | undefined
+          | {
+              name?: string | undefined;
+            };
+        content?:
+          | undefined
+          | {
+              type?: string | undefined;
+              src?: string | undefined;
+              _text?: string | undefined;
+            };
+      };
+    }
+  | {
+      id: string;
+    }
+  | {
+      updated: string;
+    }
+  | {
+      author: {
         name?: string | undefined;
-    };
-} | {
-    name: string;
-} | {
-    content: {
+      };
+    }
+  | {
+      name: string;
+    }
+  | {
+      content: {
         type?: string | undefined;
         src?: string | undefined;
         _text?: string | undefined;
-    };
-} | {
-    title: string;
-} | {
-    category: {
+      };
+    }
+  | {
+      title: string;
+    }
+  | {
+      category: {
         term?: string | undefined;
         scheme?: string | undefined;
         label?: string | undefined;
-    };
-} | {
-    link: {
+      };
+    }
+  | {
+      link: {
         href: string;
         rel?: string | undefined;
         type?: string | undefined;
@@ -95,5 +121,5 @@ export type AtomFeedSchema = {
         length?: number | undefined;
         etag?: string | undefined;
         _text?: string | undefined;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/aunitResult.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/aunitResult.types.ts
index c2b9f8d1a..06a54b483 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/aunitResult.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/aunitResult.types.ts
@@ -6,105 +6,162 @@
  */
 
 export type AunitResultSchema = {
-    runResult: {
-        external?: undefined | {
-            coverage?: undefined | {
+  runResult: {
+    external?:
+      | undefined
+      | {
+          coverage?:
+            | undefined
+            | {
                 uri?: string | undefined;
-            };
+              };
         };
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
+    link?:
+      | undefined
+      | {
+          href: string;
+          rel?: string | undefined;
+          type?: string | undefined;
+          hreflang?: string | undefined;
+          title?: string | undefined;
+          length?: number | undefined;
+          etag?: string | undefined;
+          _text?: string | undefined;
         }[];
-        program?: undefined | {
-            testClasses?: undefined | {
-                testClass?: undefined | {
-                    testMethods?: undefined | {
-                        testMethod?: undefined | {
-                            alerts?: undefined | {
-                                alert?: undefined | {
-                                    title?: string | undefined;
-                                    details?: undefined | {
-                                        detail?: undefined | {
-                                            text?: string | undefined;
-                                        }[];
-                                    };
-                                    stack?: undefined | {
-                                        stackEntry?: undefined | {
-                                            uri?: string | undefined;
-                                            type?: string | undefined;
-                                            name?: string | undefined;
-                                            description?: string | undefined;
-                                        }[];
-                                    };
-                                    kind?: string | undefined;
-                                    severity?: string | undefined;
+    program?:
+      | undefined
+      | {
+          testClasses?:
+            | undefined
+            | {
+                testClass?:
+                  | undefined
+                  | {
+                      testMethods?:
+                        | undefined
+                        | {
+                            testMethod?:
+                              | undefined
+                              | {
+                                  alerts?:
+                                    | undefined
+                                    | {
+                                        alert?:
+                                          | undefined
+                                          | {
+                                              title?: string | undefined;
+                                              details?:
+                                                | undefined
+                                                | {
+                                                    detail?:
+                                                      | undefined
+                                                      | {
+                                                          text?:
+                                                            string | undefined;
+                                                        }[];
+                                                  };
+                                              stack?:
+                                                | undefined
+                                                | {
+                                                    stackEntry?:
+                                                      | undefined
+                                                      | {
+                                                          uri?:
+                                                            string | undefined;
+                                                          type?:
+                                                            string | undefined;
+                                                          name?:
+                                                            string | undefined;
+                                                          description?:
+                                                            string | undefined;
+                                                        }[];
+                                                  };
+                                              kind?: string | undefined;
+                                              severity?: string | undefined;
+                                            }[];
+                                      };
+                                  uri?: string | undefined;
+                                  name?: string | undefined;
+                                  executionTime?: string | undefined;
+                                  uriType?: string | undefined;
+                                  unit?: string | undefined;
                                 }[];
-                            };
-                            uri?: string | undefined;
-                            name?: string | undefined;
-                            executionTime?: string | undefined;
-                            uriType?: string | undefined;
-                            unit?: string | undefined;
-                        }[];
-                    };
-                    alerts?: undefined | {
-                        alert?: undefined | {
-                            title?: string | undefined;
-                            details?: undefined | {
-                                detail?: undefined | {
-                                    text?: string | undefined;
+                          };
+                      alerts?:
+                        | undefined
+                        | {
+                            alert?:
+                              | undefined
+                              | {
+                                  title?: string | undefined;
+                                  details?:
+                                    | undefined
+                                    | {
+                                        detail?:
+                                          | undefined
+                                          | {
+                                              text?: string | undefined;
+                                            }[];
+                                      };
+                                  stack?:
+                                    | undefined
+                                    | {
+                                        stackEntry?:
+                                          | undefined
+                                          | {
+                                              uri?: string | undefined;
+                                              type?: string | undefined;
+                                              name?: string | undefined;
+                                              description?: string | undefined;
+                                            }[];
+                                      };
+                                  kind?: string | undefined;
+                                  severity?: string | undefined;
                                 }[];
-                            };
-                            stack?: undefined | {
-                                stackEntry?: undefined | {
-                                    uri?: string | undefined;
-                                    type?: string | undefined;
-                                    name?: string | undefined;
-                                    description?: string | undefined;
+                          };
+                      uri?: string | undefined;
+                      name?: string | undefined;
+                      uriType?: string | undefined;
+                      durationCategory?: string | undefined;
+                      riskLevel?: string | undefined;
+                    }[];
+              };
+          alerts?:
+            | undefined
+            | {
+                alert?:
+                  | undefined
+                  | {
+                      title?: string | undefined;
+                      details?:
+                        | undefined
+                        | {
+                            detail?:
+                              | undefined
+                              | {
+                                  text?: string | undefined;
                                 }[];
-                            };
-                            kind?: string | undefined;
-                            severity?: string | undefined;
-                        }[];
-                    };
-                    uri?: string | undefined;
-                    name?: string | undefined;
-                    uriType?: string | undefined;
-                    durationCategory?: string | undefined;
-                    riskLevel?: string | undefined;
-                }[];
-            };
-            alerts?: undefined | {
-                alert?: undefined | {
-                    title?: string | undefined;
-                    details?: undefined | {
-                        detail?: undefined | {
-                            text?: string | undefined;
-                        }[];
-                    };
-                    stack?: undefined | {
-                        stackEntry?: undefined | {
-                            uri?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            description?: string | undefined;
-                        }[];
-                    };
-                    kind?: string | undefined;
-                    severity?: string | undefined;
-                }[];
-            };
-            uri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            uriType?: string | undefined;
+                          };
+                      stack?:
+                        | undefined
+                        | {
+                            stackEntry?:
+                              | undefined
+                              | {
+                                  uri?: string | undefined;
+                                  type?: string | undefined;
+                                  name?: string | undefined;
+                                  description?: string | undefined;
+                                }[];
+                          };
+                      kind?: string | undefined;
+                      severity?: string | undefined;
+                    }[];
+              };
+          uri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          uriType?: string | undefined;
         }[];
-    };
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/aunitRun.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/aunitRun.types.ts
index 70d595c18..39c044697 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/aunitRun.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/aunitRun.types.ts
@@ -6,39 +6,57 @@
  */
 
 export type AunitRunSchema = {
-    runConfiguration: {
-        external?: undefined | {
-            coverage?: undefined | {
+  runConfiguration: {
+    external?:
+      | undefined
+      | {
+          coverage?:
+            | undefined
+            | {
                 active?: string | undefined;
-            };
+              };
         };
-        options?: undefined | {
-            uriType?: undefined | {
+    options?:
+      | undefined
+      | {
+          uriType?:
+            | undefined
+            | {
                 value?: string | undefined;
-            };
-            testDeterminationStrategy?: undefined | {
+              };
+          testDeterminationStrategy?:
+            | undefined
+            | {
                 sameProgram?: string | undefined;
                 assignedTests?: string | undefined;
                 appendAssignedTestsPreview?: string | undefined;
-            };
-            testRiskLevels?: undefined | {
+              };
+          testRiskLevels?:
+            | undefined
+            | {
                 harmless?: string | undefined;
                 dangerous?: string | undefined;
                 critical?: string | undefined;
-            };
-            testDurations?: undefined | {
+              };
+          testDurations?:
+            | undefined
+            | {
                 short?: string | undefined;
                 medium?: string | undefined;
                 long?: string | undefined;
-            };
-            withNavigationUri?: undefined | {
+              };
+          withNavigationUri?:
+            | undefined
+            | {
                 enabled?: string | undefined;
-            };
-        };
-        objectSets: {
-            objectSet?: undefined | {
-                kind?: string | undefined;
-            }[];
+              };
         };
+    objectSets: {
+      objectSet?:
+        | undefined
+        | {
+            kind?: string | undefined;
+          }[];
     };
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/badi.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/badi.types.ts
index 4fd7e3073..fa6be0c54 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/badi.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/badi.types.ts
@@ -6,45 +6,69 @@
  */
 
 export type BadiSchema = {
-    enhancementImplementation: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  enhancementImplementation: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/blueSource.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/blueSource.types.ts
index 569441e97..3954b00cf 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/blueSource.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/blueSource.types.ts
@@ -6,65 +6,104 @@
  */
 
 export type BlueSourceSchema = {
-    blueSource: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  blueSource: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        template?: undefined | {
-            property?: undefined | {
+    template?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
+    syntaxConfiguration?:
+      | undefined
+      | {
+          language?:
+            | undefined
+            | {
                 version?: string | undefined;
                 description?: string | undefined;
-            };
-            objectUsage?: undefined | {
+              };
+          objectUsage?:
+            | undefined
+            | {
                 restricted?: boolean | undefined;
-            };
+              };
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
-        fixPointArithmetic?: boolean | undefined;
-        activeUnicodeCheck?: boolean | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    sourceUri?: string | undefined;
+    sourceObjectStatus?:
+      | undefined
+      | 'SAPStandardProduction'
+      | 'customerProduction'
+      | 'system'
+      | 'test';
+    fixPointArithmetic?: boolean | undefined;
+    activeUnicodeCheck?: boolean | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/chkc.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/chkc.types.ts
new file mode 100644
index 000000000..590889810
--- /dev/null
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/chkc.types.ts
@@ -0,0 +1,22 @@
+/**
+ * Auto-generated TypeScript interfaces from XSD
+ * DO NOT EDIT - Generated by ts-xsd codegen
+ * Source: xsd/custom/chkc.xsd
+ * Mode: Flattened
+ */
+
+export type ChkcSchema = {
+  checkCategoryObject: {
+    content?:
+      | undefined
+      | {
+          category?:
+            | undefined
+            | {
+                type?: string | undefined;
+              };
+        };
+    name?: string | undefined;
+    description?: string | undefined;
+  };
+};
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/chko.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/chko.types.ts
new file mode 100644
index 000000000..a4766caa1
--- /dev/null
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/chko.types.ts
@@ -0,0 +1,40 @@
+/**
+ * Auto-generated TypeScript interfaces from XSD
+ * DO NOT EDIT - Generated by ts-xsd codegen
+ * Source: xsd/custom/chko.xsd
+ * Mode: Flattened
+ */
+
+export type ChkoSchema = {
+  checkObject: {
+    content?:
+      | undefined
+      | {
+          category?:
+            | undefined
+            | {
+                name?: string | undefined;
+              };
+          implementingClass?:
+            | undefined
+            | {
+                name?: string | undefined;
+              };
+          remoteEnabled?: boolean | undefined;
+          parameters?:
+            | undefined
+            | {
+                parameter?:
+                  | undefined
+                  | {
+                      parameterTechnicalId?: string | undefined;
+                      parameterName?: string | undefined;
+                      parameterDescription?: string | undefined;
+                      parameterModifiable?: boolean | undefined;
+                    }[];
+              };
+        };
+    name?: string | undefined;
+    description?: string | undefined;
+  };
+};
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/chkoParameter.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/chkoParameter.types.ts
new file mode 100644
index 000000000..85c6d47e3
--- /dev/null
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/chkoParameter.types.ts
@@ -0,0 +1,19 @@
+/**
+ * Auto-generated TypeScript interfaces from XSD
+ * DO NOT EDIT - Generated by ts-xsd codegen
+ * Source: xsd/custom/chkoParameter.xsd
+ * Mode: Flattened
+ */
+
+export type ChkoParameterSchema = {
+  parameters: {
+    parameter?:
+      | undefined
+      | {
+          parameterTechnicalId?: string | undefined;
+          parameterName?: string | undefined;
+          parameterDescription?: string | undefined;
+          parameterModifiable?: boolean | undefined;
+        }[];
+  };
+};
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/chkvFormTemplate.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/chkvFormTemplate.types.ts
new file mode 100644
index 000000000..3e2827be4
--- /dev/null
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/chkvFormTemplate.types.ts
@@ -0,0 +1,74 @@
+/**
+ * Auto-generated TypeScript interfaces from XSD
+ * DO NOT EDIT - Generated by ts-xsd codegen
+ * Source: xsd/custom/chkvFormTemplate.xsd
+ * Mode: Flattened
+ */
+
+export type ChkvFormTemplateSchema = {
+  formTemplate: {
+    availableCheckCategories: {
+      availableCheckCategory: {
+        checkCategoryObject: {
+          content?:
+            | undefined
+            | {
+                category?:
+                  | undefined
+                  | {
+                      type?: string | undefined;
+                    };
+              };
+          name?: string | undefined;
+          description?: string | undefined;
+        };
+        check: {
+          checkObject: {
+            content?:
+              | undefined
+              | {
+                  category?:
+                    | undefined
+                    | {
+                        name?: string | undefined;
+                      };
+                  implementingClass?:
+                    | undefined
+                    | {
+                        name?: string | undefined;
+                      };
+                  remoteEnabled?: boolean | undefined;
+                  parameters?:
+                    | undefined
+                    | {
+                        parameter?:
+                          | undefined
+                          | {
+                              parameterTechnicalId?: string | undefined;
+                              parameterName?: string | undefined;
+                              parameterDescription?: string | undefined;
+                              parameterModifiable?: boolean | undefined;
+                            }[];
+                      };
+                };
+            name?: string | undefined;
+            description?: string | undefined;
+          };
+          parameterValueXml?: string | undefined;
+          link?:
+            | undefined
+            | {
+                href: string;
+                rel?: string | undefined;
+                type?: string | undefined;
+                hreflang?: string | undefined;
+                title?: string | undefined;
+                length?: number | undefined;
+                etag?: string | undefined;
+                _text?: string | undefined;
+              }[];
+        }[];
+      }[];
+    };
+  };
+};
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/chkvcheck.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/chkvcheck.types.ts
new file mode 100644
index 000000000..7e56007a8
--- /dev/null
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/chkvcheck.types.ts
@@ -0,0 +1,55 @@
+/**
+ * Auto-generated TypeScript interfaces from XSD
+ * DO NOT EDIT - Generated by ts-xsd codegen
+ * Source: xsd/custom/chkvcheck.xsd
+ * Mode: Flattened
+ */
+
+export type ChkvcheckSchema = {
+  check: {
+    checkObject: {
+      content?:
+        | undefined
+        | {
+            category?:
+              | undefined
+              | {
+                  name?: string | undefined;
+                };
+            implementingClass?:
+              | undefined
+              | {
+                  name?: string | undefined;
+                };
+            remoteEnabled?: boolean | undefined;
+            parameters?:
+              | undefined
+              | {
+                  parameter?:
+                    | undefined
+                    | {
+                        parameterTechnicalId?: string | undefined;
+                        parameterName?: string | undefined;
+                        parameterDescription?: string | undefined;
+                        parameterModifiable?: boolean | undefined;
+                      }[];
+                };
+          };
+      name?: string | undefined;
+      description?: string | undefined;
+    };
+    parameterValueXml?: string | undefined;
+    link?:
+      | undefined
+      | {
+          href: string;
+          rel?: string | undefined;
+          type?: string | undefined;
+          hreflang?: string | undefined;
+          title?: string | undefined;
+          length?: number | undefined;
+          etag?: string | undefined;
+          _text?: string | undefined;
+        }[];
+  };
+};
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/dataelementWrapper.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/dataelementWrapper.types.ts
index d73b754cf..dab73740a 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/dataelementWrapper.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/dataelementWrapper.types.ts
@@ -6,75 +6,111 @@
  */
 
 export type DataelementWrapperSchema = {
-    wbobj: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  wbobj: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        dataElement?: undefined | {
-            typeKind: "domain" | "predefinedAbapType" | "refToPredefinedAbapType" | "refToDictionaryType" | "refToClifType";
-            typeName?: string | undefined;
-            dataType?: string | undefined;
-            dataTypeLength?: number | undefined;
-            dataTypeLengthEnabled?: boolean | undefined;
-            dataTypeDecimals?: number | undefined;
-            dataTypeDecimalsEnabled?: boolean | undefined;
-            shortFieldLabel?: string | undefined;
-            shortFieldLength?: number | undefined;
-            shortFieldMaxLength?: number | undefined;
-            mediumFieldLabel?: string | undefined;
-            mediumFieldLength?: number | undefined;
-            mediumFieldMaxLength?: number | undefined;
-            longFieldLabel?: string | undefined;
-            longFieldLength?: number | undefined;
-            longFieldMaxLength?: number | undefined;
-            headingFieldLabel?: string | undefined;
-            headingFieldLength?: number | undefined;
-            headingFieldMaxLength?: number | undefined;
-            searchHelp?: string | undefined;
-            searchHelpParameter?: string | undefined;
-            setGetParameter?: string | undefined;
-            defaultComponentName?: string | undefined;
-            deactivateInputHistory?: boolean | undefined;
-            changeDocument?: boolean | undefined;
-            leftToRightDirection?: boolean | undefined;
-            deactivateBIDIFiltering?: boolean | undefined;
-            documentationStatus?: undefined | "required" | "notUsedInScreens" | "explainedByShortText" | "postponed";
+    dataElement?:
+      | undefined
+      | {
+          typeKind:
+            | 'domain'
+            | 'predefinedAbapType'
+            | 'refToPredefinedAbapType'
+            | 'refToDictionaryType'
+            | 'refToClifType';
+          typeName?: string | undefined;
+          dataType?: string | undefined;
+          dataTypeLength?: number | undefined;
+          dataTypeLengthEnabled?: boolean | undefined;
+          dataTypeDecimals?: number | undefined;
+          dataTypeDecimalsEnabled?: boolean | undefined;
+          shortFieldLabel?: string | undefined;
+          shortFieldLength?: number | undefined;
+          shortFieldMaxLength?: number | undefined;
+          mediumFieldLabel?: string | undefined;
+          mediumFieldLength?: number | undefined;
+          mediumFieldMaxLength?: number | undefined;
+          longFieldLabel?: string | undefined;
+          longFieldLength?: number | undefined;
+          longFieldMaxLength?: number | undefined;
+          headingFieldLabel?: string | undefined;
+          headingFieldLength?: number | undefined;
+          headingFieldMaxLength?: number | undefined;
+          searchHelp?: string | undefined;
+          searchHelpParameter?: string | undefined;
+          setGetParameter?: string | undefined;
+          defaultComponentName?: string | undefined;
+          deactivateInputHistory?: boolean | undefined;
+          changeDocument?: boolean | undefined;
+          leftToRightDirection?: boolean | undefined;
+          deactivateBIDIFiltering?: boolean | undefined;
+          documentationStatus?:
+            | undefined
+            | 'required'
+            | 'notUsedInScreens'
+            | 'explainedByShortText'
+            | 'postponed';
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/dclSource.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/dclSource.types.ts
index 242a7d6ca..4be77fcf3 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/dclSource.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/dclSource.types.ts
@@ -6,65 +6,104 @@
  */
 
 export type DclSourceSchema = {
-    dclSource: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  dclSource: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        template?: undefined | {
-            property?: undefined | {
+    template?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
+    syntaxConfiguration?:
+      | undefined
+      | {
+          language?:
+            | undefined
+            | {
                 version?: string | undefined;
                 description?: string | undefined;
-            };
-            objectUsage?: undefined | {
+              };
+          objectUsage?:
+            | undefined
+            | {
                 restricted?: boolean | undefined;
-            };
+              };
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
-        fixPointArithmetic?: boolean | undefined;
-        activeUnicodeCheck?: boolean | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    sourceUri?: string | undefined;
+    sourceObjectStatus?:
+      | undefined
+      | 'SAPStandardProduction'
+      | 'customerProduction'
+      | 'system'
+      | 'test';
+    fixPointArithmetic?: boolean | undefined;
+    activeUnicodeCheck?: boolean | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/ddlSource.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/ddlSource.types.ts
index 9fa92309d..71a6ea90c 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/ddlSource.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/ddlSource.types.ts
@@ -6,67 +6,106 @@
  */
 
 export type DdlSourceSchema = {
-    ddlSource: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  ddlSource: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        template?: undefined | {
-            property?: undefined | {
+    template?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
+    syntaxConfiguration?:
+      | undefined
+      | {
+          language?:
+            | undefined
+            | {
                 version?: string | undefined;
                 description?: string | undefined;
-            };
-            objectUsage?: undefined | {
+              };
+          objectUsage?:
+            | undefined
+            | {
                 restricted?: boolean | undefined;
-            };
+              };
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
-        fixPointArithmetic?: boolean | undefined;
-        activeUnicodeCheck?: boolean | undefined;
-        source_origin?: string | undefined;
-        source_type?: string | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    sourceUri?: string | undefined;
+    sourceObjectStatus?:
+      | undefined
+      | 'SAPStandardProduction'
+      | 'customerProduction'
+      | 'system'
+      | 'test';
+    fixPointArithmetic?: boolean | undefined;
+    activeUnicodeCheck?: boolean | undefined;
+    source_origin?: string | undefined;
+    source_type?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/ddlxSource.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/ddlxSource.types.ts
index 50f3bacfd..469aa5472 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/ddlxSource.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/ddlxSource.types.ts
@@ -6,65 +6,104 @@
  */
 
 export type DdlxSourceSchema = {
-    ddlxSource: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  ddlxSource: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        template?: undefined | {
-            property?: undefined | {
+    template?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
+    syntaxConfiguration?:
+      | undefined
+      | {
+          language?:
+            | undefined
+            | {
                 version?: string | undefined;
                 description?: string | undefined;
-            };
-            objectUsage?: undefined | {
+              };
+          objectUsage?:
+            | undefined
+            | {
                 restricted?: boolean | undefined;
-            };
+              };
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
-        fixPointArithmetic?: boolean | undefined;
-        activeUnicodeCheck?: boolean | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    sourceUri?: string | undefined;
+    sourceObjectStatus?:
+      | undefined
+      | 'SAPStandardProduction'
+      | 'customerProduction'
+      | 'system'
+      | 'test';
+    fixPointArithmetic?: boolean | undefined;
+    activeUnicodeCheck?: boolean | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/discovery.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/discovery.types.ts
index 4beaa1d13..0b74478d0 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/discovery.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/discovery.types.ts
@@ -6,20 +6,26 @@
  */
 
 export type DiscoverySchema = {
-    service: {
-        workspace?: undefined | {
-            title?: string | undefined;
-            collection?: undefined | {
+  service: {
+    workspace?:
+      | undefined
+      | {
+          title?: string | undefined;
+          collection?:
+            | undefined
+            | {
                 title?: string | undefined;
                 accept?: undefined | string[];
-                category?: undefined | {
-                    term?: string | undefined;
-                    scheme?: string | undefined;
-                    label?: string | undefined;
-                }[];
+                category?:
+                  | undefined
+                  | {
+                      term?: string | undefined;
+                      scheme?: string | undefined;
+                      label?: string | undefined;
+                    }[];
                 templateLinks?: undefined | unknown;
                 href: string;
-            }[];
+              }[];
         }[];
-    };
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/dtebSource.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/dtebSource.types.ts
index 45995c4c0..333627870 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/dtebSource.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/dtebSource.types.ts
@@ -6,65 +6,104 @@
  */
 
 export type DtebSourceSchema = {
-    dtebSource: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  dtebSource: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        template?: undefined | {
-            property?: undefined | {
+    template?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
+    syntaxConfiguration?:
+      | undefined
+      | {
+          language?:
+            | undefined
+            | {
                 version?: string | undefined;
                 description?: string | undefined;
-            };
-            objectUsage?: undefined | {
+              };
+          objectUsage?:
+            | undefined
+            | {
                 restricted?: boolean | undefined;
-            };
+              };
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
-        fixPointArithmetic?: boolean | undefined;
-        activeUnicodeCheck?: boolean | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    sourceUri?: string | undefined;
+    sourceObjectStatus?:
+      | undefined
+      | 'SAPStandardProduction'
+      | 'customerProduction'
+      | 'system'
+      | 'test';
+    fixPointArithmetic?: boolean | undefined;
+    activeUnicodeCheck?: boolean | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/http.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/http.types.ts
index 5a44314d0..25008728c 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/http.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/http.types.ts
@@ -6,22 +6,28 @@
  */
 
 export type HttpSchema = {
-    session: {
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
+  session: {
+    link?:
+      | undefined
+      | {
+          href: string;
+          rel?: string | undefined;
+          type?: string | undefined;
+          hreflang?: string | undefined;
+          title?: string | undefined;
+          length?: number | undefined;
+          etag?: string | undefined;
+          _text?: string | undefined;
         }[];
-        properties?: undefined | {
-            property?: undefined | {
+    properties?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 name: string;
-            }[];
+              }[];
         };
-    };
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/objectProperties.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/objectProperties.types.ts
index c7a1a6250..289aae042 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/objectProperties.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/objectProperties.types.ts
@@ -6,9 +6,13 @@
  */
 
 export type ObjectPropertiesSchema = {
-    objectProperties: {
-        object?: undefined | {
-            link?: undefined | {
+  objectProperties: {
+    object?:
+      | undefined
+      | {
+          link?:
+            | undefined
+            | {
                 href: string;
                 rel?: string | undefined;
                 type?: string | undefined;
@@ -17,17 +21,21 @@ export type ObjectPropertiesSchema = {
                 length?: number | undefined;
                 etag?: string | undefined;
                 _text?: string | undefined;
-            }[];
-            name?: string | undefined;
-            type?: string | undefined;
-            package?: string | undefined;
-            uri?: string | undefined;
-            vituri?: string | undefined;
-            text?: string | undefined;
-            expandable?: boolean | undefined;
+              }[];
+          name?: string | undefined;
+          type?: string | undefined;
+          package?: string | undefined;
+          uri?: string | undefined;
+          vituri?: string | undefined;
+          text?: string | undefined;
+          expandable?: boolean | undefined;
         };
-        property?: undefined | {
-            link?: undefined | {
+    property?:
+      | undefined
+      | {
+          link?:
+            | undefined
+            | {
                 href: string;
                 rel?: string | undefined;
                 type?: string | undefined;
@@ -36,13 +44,13 @@ export type ObjectPropertiesSchema = {
                 length?: number | undefined;
                 etag?: string | undefined;
                 _text?: string | undefined;
-            }[];
-            facet?: string | undefined;
-            name?: string | undefined;
-            displayName?: string | undefined;
-            text?: string | undefined;
-            hasChildrenOfSameFacet?: boolean | undefined;
-            version?: string | undefined;
+              }[];
+          facet?: string | undefined;
+          name?: string | undefined;
+          displayName?: string | undefined;
+          text?: string | undefined;
+          hasChildrenOfSameFacet?: boolean | undefined;
+          version?: string | undefined;
         }[];
-    };
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/srvdSource.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/srvdSource.types.ts
index 92419b885..b4a346b81 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/srvdSource.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/srvdSource.types.ts
@@ -6,67 +6,106 @@
  */
 
 export type SrvdSourceSchema = {
-    srvdSource: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  srvdSource: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        template?: undefined | {
-            property?: undefined | {
+    template?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
+    syntaxConfiguration?:
+      | undefined
+      | {
+          language?:
+            | undefined
+            | {
                 version?: string | undefined;
                 description?: string | undefined;
-            };
-            objectUsage?: undefined | {
+              };
+          objectUsage?:
+            | undefined
+            | {
                 restricted?: boolean | undefined;
-            };
+              };
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
-        fixPointArithmetic?: boolean | undefined;
-        activeUnicodeCheck?: boolean | undefined;
-        sourceOrigin?: string | undefined;
-        srvdSourceType?: string | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    sourceUri?: string | undefined;
+    sourceObjectStatus?:
+      | undefined
+      | 'SAPStandardProduction'
+      | 'customerProduction'
+      | 'system'
+      | 'test';
+    fixPointArithmetic?: boolean | undefined;
+    activeUnicodeCheck?: boolean | undefined;
+    sourceOrigin?: string | undefined;
+    srvdSourceType?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/templatelinkExtended.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/templatelinkExtended.types.ts
index dd6ee9f15..bea4f752a 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/templatelinkExtended.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/templatelinkExtended.types.ts
@@ -5,22 +5,26 @@
  * Mode: Flattened
  */
 
-export type TemplatelinkExtendedSchema = {
-    templateLinks: {
-        templateLink?: undefined | {
-            template: string;
-            rel: string;
-            type?: string | undefined;
-            title?: string | undefined;
-            _text?: string | undefined;
-        }[];
-    };
-} | {
-    templateLink: {
+export type TemplatelinkExtendedSchema =
+  | {
+      templateLinks: {
+        templateLink?:
+          | undefined
+          | {
+              template: string;
+              rel: string;
+              type?: string | undefined;
+              title?: string | undefined;
+              _text?: string | undefined;
+            }[];
+      };
+    }
+  | {
+      templateLink: {
         template: string;
         rel: string;
         type?: string | undefined;
         title?: string | undefined;
         _text?: string | undefined;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/transportUseraction.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/transportUseraction.types.ts
index 627f5b230..43757e1d4 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/transportUseraction.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/transportUseraction.types.ts
@@ -6,19 +6,23 @@
  */
 
 export type TransportUseractionSchema = {
-    root: {
-        request?: undefined | {
-            task?: undefined | {
+  root: {
+    request?:
+      | undefined
+      | {
+          task?:
+            | undefined
+            | {
                 owner?: string | undefined;
-            }[];
-            desc?: string | undefined;
-            type?: string | undefined;
-            target?: string | undefined;
-            cts_project?: string | undefined;
+              }[];
+          desc?: string | undefined;
+          type?: string | undefined;
+          target?: string | undefined;
+          cts_project?: string | undefined;
         };
-        useraction?: string | undefined;
-        targetuser?: string | undefined;
-        recursive?: string | undefined;
-        useraction_desc?: string | undefined;
-    };
+    useraction?: string | undefined;
+    targetuser?: string | undefined;
+    recursive?: string | undefined;
+    useraction_desc?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/transportfind.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/transportfind.types.ts
index 5ed4808f2..708e7f069 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/transportfind.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/transportfind.types.ts
@@ -6,23 +6,25 @@
  */
 
 export type TransportfindSchema = {
-    abap: {
-        values: {
-            DATA: {
-                CTS_REQ_HEADER?: undefined | {
-                    TRKORR: string;
-                    TRFUNCTION: string;
-                    TRSTATUS: string;
-                    TARSYSTEM: string;
-                    AS4USER: string;
-                    AS4DATE: string;
-                    AS4TIME: string;
-                    AS4TEXT: string;
-                    CLIENT: string;
-                    REPOID: string;
-                }[];
-            };
-        };
-        version?: string | undefined;
+  abap: {
+    values: {
+      DATA: {
+        CTS_REQ_HEADER?:
+          | undefined
+          | {
+              TRKORR: string;
+              TRFUNCTION: string;
+              TRSTATUS: string;
+              TARSYSTEM: string;
+              AS4USER: string;
+              AS4DATE: string;
+              AS4TIME: string;
+              AS4TEXT: string;
+              CLIENT: string;
+              REPOID: string;
+            }[];
+      };
     };
+    version?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/transportmanagmentCreate.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/transportmanagmentCreate.types.ts
index b25c21650..1618e69ed 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/transportmanagmentCreate.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/transportmanagmentCreate.types.ts
@@ -6,16 +6,20 @@
  */
 
 export type TransportmanagmentCreateSchema = {
-    root: {
-        request?: undefined | {
-            task?: undefined | {
+  root: {
+    request?:
+      | undefined
+      | {
+          task?:
+            | undefined
+            | {
                 owner?: string | undefined;
-            }[];
-            desc?: string | undefined;
-            type?: string | undefined;
-            target?: string | undefined;
-            cts_project?: string | undefined;
+              }[];
+          desc?: string | undefined;
+          type?: string | undefined;
+          target?: string | undefined;
+          cts_project?: string | undefined;
         };
-        useraction?: string | undefined;
-    };
+    useraction?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/custom/transportmanagmentSingle.types.ts b/packages/adt-schemas/src/schemas/generated/types/custom/transportmanagmentSingle.types.ts
index cc3951fa1..3ac7a799b 100644
--- a/packages/adt-schemas/src/schemas/generated/types/custom/transportmanagmentSingle.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/custom/transportmanagmentSingle.types.ts
@@ -6,36 +6,52 @@
  */
 
 export type TransportmanagmentSingleSchema = {
-    root: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  root: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
+    link?:
+      | undefined
+      | {
+          href: string;
+          rel?: string | undefined;
+          type?: string | undefined;
+          hreflang?: string | undefined;
+          title?: string | undefined;
+          length?: number | undefined;
+          etag?: string | undefined;
+          _text?: string | undefined;
         }[];
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        request?: undefined | {
-            long_desc?: string | undefined;
-            link?: undefined | {
+    request?:
+      | undefined
+      | {
+          long_desc?: string | undefined;
+          link?:
+            | undefined
+            | {
                 href: string;
                 rel?: string | undefined;
                 type?: string | undefined;
@@ -44,24 +60,30 @@ export type TransportmanagmentSingleSchema = {
                 length?: number | undefined;
                 etag?: string | undefined;
                 _text?: string | undefined;
-            }[];
-            attributes?: undefined | {
+              }[];
+          attributes?:
+            | undefined
+            | {
                 attribute?: string | undefined;
                 description?: string | undefined;
                 value?: string | undefined;
                 position?: string | undefined;
-            }[];
-            abap_object?: undefined | {
-                link?: undefined | {
-                    href: string;
-                    rel?: string | undefined;
-                    type?: string | undefined;
-                    hreflang?: string | undefined;
-                    title?: string | undefined;
-                    length?: number | undefined;
-                    etag?: string | undefined;
-                    _text?: string | undefined;
-                }[];
+              }[];
+          abap_object?:
+            | undefined
+            | {
+                link?:
+                  | undefined
+                  | {
+                      href: string;
+                      rel?: string | undefined;
+                      type?: string | undefined;
+                      hreflang?: string | undefined;
+                      title?: string | undefined;
+                      length?: number | undefined;
+                      etag?: string | undefined;
+                      _text?: string | undefined;
+                    }[];
                 pgmid?: string | undefined;
                 type?: string | undefined;
                 name?: string | undefined;
@@ -74,69 +96,83 @@ export type TransportmanagmentSingleSchema = {
                 position?: string | undefined;
                 img_activity?: string | undefined;
                 obj_func?: string | undefined;
-            }[];
-            all_objects?: undefined | {
-                abap_object?: undefined | {
-                    link?: undefined | {
-                        href: string;
-                        rel?: string | undefined;
-                        type?: string | undefined;
-                        hreflang?: string | undefined;
-                        title?: string | undefined;
-                        length?: number | undefined;
-                        etag?: string | undefined;
-                        _text?: string | undefined;
+              }[];
+          all_objects?:
+            | undefined
+            | {
+                abap_object?:
+                  | undefined
+                  | {
+                      link?:
+                        | undefined
+                        | {
+                            href: string;
+                            rel?: string | undefined;
+                            type?: string | undefined;
+                            hreflang?: string | undefined;
+                            title?: string | undefined;
+                            length?: number | undefined;
+                            etag?: string | undefined;
+                            _text?: string | undefined;
+                          }[];
+                      pgmid?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      wbtype?: string | undefined;
+                      uri?: string | undefined;
+                      dummy_uri?: string | undefined;
+                      obj_info?: string | undefined;
+                      obj_desc?: string | undefined;
+                      lock_status?: string | undefined;
+                      position?: string | undefined;
+                      img_activity?: string | undefined;
+                      obj_func?: string | undefined;
                     }[];
-                    pgmid?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    wbtype?: string | undefined;
-                    uri?: string | undefined;
-                    dummy_uri?: string | undefined;
-                    obj_info?: string | undefined;
-                    obj_desc?: string | undefined;
-                    lock_status?: string | undefined;
-                    position?: string | undefined;
-                    img_activity?: string | undefined;
-                    obj_func?: string | undefined;
-                }[];
-            };
-            task?: undefined | {
+              };
+          task?:
+            | undefined
+            | {
                 long_desc?: string | undefined;
-                link?: undefined | {
-                    href: string;
-                    rel?: string | undefined;
-                    type?: string | undefined;
-                    hreflang?: string | undefined;
-                    title?: string | undefined;
-                    length?: number | undefined;
-                    etag?: string | undefined;
-                    _text?: string | undefined;
-                }[];
-                abap_object?: undefined | {
-                    link?: undefined | {
-                        href: string;
-                        rel?: string | undefined;
-                        type?: string | undefined;
-                        hreflang?: string | undefined;
-                        title?: string | undefined;
-                        length?: number | undefined;
-                        etag?: string | undefined;
-                        _text?: string | undefined;
+                link?:
+                  | undefined
+                  | {
+                      href: string;
+                      rel?: string | undefined;
+                      type?: string | undefined;
+                      hreflang?: string | undefined;
+                      title?: string | undefined;
+                      length?: number | undefined;
+                      etag?: string | undefined;
+                      _text?: string | undefined;
+                    }[];
+                abap_object?:
+                  | undefined
+                  | {
+                      link?:
+                        | undefined
+                        | {
+                            href: string;
+                            rel?: string | undefined;
+                            type?: string | undefined;
+                            hreflang?: string | undefined;
+                            title?: string | undefined;
+                            length?: number | undefined;
+                            etag?: string | undefined;
+                            _text?: string | undefined;
+                          }[];
+                      pgmid?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      wbtype?: string | undefined;
+                      uri?: string | undefined;
+                      dummy_uri?: string | undefined;
+                      obj_info?: string | undefined;
+                      obj_desc?: string | undefined;
+                      lock_status?: string | undefined;
+                      position?: string | undefined;
+                      img_activity?: string | undefined;
+                      obj_func?: string | undefined;
                     }[];
-                    pgmid?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    wbtype?: string | undefined;
-                    uri?: string | undefined;
-                    dummy_uri?: string | undefined;
-                    obj_info?: string | undefined;
-                    obj_desc?: string | undefined;
-                    lock_status?: string | undefined;
-                    position?: string | undefined;
-                    img_activity?: string | undefined;
-                    obj_func?: string | undefined;
-                }[];
                 number?: string | undefined;
                 owner?: string | undefined;
                 desc?: string | undefined;
@@ -152,46 +188,60 @@ export type TransportmanagmentSingleSchema = {
                 cts_project_desc?: string | undefined;
                 lastchanged_timestamp?: string | undefined;
                 docu?: string | undefined;
-            }[];
-            review?: undefined | {
+              }[];
+          review?:
+            | undefined
+            | {
                 repository_id?: string | undefined;
                 repository_url?: string | undefined;
                 repository_branch?: string | undefined;
                 pull_request_url?: string | undefined;
-            };
-            dynamic_attributes?: undefined | {
-                dynamic_attribute?: undefined | {
-                    properties?: undefined | {
-                        property?: undefined | {
-                            key?: string | undefined;
-                            value?: string | undefined;
-                        }[];
-                    };
-                    attribute?: string | undefined;
-                    value?: string | undefined;
-                    description?: string | undefined;
-                    domain_name?: string | undefined;
-                }[];
-            };
-            number?: string | undefined;
-            owner?: string | undefined;
-            desc?: string | undefined;
-            status?: string | undefined;
-            uri?: string | undefined;
-            type?: string | undefined;
-            status_text?: string | undefined;
-            target?: string | undefined;
-            target_desc?: string | undefined;
-            source_client?: string | undefined;
-            parent?: string | undefined;
-            cts_project?: string | undefined;
-            cts_project_desc?: string | undefined;
-            lastchanged_timestamp?: string | undefined;
-            docu?: string | undefined;
+              };
+          dynamic_attributes?:
+            | undefined
+            | {
+                dynamic_attribute?:
+                  | undefined
+                  | {
+                      properties?:
+                        | undefined
+                        | {
+                            property?:
+                              | undefined
+                              | {
+                                  key?: string | undefined;
+                                  value?: string | undefined;
+                                }[];
+                          };
+                      attribute?: string | undefined;
+                      value?: string | undefined;
+                      description?: string | undefined;
+                      domain_name?: string | undefined;
+                    }[];
+              };
+          number?: string | undefined;
+          owner?: string | undefined;
+          desc?: string | undefined;
+          status?: string | undefined;
+          uri?: string | undefined;
+          type?: string | undefined;
+          status_text?: string | undefined;
+          target?: string | undefined;
+          target_desc?: string | undefined;
+          source_client?: string | undefined;
+          parent?: string | undefined;
+          cts_project?: string | undefined;
+          cts_project_desc?: string | undefined;
+          lastchanged_timestamp?: string | undefined;
+          docu?: string | undefined;
         };
-        task?: undefined | {
-            long_desc?: string | undefined;
-            link?: undefined | {
+    task?:
+      | undefined
+      | {
+          long_desc?: string | undefined;
+          link?:
+            | undefined
+            | {
                 href: string;
                 rel?: string | undefined;
                 type?: string | undefined;
@@ -200,18 +250,22 @@ export type TransportmanagmentSingleSchema = {
                 length?: number | undefined;
                 etag?: string | undefined;
                 _text?: string | undefined;
-            }[];
-            abap_object?: undefined | {
-                link?: undefined | {
-                    href: string;
-                    rel?: string | undefined;
-                    type?: string | undefined;
-                    hreflang?: string | undefined;
-                    title?: string | undefined;
-                    length?: number | undefined;
-                    etag?: string | undefined;
-                    _text?: string | undefined;
-                }[];
+              }[];
+          abap_object?:
+            | undefined
+            | {
+                link?:
+                  | undefined
+                  | {
+                      href: string;
+                      rel?: string | undefined;
+                      type?: string | undefined;
+                      hreflang?: string | undefined;
+                      title?: string | undefined;
+                      length?: number | undefined;
+                      etag?: string | undefined;
+                      _text?: string | undefined;
+                    }[];
                 pgmid?: string | undefined;
                 type?: string | undefined;
                 name?: string | undefined;
@@ -224,33 +278,41 @@ export type TransportmanagmentSingleSchema = {
                 position?: string | undefined;
                 img_activity?: string | undefined;
                 obj_func?: string | undefined;
-            }[];
-            number?: string | undefined;
-            owner?: string | undefined;
-            desc?: string | undefined;
-            status?: string | undefined;
-            uri?: string | undefined;
-            type?: string | undefined;
-            status_text?: string | undefined;
-            target?: string | undefined;
-            target_desc?: string | undefined;
-            source_client?: string | undefined;
-            parent?: string | undefined;
-            cts_project?: string | undefined;
-            cts_project_desc?: string | undefined;
-            lastchanged_timestamp?: string | undefined;
-            docu?: string | undefined;
+              }[];
+          number?: string | undefined;
+          owner?: string | undefined;
+          desc?: string | undefined;
+          status?: string | undefined;
+          uri?: string | undefined;
+          type?: string | undefined;
+          status_text?: string | undefined;
+          target?: string | undefined;
+          target_desc?: string | undefined;
+          source_client?: string | undefined;
+          parent?: string | undefined;
+          cts_project?: string | undefined;
+          cts_project_desc?: string | undefined;
+          lastchanged_timestamp?: string | undefined;
+          docu?: string | undefined;
         }[];
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        object_type?: string | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    object_type?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/abapFunctionGroup.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/abapFunctionGroup.types.ts
index 370c893b4..3654cead1 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/abapFunctionGroup.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/abapFunctionGroup.types.ts
@@ -71,10 +71,7 @@ export type AbapFunctionGroupSchema = {
     abapLanguageVersion?: string;
     sourceUri?: string;
     sourceObjectStatus?:
-      | 'SAPStandardProduction'
-      | 'customerProduction'
-      | 'system'
-      | 'test';
+      'SAPStandardProduction' | 'customerProduction' | 'system' | 'test';
     fixPointArithmetic?: boolean;
     activeUnicodeCheck?: boolean;
   };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/abapProgram.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/abapProgram.types.ts
index 455a627d0..fa16986e8 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/abapProgram.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/abapProgram.types.ts
@@ -71,10 +71,7 @@ export type AbapProgramSchema = {
     abapLanguageVersion?: string;
     sourceUri?: string;
     sourceObjectStatus?:
-      | 'SAPStandardProduction'
-      | 'customerProduction'
-      | 'system'
-      | 'test';
+      'SAPStandardProduction' | 'customerProduction' | 'system' | 'test';
     fixPointArithmetic?: boolean;
     activeUnicodeCheck?: boolean;
     programType?: string;
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/abapsource.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/abapsource.types.ts
index 4b1d7c043..ce25100d8 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/abapsource.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/abapsource.types.ts
@@ -5,13 +5,60 @@
  * Mode: Flattened
  */
 
-export type AbapsourceSchema = {
-    syntaxConfigurations: {
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
-                version?: string | undefined;
-                description?: string | undefined;
-                link?: undefined | {
+export type AbapsourceSchema =
+  | {
+      syntaxConfigurations: {
+        syntaxConfiguration?:
+          | undefined
+          | {
+              language?:
+                | undefined
+                | {
+                    version?: string | undefined;
+                    description?: string | undefined;
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                  };
+              objectUsage?:
+                | undefined
+                | {
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                    restricted?: boolean | undefined;
+                  };
+            }[];
+      };
+    }
+  | {
+      syntaxConfiguration: {
+        language?:
+          | undefined
+          | {
+              version?: string | undefined;
+              description?: string | undefined;
+              link?:
+                | undefined
+                | {
                     href: string;
                     rel?: string | undefined;
                     type?: string | undefined;
@@ -20,10 +67,14 @@ export type AbapsourceSchema = {
                     length?: number | undefined;
                     etag?: string | undefined;
                     _text?: string | undefined;
-                }[];
+                  }[];
             };
-            objectUsage?: undefined | {
-                link?: undefined | {
+        objectUsage?:
+          | undefined
+          | {
+              link?:
+                | undefined
+                | {
                     href: string;
                     rel?: string | undefined;
                     type?: string | undefined;
@@ -32,39 +83,8 @@ export type AbapsourceSchema = {
                     length?: number | undefined;
                     etag?: string | undefined;
                     _text?: string | undefined;
-                }[];
-                restricted?: boolean | undefined;
+                  }[];
+              restricted?: boolean | undefined;
             };
-        }[];
-    };
-} | {
-    syntaxConfiguration: {
-        language?: undefined | {
-            version?: string | undefined;
-            description?: string | undefined;
-            link?: undefined | {
-                href: string;
-                rel?: string | undefined;
-                type?: string | undefined;
-                hreflang?: string | undefined;
-                title?: string | undefined;
-                length?: number | undefined;
-                etag?: string | undefined;
-                _text?: string | undefined;
-            }[];
-        };
-        objectUsage?: undefined | {
-            link?: undefined | {
-                href: string;
-                rel?: string | undefined;
-                type?: string | undefined;
-                hreflang?: string | undefined;
-                title?: string | undefined;
-                length?: number | undefined;
-                etag?: string | undefined;
-                _text?: string | undefined;
-            }[];
-            restricted?: boolean | undefined;
-        };
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/adtcore.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/adtcore.types.ts
index 0f2bfb072..ec732c754 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/adtcore.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/adtcore.types.ts
@@ -5,50 +5,77 @@
  * Mode: Flattened
  */
 
-export type AdtcoreSchema = {
-    mainObject: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
-        }[];
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
-                $value?: string | undefined;
-                key?: string | undefined;
+export type AdtcoreSchema =
+  | {
+      mainObject: {
+        containerRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
+        link?:
+          | undefined
+          | {
+              href: string;
+              rel?: string | undefined;
+              type?: string | undefined;
+              hreflang?: string | undefined;
+              title?: string | undefined;
+              length?: number | undefined;
+              etag?: string | undefined;
+              _text?: string | undefined;
             }[];
-            name?: string | undefined;
-        };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
+        adtTemplate?:
+          | undefined
+          | {
+              adtProperty?:
+                | undefined
+                | {
+                    $value?: string | undefined;
+                    key?: string | undefined;
+                  }[];
+              name?: string | undefined;
+            };
+        packageRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
         name: string;
         type: string;
         changedBy?: string | undefined;
         changedAt?: string | undefined;
         createdAt?: string | undefined;
         createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
+        version?:
+          | undefined
+          | ''
+          | 'active'
+          | 'inactive'
+          | 'workingArea'
+          | 'new'
+          | 'partlyActive'
+          | 'activeWithInactiveVersion';
         description?: string | undefined;
         descriptionTextLimit?: number | undefined;
         language?: string | undefined;
@@ -56,34 +83,45 @@ export type AdtcoreSchema = {
         masterLanguage?: string | undefined;
         responsible?: string | undefined;
         abapLanguageVersion?: string | undefined;
-    };
-} | {
-    objectReferences: {
+      };
+    }
+  | {
+      objectReferences: {
         objectReference: {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         }[];
         name?: string | undefined;
-    };
-} | {
-    objectReference: {
-        extension?: undefined | unknown;
+      };
+    }
+  | {
+      objectReference: {
+        extension?:
+          | undefined
+          | {
+              [key: string]: unknown;
+            };
         uri?: string | undefined;
         parentUri?: string | undefined;
         type?: string | undefined;
         name?: string | undefined;
         packageName?: string | undefined;
         description?: string | undefined;
-    };
-} | {
-    content: {
+      };
+    }
+  | {
+      content: {
         $value?: string | undefined;
         type?: string | undefined;
         encoding?: string | undefined;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/atc.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/atc.types.ts
index 4fdb880b4..300e628d2 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/atc.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/atc.types.ts
@@ -6,37 +6,47 @@
  */
 
 export type AtcSchema = {
-    customizing: {
-        properties: {
-            property?: undefined | {
-                name?: string | undefined;
-                value?: string | undefined;
+  customizing: {
+    properties: {
+      property?:
+        | undefined
+        | {
+            name?: string | undefined;
+            value?: string | undefined;
+          }[];
+    };
+    exemption: {
+      reasons: {
+        reason?:
+          | undefined
+          | {
+              id?: string | undefined;
+              justificationMandatory?: boolean | undefined;
+              title?: string | undefined;
             }[];
-        };
-        exemption: {
-            reasons: {
-                reason?: undefined | {
-                    id?: string | undefined;
-                    justificationMandatory?: boolean | undefined;
-                    title?: string | undefined;
-                }[];
-            };
-            validities: {
-                validity?: undefined | {
-                    id?: string | undefined;
-                    value?: string | undefined;
-                }[];
-            };
-        };
-        scaAttributes?: undefined | {
-            scaAttribute?: undefined | {
+      };
+      validities: {
+        validity?:
+          | undefined
+          | {
+              id?: string | undefined;
+              value?: string | undefined;
+            }[];
+      };
+    };
+    scaAttributes?:
+      | undefined
+      | {
+          scaAttribute?:
+            | undefined
+            | {
                 attributeName?: string | undefined;
                 refAttributeName?: string | undefined;
                 label?: boolean | undefined;
                 labelS?: string | undefined;
                 labelM?: string | undefined;
                 labelL?: string | undefined;
-            }[];
+              }[];
         };
-    };
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/atcexemption.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/atcexemption.types.ts
index 724bf6ae3..3abe968f6 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/atcexemption.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/atcexemption.types.ts
@@ -5,8 +5,9 @@
  * Mode: Flattened
  */
 
-export type AtcexemptionSchema = {
-    exemptionProposal: {
+export type AtcexemptionSchema =
+  | {
+      exemptionProposal: {
         finding?: string | undefined;
         package: string;
         subObject?: string | undefined;
@@ -14,31 +15,33 @@ export type AtcexemptionSchema = {
         subObjectTypeDescr: string;
         objectTypeDescr: string;
         restriction: {
-            thisFinding: {
-                $value?: boolean | undefined;
-                enabled: boolean;
+          thisFinding: {
+            $value?: boolean | undefined;
+            enabled: boolean;
+          };
+          rangeOfFindings: {
+            restrictByObject: {
+              $value?: string | undefined;
+              subobject?: boolean | undefined;
+              object?: boolean | undefined;
+              package?: boolean | undefined;
             };
-            rangeOfFindings: {
-                restrictByObject: {
-                    $value?: string | undefined;
-                    subobject?: boolean | undefined;
-                    object?: boolean | undefined;
-                    package?: boolean | undefined;
-                };
-                restrictByCheck: {
-                    $value?: string | undefined;
-                    message?: boolean | undefined;
-                    check?: boolean | undefined;
-                };
-                restrictByValidity?: undefined | {
-                    $value?: string | undefined;
-                    unrestricted?: boolean | undefined;
-                    date?: boolean | undefined;
-                    component_release?: boolean | undefined;
-                    support_package?: boolean | undefined;
-                };
-                enabled: boolean;
+            restrictByCheck: {
+              $value?: string | undefined;
+              message?: boolean | undefined;
+              check?: boolean | undefined;
             };
+            restrictByValidity?:
+              | undefined
+              | {
+                  $value?: string | undefined;
+                  unrestricted?: boolean | undefined;
+                  date?: boolean | undefined;
+                  component_release?: boolean | undefined;
+                  support_package?: boolean | undefined;
+                };
+            enabled: boolean;
+          };
         };
         approver: string;
         apprIsArea?: string | undefined;
@@ -52,90 +55,110 @@ export type AtcexemptionSchema = {
         checkClass: string;
         validUntil: string;
         supportPackage?: string | undefined;
-        reasons?: undefined | {
-            reason?: undefined | {
-                id?: string | undefined;
-                justificationMandatory?: boolean | undefined;
-                title?: string | undefined;
-            }[];
-        };
-        validities?: undefined | {
-            validity?: undefined | {
-                id?: string | undefined;
-                value?: string | undefined;
-            }[];
-        };
-    };
-} | {
-    exemptionApply: {
-        exemptionProposal: {
-            finding?: string | undefined;
-            package: string;
-            subObject?: string | undefined;
-            subObjectType?: string | undefined;
-            subObjectTypeDescr: string;
-            objectTypeDescr: string;
-            restriction: {
-                thisFinding: {
-                    $value?: boolean | undefined;
-                    enabled: boolean;
-                };
-                rangeOfFindings: {
-                    restrictByObject: {
-                        $value?: string | undefined;
-                        subobject?: boolean | undefined;
-                        object?: boolean | undefined;
-                        package?: boolean | undefined;
-                    };
-                    restrictByCheck: {
-                        $value?: string | undefined;
-                        message?: boolean | undefined;
-                        check?: boolean | undefined;
-                    };
-                    restrictByValidity?: undefined | {
-                        $value?: string | undefined;
-                        unrestricted?: boolean | undefined;
-                        date?: boolean | undefined;
-                        component_release?: boolean | undefined;
-                        support_package?: boolean | undefined;
-                    };
-                    enabled: boolean;
-                };
-            };
-            approver: string;
-            apprIsArea?: string | undefined;
-            reason: string;
-            validity: string;
-            release: string;
-            softwareComponent: string;
-            softwareComponentDescription: string;
-            justification: string;
-            notify: string;
-            checkClass: string;
-            validUntil: string;
-            supportPackage?: string | undefined;
-            reasons?: undefined | {
-                reason?: undefined | {
+        reasons?:
+          | undefined
+          | {
+              reason?:
+                | undefined
+                | {
                     id?: string | undefined;
                     justificationMandatory?: boolean | undefined;
                     title?: string | undefined;
-                }[];
+                  }[];
             };
-            validities?: undefined | {
-                validity?: undefined | {
+        validities?:
+          | undefined
+          | {
+              validity?:
+                | undefined
+                | {
                     id?: string | undefined;
                     value?: string | undefined;
-                }[];
+                  }[];
             };
+      };
+    }
+  | {
+      exemptionApply: {
+        exemptionProposal: {
+          finding?: string | undefined;
+          package: string;
+          subObject?: string | undefined;
+          subObjectType?: string | undefined;
+          subObjectTypeDescr: string;
+          objectTypeDescr: string;
+          restriction: {
+            thisFinding: {
+              $value?: boolean | undefined;
+              enabled: boolean;
+            };
+            rangeOfFindings: {
+              restrictByObject: {
+                $value?: string | undefined;
+                subobject?: boolean | undefined;
+                object?: boolean | undefined;
+                package?: boolean | undefined;
+              };
+              restrictByCheck: {
+                $value?: string | undefined;
+                message?: boolean | undefined;
+                check?: boolean | undefined;
+              };
+              restrictByValidity?:
+                | undefined
+                | {
+                    $value?: string | undefined;
+                    unrestricted?: boolean | undefined;
+                    date?: boolean | undefined;
+                    component_release?: boolean | undefined;
+                    support_package?: boolean | undefined;
+                  };
+              enabled: boolean;
+            };
+          };
+          approver: string;
+          apprIsArea?: string | undefined;
+          reason: string;
+          validity: string;
+          release: string;
+          softwareComponent: string;
+          softwareComponentDescription: string;
+          justification: string;
+          notify: string;
+          checkClass: string;
+          validUntil: string;
+          supportPackage?: string | undefined;
+          reasons?:
+            | undefined
+            | {
+                reason?:
+                  | undefined
+                  | {
+                      id?: string | undefined;
+                      justificationMandatory?: boolean | undefined;
+                      title?: string | undefined;
+                    }[];
+              };
+          validities?:
+            | undefined
+            | {
+                validity?:
+                  | undefined
+                  | {
+                      id?: string | undefined;
+                      value?: string | undefined;
+                    }[];
+              };
         };
         status: {
-            message: string;
-            type: string;
+          message: string;
+          type: string;
         };
-    };
-} | {
-    status: {
+      };
+    }
+  | {
+      status: {
         message: string;
         type: string;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/atcfinding.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/atcfinding.types.ts
index 84b6a9206..389356506 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/atcfinding.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/atcfinding.types.ts
@@ -5,32 +5,43 @@
  * Mode: Flattened
  */
 
-export type AtcfindingSchema = {
-    finding: {
-        extension?: undefined | unknown;
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
-        }[];
-        quickfixes: {
-            manual?: boolean | undefined;
-            automatic?: boolean | undefined;
-            pseudo?: boolean | undefined;
-            ai_enabled?: boolean | undefined;
-            aiBasedQF?: boolean | undefined;
-        };
-        tags?: undefined | {
-            tag?: undefined | {
-                name?: string | undefined;
-                value?: string | undefined;
+export type AtcfindingSchema =
+  | {
+      finding: {
+        extension?:
+          | undefined
+          | {
+              [key: string]: unknown;
+            };
+        link?:
+          | undefined
+          | {
+              href: string;
+              rel?: string | undefined;
+              type?: string | undefined;
+              hreflang?: string | undefined;
+              title?: string | undefined;
+              length?: number | undefined;
+              etag?: string | undefined;
+              _text?: string | undefined;
             }[];
+        quickfixes: {
+          manual?: boolean | undefined;
+          automatic?: boolean | undefined;
+          pseudo?: boolean | undefined;
+          ai_enabled?: boolean | undefined;
+          aiBasedQF?: boolean | undefined;
         };
+        tags?:
+          | undefined
+          | {
+              tag?:
+                | undefined
+                | {
+                    name?: string | undefined;
+                    value?: string | undefined;
+                  }[];
+            };
         uri?: string | undefined;
         parentUri?: string | undefined;
         type?: string | undefined;
@@ -54,47 +65,68 @@ export type AtcfindingSchema = {
         checksum?: number | undefined;
         remarkText?: string | undefined;
         remarkLink?: string | undefined;
+      };
+    }
+  | {
+      findingReferences: {
+        findingReference?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            }[];
+      };
+    }
+  | {
+      items: {
+        item?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+              processor?: string | undefined;
+              status?: number | undefined;
+              remarkText?: string | undefined;
+              remarkLink?: string | undefined;
+            }[];
+      };
+    }
+  | {
+      remarks: {
+        remark?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+              remarkText?: string | undefined;
+              remarkLink?: string | undefined;
+            }[];
+      };
     };
-} | {
-    findingReferences: {
-        findingReference?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        }[];
-    };
-} | {
-    items: {
-        item?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-            processor?: string | undefined;
-            status?: number | undefined;
-            remarkText?: string | undefined;
-            remarkLink?: string | undefined;
-        }[];
-    };
-} | {
-    remarks: {
-        remark?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-            remarkText?: string | undefined;
-            remarkLink?: string | undefined;
-        }[];
-    };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/atcinfo.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/atcinfo.types.ts
index aee7130c3..e9ea9f222 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/atcinfo.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/atcinfo.types.ts
@@ -6,8 +6,8 @@
  */
 
 export type AtcinfoSchema = {
-    info: {
-        type: string;
-        description: string;
-    };
+  info: {
+    type: string;
+    description: string;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/atcobject.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/atcobject.types.ts
index e5e95e95e..3581eebd0 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/atcobject.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/atcobject.types.ts
@@ -6,56 +6,70 @@
  */
 
 export type AtcobjectSchema = {
-    object: {
-        extension?: undefined | unknown;
-        findings: {
-            finding?: undefined | {
-                extension?: undefined | unknown;
-                quickfixes: {
-                    manual?: boolean | undefined;
-                    automatic?: boolean | undefined;
-                    pseudo?: boolean | undefined;
-                    ai_enabled?: boolean | undefined;
-                    aiBasedQF?: boolean | undefined;
+  object: {
+    extension?:
+      | undefined
+      | {
+          [key: string]: unknown;
+        };
+    findings: {
+      finding?:
+        | undefined
+        | {
+            extension?:
+              | undefined
+              | {
+                  [key: string]: unknown;
                 };
-                tags?: undefined | {
-                    tag?: undefined | {
+            quickfixes: {
+              manual?: boolean | undefined;
+              automatic?: boolean | undefined;
+              pseudo?: boolean | undefined;
+              ai_enabled?: boolean | undefined;
+              aiBasedQF?: boolean | undefined;
+            };
+            tags?:
+              | undefined
+              | {
+                  tag?:
+                    | undefined
+                    | {
                         name?: string | undefined;
                         value?: string | undefined;
-                    }[];
+                      }[];
                 };
-                uri?: string | undefined;
-                parentUri?: string | undefined;
-                type?: string | undefined;
-                name?: string | undefined;
-                packageName?: string | undefined;
-                description?: string | undefined;
-                location?: string | undefined;
-                effectOnTransports?: string | undefined;
-                priority?: string | undefined;
-                checkTitle?: string | undefined;
-                checkId?: string | undefined;
-                messageTitle?: string | undefined;
-                messageId?: string | undefined;
-                exemptionKind?: string | undefined;
-                exemptionApproval?: string | undefined;
-                noExemption?: string | undefined;
-                quickfixInfo?: string | undefined;
-                contactPerson?: string | undefined;
-                lastChangedBy?: string | undefined;
-                processor?: string | undefined;
-                checksum?: number | undefined;
-                remarkText?: string | undefined;
-                remarkLink?: string | undefined;
-            }[];
-        };
-        uri?: string | undefined;
-        parentUri?: string | undefined;
-        type?: string | undefined;
-        name?: string | undefined;
-        packageName?: string | undefined;
-        description?: string | undefined;
-        author?: string | undefined;
-        objectTypeId?: string | undefined;
+            uri?: string | undefined;
+            parentUri?: string | undefined;
+            type?: string | undefined;
+            name?: string | undefined;
+            packageName?: string | undefined;
+            description?: string | undefined;
+            location?: string | undefined;
+            effectOnTransports?: string | undefined;
+            priority?: string | undefined;
+            checkTitle?: string | undefined;
+            checkId?: string | undefined;
+            messageTitle?: string | undefined;
+            messageId?: string | undefined;
+            exemptionKind?: string | undefined;
+            exemptionApproval?: string | undefined;
+            noExemption?: string | undefined;
+            quickfixInfo?: string | undefined;
+            contactPerson?: string | undefined;
+            lastChangedBy?: string | undefined;
+            processor?: string | undefined;
+            checksum?: number | undefined;
+            remarkText?: string | undefined;
+            remarkLink?: string | undefined;
+          }[];
     };
+    uri?: string | undefined;
+    parentUri?: string | undefined;
+    type?: string | undefined;
+    name?: string | undefined;
+    packageName?: string | undefined;
+    description?: string | undefined;
+    author?: string | undefined;
+    objectTypeId?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/atcresult.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/atcresult.types.ts
index d373bfa10..b332f82a5 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/atcresult.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/atcresult.types.ts
@@ -5,127 +5,163 @@
  * Mode: Flattened
  */
 
-export type AtcresultSchema = {
-    resultList: {
-        result?: undefined | {
-            displayId: string;
-            title: string;
-            checkVariant: string;
-            runSeries: string;
-            createdAt: string;
-            aggregates: {
+export type AtcresultSchema =
+  | {
+      resultList: {
+        result?:
+          | undefined
+          | {
+              displayId: string;
+              title: string;
+              checkVariant: string;
+              runSeries: string;
+              createdAt: string;
+              aggregates: {
                 numPrio1: number;
                 numPrio2: number;
                 numPrio3: number;
                 numPrio4: number;
                 numFailure: number;
-            };
-            objects: {
-                object?: undefined | {
-                    extension?: undefined | unknown;
-                    findings: {
-                        finding?: undefined | {
-                            extension?: undefined | unknown;
-                            quickfixes: {
+              };
+              objects: {
+                object?:
+                  | undefined
+                  | {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      findings: {
+                        finding?:
+                          | undefined
+                          | {
+                              extension?:
+                                | undefined
+                                | {
+                                    [key: string]: unknown;
+                                  };
+                              quickfixes: {
                                 manual?: boolean | undefined;
                                 automatic?: boolean | undefined;
                                 pseudo?: boolean | undefined;
                                 ai_enabled?: boolean | undefined;
                                 aiBasedQF?: boolean | undefined;
-                            };
-                            tags?: undefined | {
-                                tag?: undefined | {
-                                    name?: string | undefined;
-                                    value?: string | undefined;
-                                }[];
-                            };
-                            uri?: string | undefined;
-                            parentUri?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            packageName?: string | undefined;
-                            description?: string | undefined;
-                            location?: string | undefined;
-                            effectOnTransports?: string | undefined;
-                            priority?: string | undefined;
-                            checkTitle?: string | undefined;
-                            checkId?: string | undefined;
-                            messageTitle?: string | undefined;
-                            messageId?: string | undefined;
-                            exemptionKind?: string | undefined;
-                            exemptionApproval?: string | undefined;
-                            noExemption?: string | undefined;
-                            quickfixInfo?: string | undefined;
-                            contactPerson?: string | undefined;
-                            lastChangedBy?: string | undefined;
-                            processor?: string | undefined;
-                            checksum?: number | undefined;
-                            remarkText?: string | undefined;
-                            remarkLink?: string | undefined;
-                        }[];
-                    };
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                    author?: string | undefined;
-                    objectTypeId?: string | undefined;
-                }[];
-            };
-            descriptionTags: {
-                tagWithDescription?: undefined | {
-                    name: string;
-                    descriptions: {
-                        description?: undefined | {
-                            value?: string | undefined;
-                            description?: string | undefined;
+                              };
+                              tags?:
+                                | undefined
+                                | {
+                                    tag?:
+                                      | undefined
+                                      | {
+                                          name?: string | undefined;
+                                          value?: string | undefined;
+                                        }[];
+                                  };
+                              uri?: string | undefined;
+                              parentUri?: string | undefined;
+                              type?: string | undefined;
+                              name?: string | undefined;
+                              packageName?: string | undefined;
+                              description?: string | undefined;
+                              location?: string | undefined;
+                              effectOnTransports?: string | undefined;
+                              priority?: string | undefined;
+                              checkTitle?: string | undefined;
+                              checkId?: string | undefined;
+                              messageTitle?: string | undefined;
+                              messageId?: string | undefined;
+                              exemptionKind?: string | undefined;
+                              exemptionApproval?: string | undefined;
+                              noExemption?: string | undefined;
+                              quickfixInfo?: string | undefined;
+                              contactPerson?: string | undefined;
+                              lastChangedBy?: string | undefined;
+                              processor?: string | undefined;
+                              checksum?: number | undefined;
+                              remarkText?: string | undefined;
+                              remarkLink?: string | undefined;
+                            }[];
+                      };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                      author?: string | undefined;
+                      objectTypeId?: string | undefined;
+                    }[];
+              };
+              descriptionTags: {
+                tagWithDescription?:
+                  | undefined
+                  | {
+                      name: string;
+                      descriptions: {
+                        description?:
+                          | undefined
+                          | {
+                              value?: string | undefined;
+                              description?: string | undefined;
+                            }[];
+                      };
+                    }[];
+              };
+              scaAttributes?:
+                | undefined
+                | {
+                    scaAttribute?:
+                      | undefined
+                      | {
+                          attributeName?: string | undefined;
+                          refAttributeName?: string | undefined;
+                          label?: boolean | undefined;
+                          labelS?: string | undefined;
+                          labelM?: string | undefined;
+                          labelL?: string | undefined;
                         }[];
-                    };
-                }[];
+                  };
+              infos: {
+                info?:
+                  | undefined
+                  | {
+                      type: string;
+                      description: string;
+                    }[];
+              };
+            }[];
+      };
+    }
+  | {
+      queryChoice: {
+        activeResultQuery?:
+          | undefined
+          | {
+              includeAggregates: boolean;
+              includeFindings: boolean;
+              contactPerson: string;
+              queryEnabled: boolean;
             };
-            scaAttributes?: undefined | {
-                scaAttribute?: undefined | {
-                    attributeName?: string | undefined;
-                    refAttributeName?: string | undefined;
-                    label?: boolean | undefined;
-                    labelS?: string | undefined;
-                    labelM?: string | undefined;
-                    labelL?: string | undefined;
-                }[];
+        specificResultQuery?:
+          | undefined
+          | {
+              includeAggregates: boolean;
+              includeFindings: boolean;
+              contactPerson: string;
+              queryEnabled: boolean;
+              displayId: string;
             };
-            infos: {
-                info?: undefined | {
-                    type: string;
-                    description: string;
-                }[];
+        userResultQuery?:
+          | undefined
+          | {
+              includeAggregates: boolean;
+              includeFindings: boolean;
+              contactPerson: string;
+              queryEnabled: boolean;
+              createdBy: string;
+              ageMin: number;
+              ageMax: number;
             };
-        }[];
-    };
-} | {
-    queryChoice: {
-        activeResultQuery?: undefined | {
-            includeAggregates: boolean;
-            includeFindings: boolean;
-            contactPerson: string;
-            queryEnabled: boolean;
-        };
-        specificResultQuery?: undefined | {
-            includeAggregates: boolean;
-            includeFindings: boolean;
-            contactPerson: string;
-            queryEnabled: boolean;
-            displayId: string;
-        };
-        userResultQuery?: undefined | {
-            includeAggregates: boolean;
-            includeFindings: boolean;
-            contactPerson: string;
-            queryEnabled: boolean;
-            createdBy: string;
-            ageMin: number;
-            ageMax: number;
-        };
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/atcresultquery.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/atcresultquery.types.ts
index 174d0d69c..28a331644 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/atcresultquery.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/atcresultquery.types.ts
@@ -5,23 +5,26 @@
  * Mode: Flattened
  */
 
-export type AtcresultquerySchema = {
-    activeResultQuery: {
+export type AtcresultquerySchema =
+  | {
+      activeResultQuery: {
         includeAggregates: boolean;
         includeFindings: boolean;
         contactPerson: string;
         queryEnabled: boolean;
-    };
-} | {
-    specificResultQuery: {
+      };
+    }
+  | {
+      specificResultQuery: {
         includeAggregates: boolean;
         includeFindings: boolean;
         contactPerson: string;
         queryEnabled: boolean;
         displayId: string;
-    };
-} | {
-    userResultQuery: {
+      };
+    }
+  | {
+      userResultQuery: {
         includeAggregates: boolean;
         includeFindings: boolean;
         contactPerson: string;
@@ -29,5 +32,5 @@ export type AtcresultquerySchema = {
         createdBy: string;
         ageMin: number;
         ageMax: number;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/atctagdescription.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/atctagdescription.types.ts
index e6d9957fe..4bf2d54eb 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/atctagdescription.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/atctagdescription.types.ts
@@ -6,15 +6,19 @@
  */
 
 export type AtctagdescriptionSchema = {
-    descriptionTags: {
-        tagWithDescription?: undefined | {
-            name: string;
-            descriptions: {
-                description?: undefined | {
-                    value?: string | undefined;
-                    description?: string | undefined;
+  descriptionTags: {
+    tagWithDescription?:
+      | undefined
+      | {
+          name: string;
+          descriptions: {
+            description?:
+              | undefined
+              | {
+                  value?: string | undefined;
+                  description?: string | undefined;
                 }[];
-            };
+          };
         }[];
-    };
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/atcworklist.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/atcworklist.types.ts
index 2d273559d..c69b6ca2d 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/atcworklist.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/atcworklist.types.ts
@@ -5,34 +5,53 @@
  * Mode: Flattened
  */
 
-export type AtcworklistSchema = {
-    worklist: {
+export type AtcworklistSchema =
+  | {
+      worklist: {
         objectSets: {
-            objectSet?: undefined | {
+          objectSet?:
+            | undefined
+            | {
                 name?: string | undefined;
                 title?: string | undefined;
                 kind?: string | undefined;
-            }[];
+              }[];
         };
         objects: {
-            object?: undefined | {
-                extension?: undefined | unknown;
+          object?:
+            | undefined
+            | {
+                extension?:
+                  | undefined
+                  | {
+                      [key: string]: unknown;
+                    };
                 findings: {
-                    finding?: undefined | {
-                        extension?: undefined | unknown;
+                  finding?:
+                    | undefined
+                    | {
+                        extension?:
+                          | undefined
+                          | {
+                              [key: string]: unknown;
+                            };
                         quickfixes: {
-                            manual?: boolean | undefined;
-                            automatic?: boolean | undefined;
-                            pseudo?: boolean | undefined;
-                            ai_enabled?: boolean | undefined;
-                            aiBasedQF?: boolean | undefined;
-                        };
-                        tags?: undefined | {
-                            tag?: undefined | {
-                                name?: string | undefined;
-                                value?: string | undefined;
-                            }[];
+                          manual?: boolean | undefined;
+                          automatic?: boolean | undefined;
+                          pseudo?: boolean | undefined;
+                          ai_enabled?: boolean | undefined;
+                          aiBasedQF?: boolean | undefined;
                         };
+                        tags?:
+                          | undefined
+                          | {
+                              tag?:
+                                | undefined
+                                | {
+                                    name?: string | undefined;
+                                    value?: string | undefined;
+                                  }[];
+                            };
                         uri?: string | undefined;
                         parentUri?: string | undefined;
                         type?: string | undefined;
@@ -56,7 +75,7 @@ export type AtcworklistSchema = {
                         checksum?: number | undefined;
                         remarkText?: string | undefined;
                         remarkLink?: string | undefined;
-                    }[];
+                      }[];
                 };
                 uri?: string | undefined;
                 parentUri?: string | undefined;
@@ -66,49 +85,62 @@ export type AtcworklistSchema = {
                 description?: string | undefined;
                 author?: string | undefined;
                 objectTypeId?: string | undefined;
-            }[];
-        };
-        scaAttributes?: undefined | {
-            scaAttribute?: undefined | {
-                attributeName?: string | undefined;
-                refAttributeName?: string | undefined;
-                label?: boolean | undefined;
-                labelS?: string | undefined;
-                labelM?: string | undefined;
-                labelL?: string | undefined;
-            }[];
+              }[];
         };
+        scaAttributes?:
+          | undefined
+          | {
+              scaAttribute?:
+                | undefined
+                | {
+                    attributeName?: string | undefined;
+                    refAttributeName?: string | undefined;
+                    label?: boolean | undefined;
+                    labelS?: string | undefined;
+                    labelM?: string | undefined;
+                    labelL?: string | undefined;
+                  }[];
+            };
         descriptionTags: {
-            tagWithDescription?: undefined | {
+          tagWithDescription?:
+            | undefined
+            | {
                 name: string;
                 descriptions: {
-                    description?: undefined | {
+                  description?:
+                    | undefined
+                    | {
                         value?: string | undefined;
                         description?: string | undefined;
-                    }[];
+                      }[];
                 };
-            }[];
+              }[];
         };
         infos: {
-            info?: undefined | {
+          info?:
+            | undefined
+            | {
                 type: string;
                 description: string;
-            }[];
+              }[];
         };
         id: string;
         timestamp: string;
         usedObjectSet?: string | undefined;
         objectSetIsComplete?: boolean | undefined;
-    };
-} | {
-    worklistRun: {
+      };
+    }
+  | {
+      worklistRun: {
         worklistId: string;
         worklistTimestamp: string;
         infos: {
-            info?: undefined | {
+          info?:
+            | undefined
+            | {
                 type: string;
                 description: string;
-            }[];
+              }[];
         };
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/atom.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/atom.types.ts
index 6654b4a2f..a30d5ee21 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/atom.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/atom.types.ts
@@ -6,14 +6,14 @@
  */
 
 export type AtomSchema = {
-    link: {
-        href: string;
-        rel?: string | undefined;
-        type?: string | undefined;
-        hreflang?: string | undefined;
-        title?: string | undefined;
-        length?: number | undefined;
-        etag?: string | undefined;
-        _text?: string | undefined;
-    };
+  link: {
+    href: string;
+    rel?: string | undefined;
+    type?: string | undefined;
+    hreflang?: string | undefined;
+    title?: string | undefined;
+    length?: number | undefined;
+    etag?: string | undefined;
+    _text?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/checklist.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/checklist.types.ts
index c48e6a823..daac3af52 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/checklist.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/checklist.types.ts
@@ -6,30 +6,40 @@
  */
 
 export type ChecklistSchema = {
-    messages: {
-        msg?: undefined | {
-            shortText: {
+  messages: {
+    msg?:
+      | undefined
+      | {
+          shortText: {
+            txt: string[];
+          };
+          longText?:
+            | undefined
+            | {
                 txt: string[];
-            };
-            longText?: undefined | {
-                txt: string[];
-            };
-            t100Key?: undefined | {
+              };
+          t100Key?:
+            | undefined
+            | {
                 msgno?: number | undefined;
                 msgid?: string | undefined;
                 msgv1?: string | undefined;
                 msgv2?: string | undefined;
                 msgv3?: string | undefined;
                 msgv4?: string | undefined;
-            };
-            correctionHint?: undefined | {
+              };
+          correctionHint?:
+            | undefined
+            | {
                 number?: number | undefined;
                 kind?: string | undefined;
                 line?: number | undefined;
                 column?: number | undefined;
                 word?: string | undefined;
-            }[];
-            link?: undefined | {
+              }[];
+          link?:
+            | undefined
+            | {
                 href: string;
                 rel?: string | undefined;
                 type?: string | undefined;
@@ -38,20 +48,20 @@ export type ChecklistSchema = {
                 length?: number | undefined;
                 etag?: string | undefined;
                 _text?: string | undefined;
-            }[];
-            objDescr: string;
-            type: unknown;
-            line?: number | undefined;
-            offset?: number | undefined;
-            href?: string | undefined;
-            forceSupported?: boolean | undefined;
-            code?: string | undefined;
+              }[];
+          objDescr: string;
+          type: unknown;
+          line?: number | undefined;
+          offset?: number | undefined;
+          href?: string | undefined;
+          forceSupported?: boolean | undefined;
+          code?: string | undefined;
         }[];
-        properties: {
-            checkExecuted?: boolean | undefined;
-            activationExecuted?: boolean | undefined;
-            generationExecuted?: boolean | undefined;
-        };
-        forceSupported?: boolean | undefined;
+    properties: {
+      checkExecuted?: boolean | undefined;
+      activationExecuted?: boolean | undefined;
+      generationExecuted?: boolean | undefined;
     };
+    forceSupported?: boolean | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/checkrun.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/checkrun.types.ts
index 7846e5797..49d94323b 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/checkrun.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/checkrun.types.ts
@@ -5,74 +5,109 @@
  * Mode: Flattened
  */
 
-export type CheckrunSchema = {
-    checkObjectList: {
-        checkObject?: undefined | {
-            extension?: undefined | unknown;
-            artifacts?: undefined | {
-                artifact?: undefined | {
-                    content?: string | undefined;
-                    uri?: string | undefined;
-                    contentType?: string | undefined;
-                }[];
+export type CheckrunSchema =
+  | {
+      checkObjectList: {
+        checkObject?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              artifacts?:
+                | undefined
+                | {
+                    artifact?:
+                      | undefined
+                      | {
+                          content?: string | undefined;
+                          uri?: string | undefined;
+                          contentType?: string | undefined;
+                        }[];
+                  }[];
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+              version?:
+                | undefined
+                | ''
+                | 'active'
+                | 'inactive'
+                | 'workingArea'
+                | 'new'
+                | 'partlyActive'
+                | 'activeWithInactiveVersion';
             }[];
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-            version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        }[];
-    };
-} | {
-    checkRunReports: {
-        checkReport?: undefined | {
-            checkMessageList?: undefined | {
-                checkMessage?: undefined | {
-                    t100Key?: undefined | {
-                        msgno?: number | undefined;
-                        msgid?: string | undefined;
-                        msgv1?: string | undefined;
-                        msgv2?: string | undefined;
-                        msgv3?: string | undefined;
-                        msgv4?: string | undefined;
-                    };
-                    correctionHint?: undefined | {
-                        number?: number | undefined;
-                        kind?: string | undefined;
-                        line?: number | undefined;
-                        column?: number | undefined;
-                        word?: string | undefined;
-                    }[];
-                    link?: undefined | {
-                        href: string;
-                        rel?: string | undefined;
-                        type?: string | undefined;
-                        hreflang?: string | undefined;
-                        title?: string | undefined;
-                        length?: number | undefined;
-                        etag?: string | undefined;
-                        _text?: string | undefined;
-                    }[];
-                    uri?: string | undefined;
-                    type?: undefined | unknown;
-                    shortText?: string | undefined;
-                    category?: string | undefined;
-                    code?: string | undefined;
-                }[];
-            };
-            reporter?: string | undefined;
-            triggeringUri?: string | undefined;
-            status?: string | undefined;
-            statusText?: string | undefined;
-        }[];
-    };
-} | {
-    checkReporters: {
-        reporter?: undefined | {
-            supportedType?: undefined | string[];
-            name?: string | undefined;
-        }[];
+      };
+    }
+  | {
+      checkRunReports: {
+        checkReport?:
+          | undefined
+          | {
+              checkMessageList?:
+                | undefined
+                | {
+                    checkMessage?:
+                      | undefined
+                      | {
+                          t100Key?:
+                            | undefined
+                            | {
+                                msgno?: number | undefined;
+                                msgid?: string | undefined;
+                                msgv1?: string | undefined;
+                                msgv2?: string | undefined;
+                                msgv3?: string | undefined;
+                                msgv4?: string | undefined;
+                              };
+                          correctionHint?:
+                            | undefined
+                            | {
+                                number?: number | undefined;
+                                kind?: string | undefined;
+                                line?: number | undefined;
+                                column?: number | undefined;
+                                word?: string | undefined;
+                              }[];
+                          link?:
+                            | undefined
+                            | {
+                                href: string;
+                                rel?: string | undefined;
+                                type?: string | undefined;
+                                hreflang?: string | undefined;
+                                title?: string | undefined;
+                                length?: number | undefined;
+                                etag?: string | undefined;
+                                _text?: string | undefined;
+                              }[];
+                          uri?: string | undefined;
+                          type?: undefined | unknown;
+                          shortText?: string | undefined;
+                          category?: string | undefined;
+                          code?: string | undefined;
+                        }[];
+                  };
+              reporter?: string | undefined;
+              triggeringUri?: string | undefined;
+              status?: string | undefined;
+              statusText?: string | undefined;
+            }[];
+      };
+    }
+  | {
+      checkReporters: {
+        reporter?:
+          | undefined
+          | {
+              supportedType?: undefined | string[];
+              name?: string | undefined;
+            }[];
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/classes.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/classes.types.ts
index f408a14db..500be8383 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/classes.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/classes.types.ts
@@ -5,122 +5,201 @@
  * Mode: Flattened
  */
 
-export type ClassesSchema = {
-    abapClass: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
-                $value?: string | undefined;
-                key?: string | undefined;
-            }[];
-            name?: string | undefined;
-        };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
-        template?: undefined | {
-            property?: undefined | {
-                $value?: string | undefined;
-                key?: string | undefined;
-            }[];
-            name?: string | undefined;
-        };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
-                version?: string | undefined;
-                description?: string | undefined;
+export type ClassesSchema =
+  | {
+      abapClass: {
+        containerRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
             };
-            objectUsage?: undefined | {
-                restricted?: boolean | undefined;
+        adtTemplate?:
+          | undefined
+          | {
+              adtProperty?:
+                | undefined
+                | {
+                    $value?: string | undefined;
+                    key?: string | undefined;
+                  }[];
+              name?: string | undefined;
             };
-        };
-        interfaceRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        }[];
-        include?: undefined | {
-            containerRef?: undefined | {
-                extension?: undefined | unknown;
-                uri?: string | undefined;
-                parentUri?: string | undefined;
-                type?: string | undefined;
-                name?: string | undefined;
-                packageName?: string | undefined;
-                description?: string | undefined;
+        packageRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
             };
-            adtTemplate?: undefined | {
-                adtProperty?: undefined | {
+        template?:
+          | undefined
+          | {
+              property?:
+                | undefined
+                | {
                     $value?: string | undefined;
                     key?: string | undefined;
-                }[];
-                name?: string | undefined;
+                  }[];
+              name?: string | undefined;
+            };
+        syntaxConfiguration?:
+          | undefined
+          | {
+              language?:
+                | undefined
+                | {
+                    version?: string | undefined;
+                    description?: string | undefined;
+                  };
+              objectUsage?:
+                | undefined
+                | {
+                    restricted?: boolean | undefined;
+                  };
+            };
+        interfaceRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            }[];
+        include?:
+          | undefined
+          | {
+              containerRef?:
+                | undefined
+                | {
+                    extension?:
+                      | undefined
+                      | {
+                          [key: string]: unknown;
+                        };
+                    uri?: string | undefined;
+                    parentUri?: string | undefined;
+                    type?: string | undefined;
+                    name?: string | undefined;
+                    packageName?: string | undefined;
+                    description?: string | undefined;
+                  };
+              adtTemplate?:
+                | undefined
+                | {
+                    adtProperty?:
+                      | undefined
+                      | {
+                          $value?: string | undefined;
+                          key?: string | undefined;
+                        }[];
+                    name?: string | undefined;
+                  };
+              name: string;
+              type: string;
+              changedBy?: string | undefined;
+              changedAt?: string | undefined;
+              createdAt?: string | undefined;
+              createdBy?: string | undefined;
+              version?:
+                | undefined
+                | ''
+                | 'active'
+                | 'inactive'
+                | 'workingArea'
+                | 'new'
+                | 'partlyActive'
+                | 'activeWithInactiveVersion';
+              description?: string | undefined;
+              descriptionTextLimit?: number | undefined;
+              language?: string | undefined;
+              sourceUri?: string | undefined;
+              includeType?: undefined | unknown;
+            }[];
+        superClassRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
+        messageClassRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
+        rootEntityRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
             };
-            name: string;
-            type: string;
-            changedBy?: string | undefined;
-            changedAt?: string | undefined;
-            createdAt?: string | undefined;
-            createdBy?: string | undefined;
-            version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-            description?: string | undefined;
-            descriptionTextLimit?: number | undefined;
-            language?: string | undefined;
-            sourceUri?: string | undefined;
-            includeType?: undefined | unknown;
-        }[];
-        superClassRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
-        messageClassRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
-        rootEntityRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
         name: string;
         type: string;
         changedBy?: string | undefined;
         changedAt?: string | undefined;
         createdAt?: string | undefined;
         createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
+        version?:
+          | undefined
+          | ''
+          | 'active'
+          | 'inactive'
+          | 'workingArea'
+          | 'new'
+          | 'partlyActive'
+          | 'activeWithInactiveVersion';
         description?: string | undefined;
         descriptionTextLimit?: number | undefined;
         language?: string | undefined;
@@ -129,7 +208,12 @@ export type ClassesSchema = {
         responsible?: string | undefined;
         abapLanguageVersion?: string | undefined;
         sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
+        sourceObjectStatus?:
+          | undefined
+          | 'SAPStandardProduction'
+          | 'customerProduction'
+          | 'system'
+          | 'test';
         fixPointArithmetic?: boolean | undefined;
         activeUnicodeCheck?: boolean | undefined;
         modeled?: boolean | undefined;
@@ -137,40 +221,59 @@ export type ClassesSchema = {
         final?: boolean | undefined;
         state?: string | undefined;
         abstract?: boolean | undefined;
-        visibility?: undefined | "private" | "protected" | "package" | "public";
+        visibility?: undefined | 'private' | 'protected' | 'package' | 'public';
         sharedMemoryEnabled?: boolean | undefined;
         constructorGenerated?: boolean | undefined;
         hasTests?: boolean | undefined;
-    };
-} | {
-    abapClassInclude: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
-                $value?: string | undefined;
-                key?: string | undefined;
-            }[];
-            name?: string | undefined;
-        };
+      };
+    }
+  | {
+      abapClassInclude: {
+        containerRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
+        adtTemplate?:
+          | undefined
+          | {
+              adtProperty?:
+                | undefined
+                | {
+                    $value?: string | undefined;
+                    key?: string | undefined;
+                  }[];
+              name?: string | undefined;
+            };
         name: string;
         type: string;
         changedBy?: string | undefined;
         changedAt?: string | undefined;
         createdAt?: string | undefined;
         createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
+        version?:
+          | undefined
+          | ''
+          | 'active'
+          | 'inactive'
+          | 'workingArea'
+          | 'new'
+          | 'partlyActive'
+          | 'activeWithInactiveVersion';
         description?: string | undefined;
         descriptionTextLimit?: number | undefined;
         language?: string | undefined;
         sourceUri?: string | undefined;
         includeType?: undefined | unknown;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/configuration.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/configuration.types.ts
index a3c09efbf..297ad36e7 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/configuration.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/configuration.types.ts
@@ -6,29 +6,31 @@
  */
 
 export type ConfigurationSchema = {
-    configuration: {
-        properties: {
-            property: {
-                $value?: string | undefined;
-                key?: string | undefined;
-                isMandatory?: boolean | undefined;
-            }[];
-        };
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
-        };
-        client?: string | undefined;
-        configName?: string | undefined;
-        createdBy?: string | undefined;
-        createdAt?: string | undefined;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
+  configuration: {
+    properties: {
+      property: {
+        $value?: string | undefined;
+        key?: string | undefined;
+        isMandatory?: boolean | undefined;
+      }[];
     };
+    link?:
+      | undefined
+      | {
+          href: string;
+          rel?: string | undefined;
+          type?: string | undefined;
+          hreflang?: string | undefined;
+          title?: string | undefined;
+          length?: number | undefined;
+          etag?: string | undefined;
+          _text?: string | undefined;
+        };
+    client?: string | undefined;
+    configName?: string | undefined;
+    createdBy?: string | undefined;
+    createdAt?: string | undefined;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/configurations.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/configurations.types.ts
index 88e64eead..9d7a36ccf 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/configurations.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/configurations.types.ts
@@ -6,31 +6,33 @@
  */
 
 export type ConfigurationsSchema = {
-    configurations: {
-        configuration: {
-            properties: {
-                property: {
-                    $value?: string | undefined;
-                    key?: string | undefined;
-                    isMandatory?: boolean | undefined;
-                }[];
-            };
-            link?: undefined | {
-                href: string;
-                rel?: string | undefined;
-                type?: string | undefined;
-                hreflang?: string | undefined;
-                title?: string | undefined;
-                length?: number | undefined;
-                etag?: string | undefined;
-                _text?: string | undefined;
-            };
-            client?: string | undefined;
-            configName?: string | undefined;
-            createdBy?: string | undefined;
-            createdAt?: string | undefined;
-            changedBy?: string | undefined;
-            changedAt?: string | undefined;
+  configurations: {
+    configuration: {
+      properties: {
+        property: {
+          $value?: string | undefined;
+          key?: string | undefined;
+          isMandatory?: boolean | undefined;
         }[];
-    };
+      };
+      link?:
+        | undefined
+        | {
+            href: string;
+            rel?: string | undefined;
+            type?: string | undefined;
+            hreflang?: string | undefined;
+            title?: string | undefined;
+            length?: number | undefined;
+            etag?: string | undefined;
+            _text?: string | undefined;
+          };
+      client?: string | undefined;
+      configName?: string | undefined;
+      createdBy?: string | undefined;
+      createdAt?: string | undefined;
+      changedBy?: string | undefined;
+      changedAt?: string | undefined;
+    }[];
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/dataelements.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/dataelements.types.ts
index f8efc5ffe..dc76f37cf 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/dataelements.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/dataelements.types.ts
@@ -6,34 +6,44 @@
  */
 
 export type DataelementsSchema = {
-    dataElement: {
-        typeKind: "domain" | "predefinedAbapType" | "refToPredefinedAbapType" | "refToDictionaryType" | "refToClifType";
-        typeName?: string | undefined;
-        dataType?: string | undefined;
-        dataTypeLength?: number | undefined;
-        dataTypeLengthEnabled?: boolean | undefined;
-        dataTypeDecimals?: number | undefined;
-        dataTypeDecimalsEnabled?: boolean | undefined;
-        shortFieldLabel?: string | undefined;
-        shortFieldLength?: number | undefined;
-        shortFieldMaxLength?: number | undefined;
-        mediumFieldLabel?: string | undefined;
-        mediumFieldLength?: number | undefined;
-        mediumFieldMaxLength?: number | undefined;
-        longFieldLabel?: string | undefined;
-        longFieldLength?: number | undefined;
-        longFieldMaxLength?: number | undefined;
-        headingFieldLabel?: string | undefined;
-        headingFieldLength?: number | undefined;
-        headingFieldMaxLength?: number | undefined;
-        searchHelp?: string | undefined;
-        searchHelpParameter?: string | undefined;
-        setGetParameter?: string | undefined;
-        defaultComponentName?: string | undefined;
-        deactivateInputHistory?: boolean | undefined;
-        changeDocument?: boolean | undefined;
-        leftToRightDirection?: boolean | undefined;
-        deactivateBIDIFiltering?: boolean | undefined;
-        documentationStatus?: undefined | "required" | "notUsedInScreens" | "explainedByShortText" | "postponed";
-    };
+  dataElement: {
+    typeKind:
+      | 'domain'
+      | 'predefinedAbapType'
+      | 'refToPredefinedAbapType'
+      | 'refToDictionaryType'
+      | 'refToClifType';
+    typeName?: string | undefined;
+    dataType?: string | undefined;
+    dataTypeLength?: number | undefined;
+    dataTypeLengthEnabled?: boolean | undefined;
+    dataTypeDecimals?: number | undefined;
+    dataTypeDecimalsEnabled?: boolean | undefined;
+    shortFieldLabel?: string | undefined;
+    shortFieldLength?: number | undefined;
+    shortFieldMaxLength?: number | undefined;
+    mediumFieldLabel?: string | undefined;
+    mediumFieldLength?: number | undefined;
+    mediumFieldMaxLength?: number | undefined;
+    longFieldLabel?: string | undefined;
+    longFieldLength?: number | undefined;
+    longFieldMaxLength?: number | undefined;
+    headingFieldLabel?: string | undefined;
+    headingFieldLength?: number | undefined;
+    headingFieldMaxLength?: number | undefined;
+    searchHelp?: string | undefined;
+    searchHelpParameter?: string | undefined;
+    setGetParameter?: string | undefined;
+    defaultComponentName?: string | undefined;
+    deactivateInputHistory?: boolean | undefined;
+    changeDocument?: boolean | undefined;
+    leftToRightDirection?: boolean | undefined;
+    deactivateBIDIFiltering?: boolean | undefined;
+    documentationStatus?:
+      | undefined
+      | 'required'
+      | 'notUsedInScreens'
+      | 'explainedByShortText'
+      | 'postponed';
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/debugger.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/debugger.types.ts
index 57127784f..8acb097d6 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/debugger.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/debugger.types.ts
@@ -6,24 +6,26 @@
  */
 
 export type DebuggerSchema = {
-    memorySizes: {
-        abap?: undefined | {
-            staticVariables: number;
-            stackUsed: number;
-            stackAllocated: number;
-            dynamicMemoryObjectsUsed: number;
-            dynamicMemoryObjectsAllocated: number;
-        };
-        internal: {
-            used: number;
-            allocated: number;
-            peakUsed: number;
-        };
-        external: {
-            used: number;
-            allocated: number;
-            peakUsed: number;
-            numberOfInternalSessions: number;
+  memorySizes: {
+    abap?:
+      | undefined
+      | {
+          staticVariables: number;
+          stackUsed: number;
+          stackAllocated: number;
+          dynamicMemoryObjectsUsed: number;
+          dynamicMemoryObjectsAllocated: number;
         };
+    internal: {
+      used: number;
+      allocated: number;
+      peakUsed: number;
+    };
+    external: {
+      used: number;
+      allocated: number;
+      peakUsed: number;
+      numberOfInternalSessions: number;
     };
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/domain.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/domain.types.ts
index 3f48b4e35..5e9bfc572 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/domain.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/domain.types.ts
@@ -6,120 +6,187 @@
  */
 
 export type DomainSchema = {
-    domain: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  domain: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        content: {
-            typeInformation?: undefined | {
-                datatype: string;
-                length: number;
-                decimals: number;
-            };
-            outputInformation?: undefined | {
-                length: number;
-                style: string;
-                conversionExit?: string | undefined;
-                signExists?: boolean | undefined;
-                lowercase?: boolean | undefined;
-                ampmFormat?: boolean | undefined;
-            };
-            valueInformation: {
-                valueTableRef: {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                };
-                appendExists?: boolean | undefined;
-                fixValues: {
-                    fixValue?: undefined | {
-                        position: number;
-                        low: string;
-                        high: string;
-                        text: string;
-                        contributingAppendRef?: undefined | {
-                            extension?: undefined | unknown;
-                            uri?: string | undefined;
-                            parentUri?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            packageName?: string | undefined;
-                            description?: string | undefined;
-                        };
-                        switchRef?: undefined | {
-                            extension?: undefined | unknown;
-                            uri?: string | undefined;
-                            parentUri?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            packageName?: string | undefined;
-                            description?: string | undefined;
-                            state?: undefined | "" | "undefined" | "on" | "off" | "stand-by";
-                        };
-                    }[];
-                };
-            };
-            appendInformation?: undefined | {
-                appendedDomainRef?: undefined | {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
+    content: {
+      typeInformation?:
+        | undefined
+        | {
+            datatype: string;
+            length: number;
+            decimals: number;
+          };
+      outputInformation?:
+        | undefined
+        | {
+            length: number;
+            style: string;
+            conversionExit?: string | undefined;
+            signExists?: boolean | undefined;
+            lowercase?: boolean | undefined;
+            ampmFormat?: boolean | undefined;
+          };
+      valueInformation: {
+        valueTableRef: {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
+        };
+        appendExists?: boolean | undefined;
+        fixValues: {
+          fixValue?:
+            | undefined
+            | {
+                position: number;
+                low: string;
+                high: string;
+                text: string;
+                contributingAppendRef?:
+                  | undefined
+                  | {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                    };
+                switchRef?:
+                  | undefined
+                  | {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                      state?:
+                        | undefined
+                        | ''
+                        | 'undefined'
+                        | 'on'
+                        | 'off'
+                        | 'stand-by';
+                    };
+              }[];
+        };
+      };
+      appendInformation?:
+        | undefined
+        | {
+            appendedDomainRef?:
+              | undefined
+              | {
+                  extension?:
+                    | undefined
+                    | {
+                        [key: string]: unknown;
+                      };
+                  uri?: string | undefined;
+                  parentUri?: string | undefined;
+                  type?: string | undefined;
+                  name?: string | undefined;
+                  packageName?: string | undefined;
+                  description?: string | undefined;
                 };
-                switchRef?: undefined | {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                    state?: undefined | "" | "undefined" | "on" | "off" | "stand-by";
+            switchRef?:
+              | undefined
+              | {
+                  extension?:
+                    | undefined
+                    | {
+                        [key: string]: unknown;
+                      };
+                  uri?: string | undefined;
+                  parentUri?: string | undefined;
+                  type?: string | undefined;
+                  name?: string | undefined;
+                  packageName?: string | undefined;
+                  description?: string | undefined;
+                  state?:
+                    undefined | '' | 'undefined' | 'on' | 'off' | 'stand-by';
                 };
-            };
-        };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
+          };
     };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/exception.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/exception.types.ts
index c0f8a31a1..c4d8d4341 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/exception.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/exception.types.ts
@@ -6,26 +6,38 @@
  */
 
 export type ExceptionSchema = {
-    exception: {
-        namespace?: undefined | {
-            id?: string | undefined;
+  exception: {
+    namespace?:
+      | undefined
+      | {
+          id?: string | undefined;
         };
-        type?: undefined | {
-            id?: string | undefined;
+    type?:
+      | undefined
+      | {
+          id?: string | undefined;
         };
-        message?: undefined | {
-            $value?: string | undefined;
-            lang?: string | undefined;
+    message?:
+      | undefined
+      | {
+          $value?: string | undefined;
+          lang?: string | undefined;
         };
-        localizedMessage?: undefined | {
-            $value?: string | undefined;
-            lang?: string | undefined;
+    localizedMessage?:
+      | undefined
+      | {
+          $value?: string | undefined;
+          lang?: string | undefined;
         };
-        properties?: undefined | {
-            entry?: undefined | {
+    properties?:
+      | undefined
+      | {
+          entry?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
+              }[];
         };
-    };
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/fincludes.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/fincludes.types.ts
index 8b4ff8ec2..78e8a4740 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/fincludes.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/fincludes.types.ts
@@ -6,33 +6,51 @@
  */
 
 export type FincludesSchema = {
-    abapFunctionGroupInclude: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  abapFunctionGroupInclude: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        sourceUri?: string | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    sourceUri?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/fmodules.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/fmodules.types.ts
index f8dd5d537..1ca109b4e 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/fmodules.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/fmodules.types.ts
@@ -6,44 +6,79 @@
  */
 
 export type FmodulesSchema = {
-    abapFunctionModule: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  abapFunctionModule: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        sourceUri?: string | undefined;
-        processingType?: undefined | "normal" | "rfc" | "update";
-        basXMLEnabled?: boolean | undefined;
-        abapFromJava?: boolean | undefined;
-        javaFromAbap?: boolean | undefined;
-        javaRemote?: boolean | undefined;
-        updateTaskKind?: undefined | "startImmediate" | "immediateStartNoRestart" | "startDelayed" | "collectiveRun" | "unsupportedKind";
-        releaseState?: undefined | "notReleased" | "internal" | "external" | "obsolete" | "markedForRelease";
-        releaseDate?: string | undefined;
-        global?: boolean | undefined;
-        rfcScope?: undefined | "notClassified" | "fromSameClientAndUser" | "fromSameSystem" | "fromAnySystem";
-        rfcVersion?: undefined | "any" | "fastSerializationRequired";
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    sourceUri?: string | undefined;
+    processingType?: undefined | 'normal' | 'rfc' | 'update';
+    basXMLEnabled?: boolean | undefined;
+    abapFromJava?: boolean | undefined;
+    javaFromAbap?: boolean | undefined;
+    javaRemote?: boolean | undefined;
+    updateTaskKind?:
+      | undefined
+      | 'startImmediate'
+      | 'immediateStartNoRestart'
+      | 'startDelayed'
+      | 'collectiveRun'
+      | 'unsupportedKind';
+    releaseState?:
+      | undefined
+      | 'notReleased'
+      | 'internal'
+      | 'external'
+      | 'obsolete'
+      | 'markedForRelease';
+    releaseDate?: string | undefined;
+    global?: boolean | undefined;
+    rfcScope?:
+      | undefined
+      | 'notClassified'
+      | 'fromSameClientAndUser'
+      | 'fromSameSystem'
+      | 'fromAnySystem';
+    rfcVersion?: undefined | 'any' | 'fastSerializationRequired';
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/groups.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/groups.types.ts
index 9c48c4d61..3ee39bd30 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/groups.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/groups.types.ts
@@ -6,66 +6,105 @@
  */
 
 export type GroupsSchema = {
-    abapFunctionGroup: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  abapFunctionGroup: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        template?: undefined | {
-            property?: undefined | {
+    template?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
+    syntaxConfiguration?:
+      | undefined
+      | {
+          language?:
+            | undefined
+            | {
                 version?: string | undefined;
                 description?: string | undefined;
-            };
-            objectUsage?: undefined | {
+              };
+          objectUsage?:
+            | undefined
+            | {
                 restricted?: boolean | undefined;
-            };
+              };
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
-        fixPointArithmetic?: boolean | undefined;
-        activeUnicodeCheck?: boolean | undefined;
-        lockedByEditor?: boolean | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    sourceUri?: string | undefined;
+    sourceObjectStatus?:
+      | undefined
+      | 'SAPStandardProduction'
+      | 'customerProduction'
+      | 'system'
+      | 'test';
+    fixPointArithmetic?: boolean | undefined;
+    activeUnicodeCheck?: boolean | undefined;
+    lockedByEditor?: boolean | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/includes.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/includes.types.ts
index 6e1e6e5f3..bd1df32de 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/includes.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/includes.types.ts
@@ -6,76 +6,121 @@
  */
 
 export type IncludesSchema = {
-    abapInclude: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  abapInclude: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        template?: undefined | {
-            property?: undefined | {
+    template?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
+    syntaxConfiguration?:
+      | undefined
+      | {
+          language?:
+            | undefined
+            | {
                 version?: string | undefined;
                 description?: string | undefined;
-            };
-            objectUsage?: undefined | {
+              };
+          objectUsage?:
+            | undefined
+            | {
                 restricted?: boolean | undefined;
-            };
+              };
         };
-        contextRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    contextRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
-        fixPointArithmetic?: boolean | undefined;
-        activeUnicodeCheck?: boolean | undefined;
-        contextRefCount?: number | undefined;
-        lockedByEditor?: boolean | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    sourceUri?: string | undefined;
+    sourceObjectStatus?:
+      | undefined
+      | 'SAPStandardProduction'
+      | 'customerProduction'
+      | 'system'
+      | 'test';
+    fixPointArithmetic?: boolean | undefined;
+    activeUnicodeCheck?: boolean | undefined;
+    contextRefCount?: number | undefined;
+    lockedByEditor?: boolean | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/interfaces.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/interfaces.types.ts
index 1bd452092..b7c6f7a6a 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/interfaces.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/interfaces.types.ts
@@ -6,75 +6,120 @@
  */
 
 export type InterfacesSchema = {
-    abapInterface: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  abapInterface: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        template?: undefined | {
-            property?: undefined | {
+    template?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
+    syntaxConfiguration?:
+      | undefined
+      | {
+          language?:
+            | undefined
+            | {
                 version?: string | undefined;
                 description?: string | undefined;
-            };
-            objectUsage?: undefined | {
+              };
+          objectUsage?:
+            | undefined
+            | {
                 restricted?: boolean | undefined;
-            };
+              };
         };
-        interfaceRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    interfaceRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         }[];
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
-        fixPointArithmetic?: boolean | undefined;
-        activeUnicodeCheck?: boolean | undefined;
-        modeled?: boolean | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    sourceUri?: string | undefined;
+    sourceObjectStatus?:
+      | undefined
+      | 'SAPStandardProduction'
+      | 'customerProduction'
+      | 'system'
+      | 'test';
+    fixPointArithmetic?: boolean | undefined;
+    activeUnicodeCheck?: boolean | undefined;
+    modeled?: boolean | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/log.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/log.types.ts
index eb21673e3..881de2aed 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/log.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/log.types.ts
@@ -5,44 +5,58 @@
  * Mode: Flattened
  */
 
-export type LogSchema = {
-    logKeys: {
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
-        }[];
-        progVersion?: undefined | {
-            key?: undefined | {
-                link?: undefined | {
-                    href: string;
-                    rel?: string | undefined;
-                    type?: string | undefined;
-                    hreflang?: string | undefined;
-                    title?: string | undefined;
-                    length?: number | undefined;
-                    etag?: string | undefined;
-                    _text?: string | undefined;
-                }[];
-                value?: string | undefined;
-                calls?: number | undefined;
-                lastCall?: string | undefined;
+export type LogSchema =
+  | {
+      logKeys: {
+        link?:
+          | undefined
+          | {
+              href: string;
+              rel?: string | undefined;
+              type?: string | undefined;
+              hreflang?: string | undefined;
+              title?: string | undefined;
+              length?: number | undefined;
+              etag?: string | undefined;
+              _text?: string | undefined;
+            }[];
+        progVersion?:
+          | undefined
+          | {
+              key?:
+                | undefined
+                | {
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                    value?: string | undefined;
+                    calls?: number | undefined;
+                    lastCall?: string | undefined;
+                  }[];
+              generatedAt?: string | undefined;
             }[];
-            generatedAt?: string | undefined;
-        }[];
         base?: string | undefined;
-    };
-} | {
-    logEntry: {
+      };
+    }
+  | {
+      logEntry: {
         fieldList: {
-            field?: undefined | {
+          field?:
+            | undefined
+            | {
                 value: {
-                    link?: undefined | {
+                  link?:
+                    | undefined
+                    | {
                         href: string;
                         rel?: string | undefined;
                         type?: string | undefined;
@@ -51,52 +65,67 @@ export type LogSchema = {
                         length?: number | undefined;
                         etag?: string | undefined;
                         _text?: string | undefined;
-                    }[];
-                    e?: undefined | {
+                      }[];
+                  e?:
+                    | undefined
+                    | {
                         t?: boolean | undefined;
                         v?: string | undefined;
                         y?: string | undefined;
-                    };
-                    s?: undefined | {
+                      };
+                  s?:
+                    | undefined
+                    | {
                         c: unknown[];
                         t?: boolean | undefined;
-                    };
-                    t?: undefined | {
+                      };
+                  t?:
+                    | undefined
+                    | {
                         c?: undefined | unknown[];
                         t?: boolean | undefined;
-                    };
+                      };
                 };
                 name?: string | undefined;
-            }[];
+              }[];
         };
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
-        }[];
-    };
-} | {
-    collectionSummary: {
-        success?: undefined | {
-            server: {
+        link?:
+          | undefined
+          | {
+              href: string;
+              rel?: string | undefined;
+              type?: string | undefined;
+              hreflang?: string | undefined;
+              title?: string | undefined;
+              length?: number | undefined;
+              etag?: string | undefined;
+              _text?: string | undefined;
+            }[];
+      };
+    }
+  | {
+      collectionSummary: {
+        success?:
+          | undefined
+          | {
+              server: {
                 name?: string | undefined;
+              };
             };
-        };
-        unreached?: undefined | {
-            server: {
+        unreached?:
+          | undefined
+          | {
+              server: {
                 name?: string | undefined;
+              };
             };
-        };
-        failed?: undefined | {
-            server?: string | undefined;
-            returnCode?: number | undefined;
-            errorMessage?: string | undefined;
-        }[];
+        failed?:
+          | undefined
+          | {
+              server?: string | undefined;
+              returnCode?: number | undefined;
+              errorMessage?: string | undefined;
+            }[];
         collectedLogs?: number | undefined;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/logpoint.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/logpoint.types.ts
index 9b5720df1..6fcf48d39 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/logpoint.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/logpoint.types.ts
@@ -5,69 +5,101 @@
  * Mode: Flattened
  */
 
-export type LogpointSchema = {
-    logpoint: {
-        location?: undefined | {
-            includePosition?: undefined | {
-                extension?: undefined | unknown;
-                uri?: string | undefined;
-                parentUri?: string | undefined;
-                type?: string | undefined;
-                name?: string | undefined;
-                packageName?: string | undefined;
-                description?: string | undefined;
-            };
-            mainProgram?: undefined | {
-                extension?: undefined | unknown;
-                uri?: string | undefined;
-                parentUri?: string | undefined;
-                type?: string | undefined;
-                name?: string | undefined;
-                packageName?: string | undefined;
-                description?: string | undefined;
-            };
-        };
-        definition?: undefined | {
-            description?: string | undefined;
-            subKey?: string | undefined;
-            fields?: string | undefined;
-            condition?: string | undefined;
-            rollareaCounter?: number | undefined;
-            usageType?: string | undefined;
-            createdBy?: string | undefined;
-            changedBy?: string | undefined;
-            changedAt?: string | undefined;
-            expiresAt?: string | undefined;
-            activityType?: string | undefined;
-            retentionTimeInDays?: number | undefined;
-        };
-        activation?: undefined | {
-            users?: undefined | {
-                user?: undefined | {
+export type LogpointSchema =
+  | {
+      logpoint: {
+        location?:
+          | undefined
+          | {
+              includePosition?:
+                | undefined
+                | {
+                    extension?:
+                      | undefined
+                      | {
+                          [key: string]: unknown;
+                        };
+                    uri?: string | undefined;
+                    parentUri?: string | undefined;
+                    type?: string | undefined;
                     name?: string | undefined;
-                }[];
-            };
-            servers?: undefined | {
-                server?: undefined | {
+                    packageName?: string | undefined;
+                    description?: string | undefined;
+                  };
+              mainProgram?:
+                | undefined
+                | {
+                    extension?:
+                      | undefined
+                      | {
+                          [key: string]: unknown;
+                        };
+                    uri?: string | undefined;
+                    parentUri?: string | undefined;
+                    type?: string | undefined;
                     name?: string | undefined;
-                }[];
+                    packageName?: string | undefined;
+                    description?: string | undefined;
+                  };
             };
-            state?: string | undefined;
-            activatedBy?: string | undefined;
-            activeSince?: string | undefined;
-            activeUntil?: string | undefined;
-            inactivatedBy?: string | undefined;
-            inactiveSince?: string | undefined;
-        };
-    };
-} | {
-    logpointList: {
+        definition?:
+          | undefined
+          | {
+              description?: string | undefined;
+              subKey?: string | undefined;
+              fields?: string | undefined;
+              condition?: string | undefined;
+              rollareaCounter?: number | undefined;
+              usageType?: string | undefined;
+              createdBy?: string | undefined;
+              changedBy?: string | undefined;
+              changedAt?: string | undefined;
+              expiresAt?: string | undefined;
+              activityType?: string | undefined;
+              retentionTimeInDays?: number | undefined;
+            };
+        activation?:
+          | undefined
+          | {
+              users?:
+                | undefined
+                | {
+                    user?:
+                      | undefined
+                      | {
+                          name?: string | undefined;
+                        }[];
+                  };
+              servers?:
+                | undefined
+                | {
+                    server?:
+                      | undefined
+                      | {
+                          name?: string | undefined;
+                        }[];
+                  };
+              state?: string | undefined;
+              activatedBy?: string | undefined;
+              activeSince?: string | undefined;
+              activeUntil?: string | undefined;
+              inactivatedBy?: string | undefined;
+              inactiveSince?: string | undefined;
+            };
+      };
+    }
+  | {
+      logpointList: {
         logpoint: {
-            summary?: undefined | {
+          summary?:
+            | undefined
+            | {
                 shortInfo: string;
                 executions: number;
-            };
-            definition?: undefined | {
+              };
+          definition?:
+            | undefined
+            | {
                 description?: string | undefined;
                 subKey?: string | undefined;
                 fields?: string | undefined;
@@ -80,26 +112,38 @@ export type LogpointSchema = {
                 expiresAt?: string | undefined;
                 activityType?: string | undefined;
                 retentionTimeInDays?: number | undefined;
-            };
-            activation?: undefined | {
-                users?: undefined | {
-                    user?: undefined | {
-                        name?: string | undefined;
-                    }[];
-                };
-                servers?: undefined | {
-                    server?: undefined | {
-                        name?: string | undefined;
-                    }[];
-                };
+              };
+          activation?:
+            | undefined
+            | {
+                users?:
+                  | undefined
+                  | {
+                      user?:
+                        | undefined
+                        | {
+                            name?: string | undefined;
+                          }[];
+                    };
+                servers?:
+                  | undefined
+                  | {
+                      server?:
+                        | undefined
+                        | {
+                            name?: string | undefined;
+                          }[];
+                    };
                 state?: string | undefined;
                 activatedBy?: string | undefined;
                 activeSince?: string | undefined;
                 activeUntil?: string | undefined;
                 inactivatedBy?: string | undefined;
                 inactiveSince?: string | undefined;
-            };
-            link?: undefined | {
+              };
+          link?:
+            | undefined
+            | {
                 href: string;
                 rel?: string | undefined;
                 type?: string | undefined;
@@ -108,52 +152,81 @@ export type LogpointSchema = {
                 length?: number | undefined;
                 etag?: string | undefined;
                 _text?: string | undefined;
-            }[];
-            location?: undefined | {
-                includePosition?: undefined | {
-                    extension?: undefined | unknown;
+              }[];
+          location?:
+            | undefined
+            | {
+                includePosition?:
+                  | undefined
+                  | {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                    };
+                mainProgram?:
+                  | undefined
+                  | {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                    };
+              };
+        };
+      };
+    }
+  | {
+      locationCheck: {
+        location?:
+          | undefined
+          | {
+              includePosition?:
+                | undefined
+                | {
+                    extension?:
+                      | undefined
+                      | {
+                          [key: string]: unknown;
+                        };
                     uri?: string | undefined;
                     parentUri?: string | undefined;
                     type?: string | undefined;
                     name?: string | undefined;
                     packageName?: string | undefined;
                     description?: string | undefined;
-                };
-                mainProgram?: undefined | {
-                    extension?: undefined | unknown;
+                  };
+              mainProgram?:
+                | undefined
+                | {
+                    extension?:
+                      | undefined
+                      | {
+                          [key: string]: unknown;
+                        };
                     uri?: string | undefined;
                     parentUri?: string | undefined;
                     type?: string | undefined;
                     name?: string | undefined;
                     packageName?: string | undefined;
                     description?: string | undefined;
-                };
+                  };
             };
-        };
-    };
-} | {
-    locationCheck: {
-        location?: undefined | {
-            includePosition?: undefined | {
-                extension?: undefined | unknown;
-                uri?: string | undefined;
-                parentUri?: string | undefined;
-                type?: string | undefined;
-                name?: string | undefined;
-                packageName?: string | undefined;
-                description?: string | undefined;
-            };
-            mainProgram?: undefined | {
-                extension?: undefined | unknown;
-                uri?: string | undefined;
-                parentUri?: string | undefined;
-                type?: string | undefined;
-                name?: string | undefined;
-                packageName?: string | undefined;
-                description?: string | undefined;
-            };
-        };
         message?: string | undefined;
         possible?: boolean | undefined;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/packagesV1.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/packagesV1.types.ts
index 5b32252df..2fba23fdc 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/packagesV1.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/packagesV1.types.ts
@@ -5,145 +5,209 @@
  * Mode: Flattened
  */
 
-export type PackagesV1Schema = {
-    package: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
-                $value?: string | undefined;
-                key?: string | undefined;
-            }[];
-            name?: string | undefined;
-        };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
+export type PackagesV1Schema =
+  | {
+      package: {
+        containerRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
+        adtTemplate?:
+          | undefined
+          | {
+              adtProperty?:
+                | undefined
+                | {
+                    $value?: string | undefined;
+                    key?: string | undefined;
+                  }[];
+              name?: string | undefined;
+            };
+        packageRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
         attributes: {
-            packageType: unknown;
-            isPackageTypeEditable?: boolean | undefined;
-            isAddingObjectsAllowed?: boolean | undefined;
-            isAddingObjectsAllowedEditable?: boolean | undefined;
-            isEncapsulated?: boolean | undefined;
-            isEncapsulationEditable?: boolean | undefined;
-            isEncapsulationVisible?: boolean | undefined;
-            recordChanges?: boolean | undefined;
-            isRecordChangesEditable?: boolean | undefined;
-            isSwitchVisible?: boolean | undefined;
-            languageVersion?: undefined | "" | "2" | "5";
-            isLanguageVersionEditable?: boolean | undefined;
-            isLanguageVersionVisible?: boolean | undefined;
-        };
-        superPackage?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+          packageType: unknown;
+          isPackageTypeEditable?: boolean | undefined;
+          isAddingObjectsAllowed?: boolean | undefined;
+          isAddingObjectsAllowedEditable?: boolean | undefined;
+          isEncapsulated?: boolean | undefined;
+          isEncapsulationEditable?: boolean | undefined;
+          isEncapsulationVisible?: boolean | undefined;
+          recordChanges?: boolean | undefined;
+          isRecordChangesEditable?: boolean | undefined;
+          isSwitchVisible?: boolean | undefined;
+          languageVersion?: undefined | '' | '2' | '5';
+          isLanguageVersionEditable?: boolean | undefined;
+          isLanguageVersionVisible?: boolean | undefined;
         };
+        superPackage?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
         extensionAlias: {
-            name?: string | undefined;
-            isVisible?: boolean | undefined;
-            isEditable?: boolean | undefined;
+          name?: string | undefined;
+          isVisible?: boolean | undefined;
+          isEditable?: boolean | undefined;
         };
         switch: {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-            state?: undefined | "" | "undefined" | "on" | "off" | "stand-by";
-        };
-        applicationComponent?: undefined | {
-            name?: string | undefined;
-            description?: string | undefined;
-            isVisible?: boolean | undefined;
-            isEditable?: boolean | undefined;
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
+          state?: undefined | '' | 'undefined' | 'on' | 'off' | 'stand-by';
         };
+        applicationComponent?:
+          | undefined
+          | {
+              name?: string | undefined;
+              description?: string | undefined;
+              isVisible?: boolean | undefined;
+              isEditable?: boolean | undefined;
+            };
         transport: {
-            softwareComponent?: undefined | {
+          softwareComponent?:
+            | undefined
+            | {
                 name?: string | undefined;
                 description?: string | undefined;
                 type?: string | undefined;
                 typeDescription?: string | undefined;
                 isVisible?: boolean | undefined;
                 isEditable?: boolean | undefined;
-            };
-            transportLayer?: undefined | {
+              };
+          transportLayer?:
+            | undefined
+            | {
                 name?: string | undefined;
                 description?: string | undefined;
                 isVisible?: boolean | undefined;
                 isEditable?: boolean | undefined;
-            };
-        };
-        translation?: undefined | {
-            relevance?: string | undefined;
-            relevanceDescription?: string | undefined;
-            isVisible?: boolean | undefined;
+              };
         };
+        translation?:
+          | undefined
+          | {
+              relevance?: string | undefined;
+              relevanceDescription?: string | undefined;
+              isVisible?: boolean | undefined;
+            };
         useAccesses: {
-            useAccess?: undefined | {
+          useAccess?:
+            | undefined
+            | {
                 packageInterfaceRef: {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
+                  extension?:
+                    | undefined
+                    | {
+                        [key: string]: unknown;
+                      };
+                  uri?: string | undefined;
+                  parentUri?: string | undefined;
+                  type?: string | undefined;
+                  name?: string | undefined;
+                  packageName?: string | undefined;
+                  description?: string | undefined;
                 };
                 packageRef: {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
+                  extension?:
+                    | undefined
+                    | {
+                        [key: string]: unknown;
+                      };
+                  uri?: string | undefined;
+                  parentUri?: string | undefined;
+                  type?: string | undefined;
+                  name?: string | undefined;
+                  packageName?: string | undefined;
+                  description?: string | undefined;
                 };
-                severity?: undefined | "" | "none" | "error" | "warning" | "information" | "obsolet";
-            }[];
-            isVisible?: boolean | undefined;
+                severity?:
+                  | undefined
+                  | ''
+                  | 'none'
+                  | 'error'
+                  | 'warning'
+                  | 'information'
+                  | 'obsolet';
+              }[];
+          isVisible?: boolean | undefined;
         };
         packageInterfaces: {
-            packageInterfaceRef?: undefined | {
-                extension?: undefined | unknown;
+          packageInterfaceRef?:
+            | undefined
+            | {
+                extension?:
+                  | undefined
+                  | {
+                      [key: string]: unknown;
+                    };
                 uri?: string | undefined;
                 parentUri?: string | undefined;
                 type?: string | undefined;
                 name?: string | undefined;
                 packageName?: string | undefined;
                 description?: string | undefined;
-            }[];
-            isVisible?: boolean | undefined;
+              }[];
+          isVisible?: boolean | undefined;
         };
         subPackages: {
-            packageRef?: undefined | {
-                extension?: undefined | unknown;
+          packageRef?:
+            | undefined
+            | {
+                extension?:
+                  | undefined
+                  | {
+                      [key: string]: unknown;
+                    };
                 uri?: string | undefined;
                 parentUri?: string | undefined;
                 type?: string | undefined;
                 name?: string | undefined;
                 packageName?: string | undefined;
                 description?: string | undefined;
-            }[];
+              }[];
         };
         name: string;
         type: string;
@@ -151,7 +215,15 @@ export type PackagesV1Schema = {
         changedAt?: string | undefined;
         createdAt?: string | undefined;
         createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
+        version?:
+          | undefined
+          | ''
+          | 'active'
+          | 'inactive'
+          | 'workingArea'
+          | 'new'
+          | 'partlyActive'
+          | 'activeWithInactiveVersion';
         description?: string | undefined;
         descriptionTextLimit?: number | undefined;
         language?: string | undefined;
@@ -159,42 +231,59 @@ export type PackagesV1Schema = {
         masterLanguage?: string | undefined;
         responsible?: string | undefined;
         abapLanguageVersion?: string | undefined;
-    };
-} | {
-    packageTree: {
-        treeNode?: undefined | {
-            extension?: undefined | unknown;
-            superPackageRef: {
-                extension?: undefined | unknown;
+      };
+    }
+  | {
+      packageTree: {
+        treeNode?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              superPackageRef: {
+                extension?:
+                  | undefined
+                  | {
+                      [key: string]: unknown;
+                    };
                 uri?: string | undefined;
                 parentUri?: string | undefined;
                 type?: string | undefined;
                 name?: string | undefined;
                 packageName?: string | undefined;
                 description?: string | undefined;
-            };
-            packageInterfaces: {
-                packageInterfaceRef?: undefined | {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                }[];
+              };
+              packageInterfaces: {
+                packageInterfaceRef?:
+                  | undefined
+                  | {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                    }[];
                 isVisible?: boolean | undefined;
-            };
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-            isEncapsulated?: boolean | undefined;
-            hasSubpackages?: boolean | undefined;
-            hasInterfaces?: boolean | undefined;
-        }[];
+              };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+              isEncapsulated?: boolean | undefined;
+              hasSubpackages?: boolean | undefined;
+              hasInterfaces?: boolean | undefined;
+            }[];
         isSuperTree?: boolean | undefined;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/programs.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/programs.types.ts
index 8c1186ade..253eda8cc 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/programs.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/programs.types.ts
@@ -6,122 +6,183 @@
  */
 
 export type ProgramsSchema = {
-    abapProgram: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  abapProgram: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
+    link?:
+      | undefined
+      | {
+          href: string;
+          rel?: string | undefined;
+          type?: string | undefined;
+          hreflang?: string | undefined;
+          title?: string | undefined;
+          length?: number | undefined;
+          etag?: string | undefined;
+          _text?: string | undefined;
         }[];
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        template?: undefined | {
-            property?: undefined | {
+    template?:
+      | undefined
+      | {
+          property?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        syntaxConfiguration?: undefined | {
-            language?: undefined | {
+    syntaxConfiguration?:
+      | undefined
+      | {
+          language?:
+            | undefined
+            | {
                 version?: string | undefined;
                 description?: string | undefined;
-                link?: undefined | {
-                    href: string;
-                    rel?: string | undefined;
-                    type?: string | undefined;
-                    hreflang?: string | undefined;
-                    title?: string | undefined;
-                    length?: number | undefined;
-                    etag?: string | undefined;
-                    _text?: string | undefined;
-                }[];
-            };
-            objectUsage?: undefined | {
-                link?: undefined | {
-                    href: string;
-                    rel?: string | undefined;
-                    type?: string | undefined;
-                    hreflang?: string | undefined;
-                    title?: string | undefined;
-                    length?: number | undefined;
-                    etag?: string | undefined;
-                    _text?: string | undefined;
-                }[];
+                link?:
+                  | undefined
+                  | {
+                      href: string;
+                      rel?: string | undefined;
+                      type?: string | undefined;
+                      hreflang?: string | undefined;
+                      title?: string | undefined;
+                      length?: number | undefined;
+                      etag?: string | undefined;
+                      _text?: string | undefined;
+                    }[];
+              };
+          objectUsage?:
+            | undefined
+            | {
+                link?:
+                  | undefined
+                  | {
+                      href: string;
+                      rel?: string | undefined;
+                      type?: string | undefined;
+                      hreflang?: string | undefined;
+                      title?: string | undefined;
+                      length?: number | undefined;
+                      etag?: string | undefined;
+                      _text?: string | undefined;
+                    }[];
                 restricted?: boolean | undefined;
-            };
+              };
         };
-        logicalDatabase?: undefined | {
-            ref?: undefined | {
-                extension?: undefined | unknown;
+    logicalDatabase?:
+      | undefined
+      | {
+          ref?:
+            | undefined
+            | {
+                extension?:
+                  | undefined
+                  | {
+                      [key: string]: unknown;
+                    };
                 uri?: string | undefined;
                 parentUri?: string | undefined;
                 type?: string | undefined;
                 name?: string | undefined;
                 packageName?: string | undefined;
                 description?: string | undefined;
-            };
-            selectionScreen?: string | undefined;
+              };
+          selectionScreen?: string | undefined;
         };
-        authorizationGroup?: undefined | {
-            ref?: undefined | {
-                extension?: undefined | unknown;
+    authorizationGroup?:
+      | undefined
+      | {
+          ref?:
+            | undefined
+            | {
+                extension?:
+                  | undefined
+                  | {
+                      [key: string]: unknown;
+                    };
                 uri?: string | undefined;
                 parentUri?: string | undefined;
                 type?: string | undefined;
                 name?: string | undefined;
                 packageName?: string | undefined;
                 description?: string | undefined;
-            };
-            application?: string | undefined;
+              };
+          application?: string | undefined;
         };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        sourceUri?: string | undefined;
-        sourceObjectStatus?: undefined | "SAPStandardProduction" | "customerProduction" | "system" | "test";
-        fixPointArithmetic?: boolean | undefined;
-        activeUnicodeCheck?: boolean | undefined;
-        programType?: undefined | unknown;
-        startUsingVariant?: boolean | undefined;
-        lockedByEditor?: boolean | undefined;
-    };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    sourceUri?: string | undefined;
+    sourceObjectStatus?:
+      | undefined
+      | 'SAPStandardProduction'
+      | 'customerProduction'
+      | 'system'
+      | 'test';
+    fixPointArithmetic?: boolean | undefined;
+    activeUnicodeCheck?: boolean | undefined;
+    programType?: undefined | unknown;
+    startUsingVariant?: boolean | undefined;
+    lockedByEditor?: boolean | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/quickfixes.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/quickfixes.types.ts
index 35655e22d..78bf1d61d 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/quickfixes.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/quickfixes.types.ts
@@ -5,73 +5,106 @@
  * Mode: Flattened
  */
 
-export type QuickfixesSchema = {
-    evaluationRequest: {
-        affectedObjects?: undefined | {
-            unit?: undefined | {
-                content: string;
-                objectReference: {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                };
-                link?: undefined | {
-                    href: string;
-                    rel?: string | undefined;
-                    type?: string | undefined;
-                    hreflang?: string | undefined;
-                    title?: string | undefined;
-                    length?: number | undefined;
-                    etag?: string | undefined;
-                    _text?: string | undefined;
-                }[];
-            }[];
-        };
-    };
-} | {
-    evaluationResults: {
-        evaluationResult?: undefined | {
-            objectReference: {
-                extension?: undefined | unknown;
-                uri?: string | undefined;
-                parentUri?: string | undefined;
-                type?: string | undefined;
-                name?: string | undefined;
-                packageName?: string | undefined;
-                description?: string | undefined;
+export type QuickfixesSchema =
+  | {
+      evaluationRequest: {
+        affectedObjects?:
+          | undefined
+          | {
+              unit?:
+                | undefined
+                | {
+                    content: string;
+                    objectReference: {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                    };
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                  }[];
             };
-            userContent?: string | undefined;
-            affectedObjects?: undefined | {
-                objectReference?: undefined | {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                }[];
-            };
-        }[];
-    };
-} | {
-    proposalRequest: {
-        input: {
-            content: string;
-            objectReference: {
-                extension?: undefined | unknown;
+      };
+    }
+  | {
+      evaluationResults: {
+        evaluationResult?:
+          | undefined
+          | {
+              objectReference: {
+                extension?:
+                  | undefined
+                  | {
+                      [key: string]: unknown;
+                    };
                 uri?: string | undefined;
                 parentUri?: string | undefined;
                 type?: string | undefined;
                 name?: string | undefined;
                 packageName?: string | undefined;
                 description?: string | undefined;
-            };
-            link?: undefined | {
+              };
+              userContent?: string | undefined;
+              affectedObjects?:
+                | undefined
+                | {
+                    objectReference?:
+                      | undefined
+                      | {
+                          extension?:
+                            | undefined
+                            | {
+                                [key: string]: unknown;
+                              };
+                          uri?: string | undefined;
+                          parentUri?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          packageName?: string | undefined;
+                          description?: string | undefined;
+                        }[];
+                  };
+            }[];
+      };
+    }
+  | {
+      proposalRequest: {
+        input: {
+          content: string;
+          objectReference: {
+            extension?:
+              | undefined
+              | {
+                  [key: string]: unknown;
+                };
+            uri?: string | undefined;
+            parentUri?: string | undefined;
+            type?: string | undefined;
+            name?: string | undefined;
+            packageName?: string | undefined;
+            description?: string | undefined;
+          };
+          link?:
+            | undefined
+            | {
                 href: string;
                 rel?: string | undefined;
                 type?: string | undefined;
@@ -80,90 +113,127 @@ export type QuickfixesSchema = {
                 length?: number | undefined;
                 etag?: string | undefined;
                 _text?: string | undefined;
-            }[];
-        };
-        affectedObjects?: undefined | {
-            unit?: undefined | {
-                content: string;
-                objectReference: {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                };
-                link?: undefined | {
-                    href: string;
-                    rel?: string | undefined;
-                    type?: string | undefined;
-                    hreflang?: string | undefined;
-                    title?: string | undefined;
-                    length?: number | undefined;
-                    etag?: string | undefined;
-                    _text?: string | undefined;
-                }[];
-            }[];
+              }[];
         };
+        affectedObjects?:
+          | undefined
+          | {
+              unit?:
+                | undefined
+                | {
+                    content: string;
+                    objectReference: {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                    };
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                  }[];
+            };
         userContent?: string | undefined;
-    };
-} | {
-    proposalResult: {
+      };
+    }
+  | {
+      proposalResult: {
         deltas: {
-            unit?: undefined | {
+          unit?:
+            | undefined
+            | {
                 content: string;
                 objectReference: {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
+                  extension?:
+                    | undefined
+                    | {
+                        [key: string]: unknown;
+                      };
+                  uri?: string | undefined;
+                  parentUri?: string | undefined;
+                  type?: string | undefined;
+                  name?: string | undefined;
+                  packageName?: string | undefined;
+                  description?: string | undefined;
                 };
-                link?: undefined | {
-                    href: string;
-                    rel?: string | undefined;
-                    type?: string | undefined;
-                    hreflang?: string | undefined;
-                    title?: string | undefined;
-                    length?: number | undefined;
-                    etag?: string | undefined;
-                    _text?: string | undefined;
-                }[];
-            }[];
+                link?:
+                  | undefined
+                  | {
+                      href: string;
+                      rel?: string | undefined;
+                      type?: string | undefined;
+                      hreflang?: string | undefined;
+                      title?: string | undefined;
+                      length?: number | undefined;
+                      etag?: string | undefined;
+                      _text?: string | undefined;
+                    }[];
+              }[];
         };
-        selection?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
-        variableSourceStates?: undefined | {
-            objectReferences?: undefined | {
-                objectReference: {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
-                    type?: string | undefined;
+        selection?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
+        variableSourceStates?:
+          | undefined
+          | {
+              objectReferences?:
+                | undefined
+                | {
+                    objectReference: {
+                      extension?:
+                        | undefined
+                        | {
+                            [key: string]: unknown;
+                          };
+                      uri?: string | undefined;
+                      parentUri?: string | undefined;
+                      type?: string | undefined;
+                      name?: string | undefined;
+                      packageName?: string | undefined;
+                      description?: string | undefined;
+                    }[];
                     name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                }[];
-                name?: string | undefined;
-            }[];
-            keepCursor?: boolean | undefined;
-        };
-        statusMessages?: undefined | {
-            statusMessage?: undefined | {
-                severity: "info" | "warning";
-                message: string;
-                id?: string | undefined;
-            }[];
-        };
+                  }[];
+              keepCursor?: boolean | undefined;
+            };
+        statusMessages?:
+          | undefined
+          | {
+              statusMessage?:
+                | undefined
+                | {
+                    severity: 'info' | 'warning';
+                    message: string;
+                    id?: string | undefined;
+                  }[];
+            };
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/servicebinding.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/servicebinding.types.ts
index 5e8cececa..0011c123c 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/servicebinding.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/servicebinding.types.ts
@@ -6,121 +6,165 @@
  */
 
 export type ServicebindingSchema = {
-    serviceBinding: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  serviceBinding: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        link?: undefined | {
-            href: string;
-            rel?: string | undefined;
-            type?: string | undefined;
-            hreflang?: string | undefined;
-            title?: string | undefined;
-            length?: number | undefined;
-            etag?: string | undefined;
-            _text?: string | undefined;
+    link?:
+      | undefined
+      | {
+          href: string;
+          rel?: string | undefined;
+          type?: string | undefined;
+          hreflang?: string | undefined;
+          title?: string | undefined;
+          length?: number | undefined;
+          etag?: string | undefined;
+          _text?: string | undefined;
         }[];
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
+    serviceDefinition: {
+      extension?:
+        | undefined
+        | {
+            [key: string]: unknown;
+          };
+      uri?: string | undefined;
+      parentUri?: string | undefined;
+      type?: string | undefined;
+      name?: string | undefined;
+      packageName?: string | undefined;
+      description?: string | undefined;
+    };
+    services: {
+      content: {
         serviceDefinition: {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        services: {
-            content: {
-                serviceDefinition: {
-                    extension?: undefined | unknown;
-                    uri?: string | undefined;
-                    parentUri?: string | undefined;
+        bindingTypeData?:
+          | undefined
+          | {
+              content?:
+                | undefined
+                | {
+                    $value?: string | undefined;
                     type?: string | undefined;
-                    name?: string | undefined;
-                    packageName?: string | undefined;
-                    description?: string | undefined;
-                };
-                bindingTypeData?: undefined | {
-                    content?: undefined | {
-                        $value?: string | undefined;
-                        type?: string | undefined;
-                        encoding?: string | undefined;
-                    };
-                    link?: undefined | {
-                        href: string;
-                        rel?: string | undefined;
-                        type?: string | undefined;
-                        hreflang?: string | undefined;
-                        title?: string | undefined;
-                        length?: number | undefined;
-                        etag?: string | undefined;
-                        _text?: string | undefined;
-                    }[];
-                };
-                version?: string | undefined;
-                minorVersion?: number | undefined;
-                patchVersion?: number | undefined;
-                buildVersion?: string | undefined;
-                releaseState?: string | undefined;
-            }[];
-            name?: string | undefined;
-        }[];
-        binding: {
-            implementation: {
-                extension?: undefined | unknown;
-                uri?: string | undefined;
-                parentUri?: string | undefined;
-                type?: string | undefined;
-                name?: string | undefined;
-                packageName?: string | undefined;
-                description?: string | undefined;
+                    encoding?: string | undefined;
+                  };
+              link?:
+                | undefined
+                | {
+                    href: string;
+                    rel?: string | undefined;
+                    type?: string | undefined;
+                    hreflang?: string | undefined;
+                    title?: string | undefined;
+                    length?: number | undefined;
+                    etag?: string | undefined;
+                    _text?: string | undefined;
+                  }[];
             };
-            type?: string | undefined;
-            version?: string | undefined;
-            category?: string | undefined;
-            calculatedType?: string | undefined;
-        };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
+        version?: string | undefined;
+        minorVersion?: number | undefined;
+        patchVersion?: number | undefined;
+        buildVersion?: string | undefined;
+        releaseState?: string | undefined;
+      }[];
+      name?: string | undefined;
+    }[];
+    binding: {
+      implementation: {
+        extension?:
+          | undefined
+          | {
+              [key: string]: unknown;
+            };
+        uri?: string | undefined;
+        parentUri?: string | undefined;
+        type?: string | undefined;
+        name?: string | undefined;
+        packageName?: string | undefined;
         description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
-        contract?: string | undefined;
-        releaseSupported?: boolean | undefined;
-        published?: boolean | undefined;
-        repair?: boolean | undefined;
-        bindingCreated?: boolean | undefined;
-        allowedAction?: string | undefined;
+      };
+      type?: string | undefined;
+      version?: string | undefined;
+      category?: string | undefined;
+      calculatedType?: string | undefined;
     };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+    contract?: string | undefined;
+    releaseSupported?: boolean | undefined;
+    published?: boolean | undefined;
+    repair?: boolean | undefined;
+    bindingCreated?: boolean | undefined;
+    allowedAction?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/tablesettings.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/tablesettings.types.ts
index 979fbf58c..9bd5fc480 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/tablesettings.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/tablesettings.types.ts
@@ -5,39 +5,50 @@
  * Mode: Flattened
  */
 
-export type TablesettingsSchema = {
-    tableSettings: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
-        };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
-                $value?: string | undefined;
-                key?: string | undefined;
-            }[];
-            name?: string | undefined;
-        };
+export type TablesettingsSchema =
+  | {
+      tableSettings: {
+        containerRef?:
+          | undefined
+          | {
+              extension?:
+                | undefined
+                | {
+                    [key: string]: unknown;
+                  };
+              uri?: string | undefined;
+              parentUri?: string | undefined;
+              type?: string | undefined;
+              name?: string | undefined;
+              packageName?: string | undefined;
+              description?: string | undefined;
+            };
+        adtTemplate?:
+          | undefined
+          | {
+              adtProperty?:
+                | undefined
+                | {
+                    $value?: string | undefined;
+                    key?: string | undefined;
+                  }[];
+              name?: string | undefined;
+            };
         dataClassCategory: string;
         sizeCategory: string;
         buffering: {
-            allowed: "N" | "X" | "A";
-            type: unknown;
-            areaKeyFields: string;
+          allowed: 'N' | 'X' | 'A';
+          type: unknown;
+          areaKeyFields: string;
         };
-        storageType: "" | "R" | "C";
-        sharingType: "" | "R" | "L" | "W" | "T" | "S";
-        loadUnit: "" | "A" | "P" | "Q";
+        storageType: '' | 'R' | 'C';
+        sharingType: '' | 'R' | 'L' | 'W' | 'T' | 'S';
+        loadUnit: '' | 'A' | 'P' | 'Q';
         translation: {
-            value?: undefined | "" | "N" | "X" | "L" | "T";
-            granularity?: undefined | "" | "1" | "2";
-            isVisible?: boolean | undefined;
-            isEditable?: boolean | undefined;
+          value?: undefined | '' | 'N' | 'X' | 'L' | 'T';
+          granularity?: undefined | '' | '1' | '2';
+          isVisible?: boolean | undefined;
+          isEditable?: boolean | undefined;
         };
         loggingEnabled: boolean;
         supportsLoggingAssessment: boolean;
@@ -48,18 +59,28 @@ export type TablesettingsSchema = {
         changedAt?: string | undefined;
         createdAt?: string | undefined;
         createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
+        version?:
+          | undefined
+          | ''
+          | 'active'
+          | 'inactive'
+          | 'workingArea'
+          | 'new'
+          | 'partlyActive'
+          | 'activeWithInactiveVersion';
         description?: string | undefined;
         descriptionTextLimit?: number | undefined;
         language?: string | undefined;
-    };
-} | {
-    loggingAssessment: {
+      };
+    }
+  | {
+      loggingAssessment: {
         allowed: boolean;
-        rating: "" | "REQUIRED" | "NOT_REQUIRED" | "MAY_BE_REQUIRED" | "UNDEFINED";
+        rating:
+          '' | 'REQUIRED' | 'NOT_REQUIRED' | 'MAY_BE_REQUIRED' | 'UNDEFINED';
         reason: string;
         isVisible?: boolean | undefined;
         isEditable?: boolean | undefined;
         name?: string | undefined;
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/tabletype.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/tabletype.types.ts
index 5c20e056f..c20b9e081 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/tabletype.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/tabletype.types.ts
@@ -6,139 +6,175 @@
  */
 
 export type TabletypeSchema = {
-    tableType: {
-        containerRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+  tableType: {
+    containerRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        adtTemplate?: undefined | {
-            adtProperty?: undefined | {
+    adtTemplate?:
+      | undefined
+      | {
+          adtProperty?:
+            | undefined
+            | {
                 $value?: string | undefined;
                 key?: string | undefined;
-            }[];
-            name?: string | undefined;
-        };
-        packageRef?: undefined | {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+              }[];
+          name?: string | undefined;
         };
-        rowType: {
-            typeKind?: string | undefined;
-            typeName?: string | undefined;
-            builtInType?: undefined | {
-                dataType?: string | undefined;
-                length?: number | undefined;
-                decimals?: number | undefined;
-            };
-            rangeType?: string | undefined;
+    packageRef?:
+      | undefined
+      | {
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
-        initialRowCount?: number | undefined;
-        accessType: string;
-        primaryKey: {
-            definition: string;
-            kind: string;
-            components?: undefined | {
-                component?: undefined | {
-                    name?: string | undefined;
+    rowType: {
+      typeKind?: string | undefined;
+      typeName?: string | undefined;
+      builtInType?:
+        | undefined
+        | {
+            dataType?: string | undefined;
+            length?: number | undefined;
+            decimals?: number | undefined;
+          };
+      rangeType?: string | undefined;
+    };
+    initialRowCount?: number | undefined;
+    accessType: string;
+    primaryKey: {
+      definition: string;
+      kind: string;
+      components?:
+        | undefined
+        | {
+            component?:
+              | undefined
+              | {
+                  name?: string | undefined;
                 }[];
-                isVisible?: boolean | undefined;
-            };
-            alias?: string | undefined;
             isVisible?: boolean | undefined;
-            isEditable?: boolean | undefined;
-        };
-        secondaryKeys: {
-            allowed: string;
-            secondaryKey?: undefined | {
-                components?: undefined | {
-                    component?: undefined | {
+          };
+      alias?: string | undefined;
+      isVisible?: boolean | undefined;
+      isEditable?: boolean | undefined;
+    };
+    secondaryKeys: {
+      allowed: string;
+      secondaryKey?:
+        | undefined
+        | {
+            components?:
+              | undefined
+              | {
+                  component?:
+                    | undefined
+                    | {
                         name?: string | undefined;
-                    }[];
-                    isVisible?: boolean | undefined;
+                      }[];
+                  isVisible?: boolean | undefined;
                 };
-                identifier?: string | undefined;
-                description?: string | undefined;
-                language?: string | undefined;
-                access?: string | undefined;
-                definition?: string | undefined;
-            }[];
-            isVisible?: boolean | undefined;
-            isEditable?: boolean | undefined;
-        };
-        valueHelps: {
-            typeKindValues: {
-                valueHelp: {
-                    key: string;
-                    value: string;
-                    description?: string | undefined;
-                }[];
-            };
-            keyDefinitionValues: {
-                valueHelp: {
-                    key: string;
-                    value: string;
-                    description?: string | undefined;
-                }[];
-            };
-            keyKindValues: {
-                valueHelp: {
-                    key: string;
-                    value: string;
-                    description?: string | undefined;
-                }[];
-            };
-            accessTypeValues: {
-                valueHelp: {
-                    key: string;
-                    value: string;
-                    description?: string | undefined;
-                }[];
-            };
-            secKeyAccessValues: {
-                valueHelp: {
-                    key: string;
-                    value: string;
-                    description?: string | undefined;
-                }[];
-            };
-            secKeyDefinitionValues: {
-                valueHelp: {
-                    key: string;
-                    value: string;
-                    description?: string | undefined;
-                }[];
-            };
-            secKeyAllowedValues: {
-                valueHelp: {
-                    key: string;
-                    value: string;
-                    description?: string | undefined;
-                }[];
-            };
-        };
-        name: string;
-        type: string;
-        changedBy?: string | undefined;
-        changedAt?: string | undefined;
-        createdAt?: string | undefined;
-        createdBy?: string | undefined;
-        version?: undefined | "" | "active" | "inactive" | "workingArea" | "new" | "partlyActive" | "activeWithInactiveVersion";
-        description?: string | undefined;
-        descriptionTextLimit?: number | undefined;
-        language?: string | undefined;
-        masterSystem?: string | undefined;
-        masterLanguage?: string | undefined;
-        responsible?: string | undefined;
-        abapLanguageVersion?: string | undefined;
+            identifier?: string | undefined;
+            description?: string | undefined;
+            language?: string | undefined;
+            access?: string | undefined;
+            definition?: string | undefined;
+          }[];
+      isVisible?: boolean | undefined;
+      isEditable?: boolean | undefined;
+    };
+    valueHelps: {
+      typeKindValues: {
+        valueHelp: {
+          key: string;
+          value: string;
+          description?: string | undefined;
+        }[];
+      };
+      keyDefinitionValues: {
+        valueHelp: {
+          key: string;
+          value: string;
+          description?: string | undefined;
+        }[];
+      };
+      keyKindValues: {
+        valueHelp: {
+          key: string;
+          value: string;
+          description?: string | undefined;
+        }[];
+      };
+      accessTypeValues: {
+        valueHelp: {
+          key: string;
+          value: string;
+          description?: string | undefined;
+        }[];
+      };
+      secKeyAccessValues: {
+        valueHelp: {
+          key: string;
+          value: string;
+          description?: string | undefined;
+        }[];
+      };
+      secKeyDefinitionValues: {
+        valueHelp: {
+          key: string;
+          value: string;
+          description?: string | undefined;
+        }[];
+      };
+      secKeyAllowedValues: {
+        valueHelp: {
+          key: string;
+          value: string;
+          description?: string | undefined;
+        }[];
+      };
     };
+    name: string;
+    type: string;
+    changedBy?: string | undefined;
+    changedAt?: string | undefined;
+    createdAt?: string | undefined;
+    createdBy?: string | undefined;
+    version?:
+      | undefined
+      | ''
+      | 'active'
+      | 'inactive'
+      | 'workingArea'
+      | 'new'
+      | 'partlyActive'
+      | 'activeWithInactiveVersion';
+    description?: string | undefined;
+    descriptionTextLimit?: number | undefined;
+    language?: string | undefined;
+    masterSystem?: string | undefined;
+    masterLanguage?: string | undefined;
+    responsible?: string | undefined;
+    abapLanguageVersion?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/templatelink.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/templatelink.types.ts
index eb56ad8d3..b768e0c0e 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/templatelink.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/templatelink.types.ts
@@ -6,11 +6,11 @@
  */
 
 export type TemplatelinkSchema = {
-    templateLink: {
-        template: string;
-        rel: string;
-        type?: string | undefined;
-        title?: string | undefined;
-        _text?: string | undefined;
-    };
+  templateLink: {
+    template: string;
+    rel: string;
+    type?: string | undefined;
+    title?: string | undefined;
+    _text?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/traces.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/traces.types.ts
index cb954120f..7a791cfbe 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/traces.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/traces.types.ts
@@ -5,35 +5,41 @@
  * Mode: Flattened
  */
 
-export type TracesSchema = {
-    activations: {
-        activation?: undefined | {
-            activationId: string;
-            deletionTime: string;
-            description: string;
-            enabled: boolean;
-            userFilter: string;
-            serverFilter: string;
-            requestTypeFilter: string;
-            requestNameFilter: string;
-            sensitiveDataAllowed: boolean;
-            createUser: string;
-            createTime: string;
-            changeUser: string;
-            changeTime: string;
-            components: {
-                component?: undefined | {
-                    component: string;
-                    traceLevel: number;
-                }[];
-            };
-            numberOfTraces?: number | undefined;
-            maxNumberOfTraces?: number | undefined;
-            noContent?: boolean | undefined;
-        }[];
-    };
-} | {
-    activation: {
+export type TracesSchema =
+  | {
+      activations: {
+        activation?:
+          | undefined
+          | {
+              activationId: string;
+              deletionTime: string;
+              description: string;
+              enabled: boolean;
+              userFilter: string;
+              serverFilter: string;
+              requestTypeFilter: string;
+              requestNameFilter: string;
+              sensitiveDataAllowed: boolean;
+              createUser: string;
+              createTime: string;
+              changeUser: string;
+              changeTime: string;
+              components: {
+                component?:
+                  | undefined
+                  | {
+                      component: string;
+                      traceLevel: number;
+                    }[];
+              };
+              numberOfTraces?: number | undefined;
+              maxNumberOfTraces?: number | undefined;
+              noContent?: boolean | undefined;
+            }[];
+      };
+    }
+  | {
+      activation: {
         activationId: string;
         deletionTime: string;
         description: string;
@@ -48,85 +54,103 @@ export type TracesSchema = {
         changeUser: string;
         changeTime: string;
         components: {
-            component?: undefined | {
+          component?:
+            | undefined
+            | {
                 component: string;
                 traceLevel: number;
-            }[];
+              }[];
         };
         numberOfTraces?: number | undefined;
         maxNumberOfTraces?: number | undefined;
         noContent?: boolean | undefined;
-    };
-} | {
-    traces: {
-        trace?: undefined | {
-            traceId: string;
-            user: string;
-            server: string;
-            creationTime: string;
-            description: string;
-            deletionTime: string;
-            requestType: string;
-            requestName: string;
-            eppTransactionId: string;
-            eppRootContextId: string;
-            eppConnectionId: string;
-            eppConnectionCounter: number;
-            properties: {
-                property?: undefined | {
-                    component: string;
-                    key: string;
-                    value: string;
-                }[];
-            };
-            activation?: undefined | {
-                activationId: string;
-                deletionTime: string;
-                description: string;
-                enabled: boolean;
-                userFilter: string;
-                serverFilter: string;
-                requestTypeFilter: string;
-                requestNameFilter: string;
-                sensitiveDataAllowed: boolean;
-                createUser: string;
-                createTime: string;
-                changeUser: string;
-                changeTime: string;
-                components: {
-                    component?: undefined | {
-                        component: string;
-                        traceLevel: number;
+      };
+    }
+  | {
+      traces: {
+        trace?:
+          | undefined
+          | {
+              traceId: string;
+              user: string;
+              server: string;
+              creationTime: string;
+              description: string;
+              deletionTime: string;
+              requestType: string;
+              requestName: string;
+              eppTransactionId: string;
+              eppRootContextId: string;
+              eppConnectionId: string;
+              eppConnectionCounter: number;
+              properties: {
+                property?:
+                  | undefined
+                  | {
+                      component: string;
+                      key: string;
+                      value: string;
                     }[];
-                };
-                numberOfTraces?: number | undefined;
-                maxNumberOfTraces?: number | undefined;
-                noContent?: boolean | undefined;
-            };
-            recordsSummary?: undefined | {
-                componentNames?: undefined | {
-                    componentName?: undefined | string[];
-                };
-                numberOfRecords: number;
-                minRecordsTimestamp: string;
-                maxRecordsTimestamp: string;
-                contentSize: number;
-            };
-            originalImportMetadata?: undefined | {
-                originalTraceId: string;
-                originalTraceSystem: string;
-                originalTraceClient: string;
-                originalTraceServer: string;
-                originalTraceUser: string;
-                originalChangeUser: string;
-                originalCreateUser: string;
-                originalHeaderUserAttributeDev: string;
-                originalHeaderTimestamp: string;
-            };
-        }[];
-    };
-} | {
-    trace: {
+              };
+              activation?:
+                | undefined
+                | {
+                    activationId: string;
+                    deletionTime: string;
+                    description: string;
+                    enabled: boolean;
+                    userFilter: string;
+                    serverFilter: string;
+                    requestTypeFilter: string;
+                    requestNameFilter: string;
+                    sensitiveDataAllowed: boolean;
+                    createUser: string;
+                    createTime: string;
+                    changeUser: string;
+                    changeTime: string;
+                    components: {
+                      component?:
+                        | undefined
+                        | {
+                            component: string;
+                            traceLevel: number;
+                          }[];
+                    };
+                    numberOfTraces?: number | undefined;
+                    maxNumberOfTraces?: number | undefined;
+                    noContent?: boolean | undefined;
+                  };
+              recordsSummary?:
+                | undefined
+                | {
+                    componentNames?:
+                      | undefined
+                      | {
+                          componentName?: undefined | string[];
+                        };
+                    numberOfRecords: number;
+                    minRecordsTimestamp: string;
+                    maxRecordsTimestamp: string;
+                    contentSize: number;
+                  };
+              originalImportMetadata?:
+                | undefined
+                | {
+                    originalTraceId: string;
+                    originalTraceSystem: string;
+                    originalTraceClient: string;
+                    originalTraceServer: string;
+                    originalTraceUser: string;
+                    originalChangeUser: string;
+                    originalCreateUser: string;
+                    originalHeaderUserAttributeDev: string;
+                    originalHeaderTimestamp: string;
+                  };
+            }[];
+      };
+    }
+  | {
+      trace: {
         traceId: string;
         user: string;
         server: string;
@@ -140,102 +164,128 @@ export type TracesSchema = {
         eppConnectionId: string;
         eppConnectionCounter: number;
         properties: {
-            property?: undefined | {
+          property?:
+            | undefined
+            | {
                 component: string;
                 key: string;
                 value: string;
-            }[];
-        };
-        activation?: undefined | {
-            activationId: string;
-            deletionTime: string;
-            description: string;
-            enabled: boolean;
-            userFilter: string;
-            serverFilter: string;
-            requestTypeFilter: string;
-            requestNameFilter: string;
-            sensitiveDataAllowed: boolean;
-            createUser: string;
-            createTime: string;
-            changeUser: string;
-            changeTime: string;
-            components: {
-                component?: undefined | {
-                    component: string;
-                    traceLevel: number;
-                }[];
-            };
-            numberOfTraces?: number | undefined;
-            maxNumberOfTraces?: number | undefined;
-            noContent?: boolean | undefined;
+              }[];
         };
-        recordsSummary?: undefined | {
-            componentNames?: undefined | {
-                componentName?: undefined | string[];
+        activation?:
+          | undefined
+          | {
+              activationId: string;
+              deletionTime: string;
+              description: string;
+              enabled: boolean;
+              userFilter: string;
+              serverFilter: string;
+              requestTypeFilter: string;
+              requestNameFilter: string;
+              sensitiveDataAllowed: boolean;
+              createUser: string;
+              createTime: string;
+              changeUser: string;
+              changeTime: string;
+              components: {
+                component?:
+                  | undefined
+                  | {
+                      component: string;
+                      traceLevel: number;
+                    }[];
+              };
+              numberOfTraces?: number | undefined;
+              maxNumberOfTraces?: number | undefined;
+              noContent?: boolean | undefined;
             };
-            numberOfRecords: number;
-            minRecordsTimestamp: string;
-            maxRecordsTimestamp: string;
-            contentSize: number;
-        };
-        originalImportMetadata?: undefined | {
-            originalTraceId: string;
-            originalTraceSystem: string;
-            originalTraceClient: string;
-            originalTraceServer: string;
-            originalTraceUser: string;
-            originalChangeUser: string;
-            originalCreateUser: string;
-            originalHeaderUserAttributeDev: string;
-            originalHeaderTimestamp: string;
-        };
-    };
-} | {
-    records: {
-        record?: undefined | {
-            traceId: string;
-            recordNumber: number;
-            parentNumber?: number | undefined;
-            creationTime: string;
-            traceComponent?: string | undefined;
-            traceObject?: string | undefined;
-            traceProcedure?: string | undefined;
-            traceLevel: number;
-            callStack?: string | undefined;
-            message?: string | undefined;
-            contentType?: string | undefined;
-            hierarchyType?: string | undefined;
-            hierarchyNumber?: number | undefined;
-            hierarchiesLevel?: number | undefined;
-            content?: string | undefined;
-            contentLength?: number | undefined;
-            properties?: undefined | {
-                property?: undefined | {
-                    component: string;
-                    key: string;
-                    value: string;
-                }[];
+        recordsSummary?:
+          | undefined
+          | {
+              componentNames?:
+                | undefined
+                | {
+                    componentName?: undefined | string[];
+                  };
+              numberOfRecords: number;
+              minRecordsTimestamp: string;
+              maxRecordsTimestamp: string;
+              contentSize: number;
             };
-            options?: undefined | {
-                noSensitiveData?: boolean | undefined;
-                callStackOffset?: number | undefined;
-                fullCallStack?: boolean | undefined;
-                highlighting?: string | undefined;
+        originalImportMetadata?:
+          | undefined
+          | {
+              originalTraceId: string;
+              originalTraceSystem: string;
+              originalTraceClient: string;
+              originalTraceServer: string;
+              originalTraceUser: string;
+              originalChangeUser: string;
+              originalCreateUser: string;
+              originalHeaderUserAttributeDev: string;
+              originalHeaderTimestamp: string;
             };
-            processedObjects?: string | undefined;
-        }[];
-    };
-} | {
-    uriMapping: {
+      };
+    }
+  | {
+      records: {
+        record?:
+          | undefined
+          | {
+              traceId: string;
+              recordNumber: number;
+              parentNumber?: number | undefined;
+              creationTime: string;
+              traceComponent?: string | undefined;
+              traceObject?: string | undefined;
+              traceProcedure?: string | undefined;
+              traceLevel: number;
+              callStack?: string | undefined;
+              message?: string | undefined;
+              contentType?: string | undefined;
+              hierarchyType?: string | undefined;
+              hierarchyNumber?: number | undefined;
+              hierarchiesLevel?: number | undefined;
+              content?: string | undefined;
+              contentLength?: number | undefined;
+              properties?:
+                | undefined
+                | {
+                    property?:
+                      | undefined
+                      | {
+                          component: string;
+                          key: string;
+                          value: string;
+                        }[];
+                  };
+              options?:
+                | undefined
+                | {
+                    noSensitiveData?: boolean | undefined;
+                    callStackOffset?: number | undefined;
+                    fullCallStack?: boolean | undefined;
+                    highlighting?: string | undefined;
+                  };
+              processedObjects?: string | undefined;
+            }[];
+      };
+    }
+  | {
+      uriMapping: {
         objectReference: {
-            extension?: undefined | unknown;
-            uri?: string | undefined;
-            parentUri?: string | undefined;
-            type?: string | undefined;
-            name?: string | undefined;
-            packageName?: string | undefined;
-            description?: string | undefined;
+          extension?:
+            | undefined
+            | {
+                [key: string]: unknown;
+              };
+          uri?: string | undefined;
+          parentUri?: string | undefined;
+          type?: string | undefined;
+          name?: string | undefined;
+          packageName?: string | undefined;
+          description?: string | undefined;
         };
+      };
     };
-};
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/transportmanagment.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/transportmanagment.types.ts
index b097c7db0..2052fcea7 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/transportmanagment.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/transportmanagment.types.ts
@@ -6,13 +6,21 @@
  */
 
 export type TransportmanagmentSchema = {
-    root: {
-        workbench: {
-            target?: undefined | {
-                modifiable: {
-                    request?: undefined | {
-                        task?: undefined | {
-                            abap_object?: undefined | {
+  root: {
+    workbench: {
+      target?:
+        | undefined
+        | {
+            modifiable: {
+              request?:
+                | undefined
+                | {
+                    task?:
+                      | undefined
+                      | {
+                          abap_object?:
+                            | undefined
+                            | {
                                 pgmid?: string | undefined;
                                 type?: string | undefined;
                                 name?: string | undefined;
@@ -21,8 +29,10 @@ export type TransportmanagmentSchema = {
                                 dummy_uri?: string | undefined;
                                 obj_info?: string | undefined;
                                 obj_desc?: string | undefined;
-                            }[];
-                            link?: undefined | {
+                              }[];
+                          link?:
+                            | undefined
+                            | {
                                 href: string;
                                 rel?: string | undefined;
                                 type?: string | undefined;
@@ -31,45 +41,55 @@ export type TransportmanagmentSchema = {
                                 length?: number | undefined;
                                 etag?: string | undefined;
                                 _text?: string | undefined;
-                            }[];
-                            number?: string | undefined;
-                            owner?: string | undefined;
-                            desc?: string | undefined;
-                            status?: string | undefined;
-                            uri?: string | undefined;
-                        }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
+                              }[];
+                          number?: string | undefined;
+                          owner?: string | undefined;
+                          desc?: string | undefined;
+                          status?: string | undefined;
+                          uri?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
                         }[];
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
-                        }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
+                    number?: string | undefined;
+                    owner?: string | undefined;
+                    desc?: string | undefined;
                     status?: string | undefined;
-                };
-                relstarted: {
-                    request?: undefined | {
-                        task?: undefined | {
-                            abap_object?: undefined | {
+                    uri?: string | undefined;
+                  }[];
+              status?: string | undefined;
+            };
+            relstarted: {
+              request?:
+                | undefined
+                | {
+                    task?:
+                      | undefined
+                      | {
+                          abap_object?:
+                            | undefined
+                            | {
                                 pgmid?: string | undefined;
                                 type?: string | undefined;
                                 name?: string | undefined;
@@ -78,8 +98,10 @@ export type TransportmanagmentSchema = {
                                 dummy_uri?: string | undefined;
                                 obj_info?: string | undefined;
                                 obj_desc?: string | undefined;
-                            }[];
-                            link?: undefined | {
+                              }[];
+                          link?:
+                            | undefined
+                            | {
                                 href: string;
                                 rel?: string | undefined;
                                 type?: string | undefined;
@@ -88,45 +110,55 @@ export type TransportmanagmentSchema = {
                                 length?: number | undefined;
                                 etag?: string | undefined;
                                 _text?: string | undefined;
-                            }[];
-                            number?: string | undefined;
-                            owner?: string | undefined;
-                            desc?: string | undefined;
-                            status?: string | undefined;
-                            uri?: string | undefined;
-                        }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
+                              }[];
+                          number?: string | undefined;
+                          owner?: string | undefined;
+                          desc?: string | undefined;
+                          status?: string | undefined;
+                          uri?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
                         }[];
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
-                        }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
+                    number?: string | undefined;
+                    owner?: string | undefined;
+                    desc?: string | undefined;
                     status?: string | undefined;
-                };
-                released: {
-                    request?: undefined | {
-                        task?: undefined | {
-                            abap_object?: undefined | {
+                    uri?: string | undefined;
+                  }[];
+              status?: string | undefined;
+            };
+            released: {
+              request?:
+                | undefined
+                | {
+                    task?:
+                      | undefined
+                      | {
+                          abap_object?:
+                            | undefined
+                            | {
                                 pgmid?: string | undefined;
                                 type?: string | undefined;
                                 name?: string | undefined;
@@ -135,8 +167,10 @@ export type TransportmanagmentSchema = {
                                 dummy_uri?: string | undefined;
                                 obj_info?: string | undefined;
                                 obj_desc?: string | undefined;
-                            }[];
-                            link?: undefined | {
+                              }[];
+                          link?:
+                            | undefined
+                            | {
                                 href: string;
                                 rel?: string | undefined;
                                 type?: string | undefined;
@@ -145,223 +179,271 @@ export type TransportmanagmentSchema = {
                                 length?: number | undefined;
                                 etag?: string | undefined;
                                 _text?: string | undefined;
-                            }[];
-                            number?: string | undefined;
-                            owner?: string | undefined;
-                            desc?: string | undefined;
-                            status?: string | undefined;
-                            uri?: string | undefined;
-                        }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
-                        }[];
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
-                        }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
-                    status?: string | undefined;
-                };
-                name?: string | undefined;
-                desc?: string | undefined;
-            }[];
-            modifiable: {
-                request?: undefined | {
-                    task?: undefined | {
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
+                              }[];
+                          number?: string | undefined;
+                          owner?: string | undefined;
+                          desc?: string | undefined;
+                          status?: string | undefined;
+                          uri?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
                         }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
-                        }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
-                    link?: undefined | {
-                        href: string;
-                        rel?: string | undefined;
-                        type?: string | undefined;
-                        hreflang?: string | undefined;
-                        title?: string | undefined;
-                        length?: number | undefined;
-                        etag?: string | undefined;
-                        _text?: string | undefined;
-                    }[];
-                    abap_object?: undefined | {
-                        pgmid?: string | undefined;
-                        type?: string | undefined;
-                        name?: string | undefined;
-                        wbtype?: string | undefined;
-                        uri?: string | undefined;
-                        dummy_uri?: string | undefined;
-                        obj_info?: string | undefined;
-                        obj_desc?: string | undefined;
-                    }[];
                     number?: string | undefined;
                     owner?: string | undefined;
                     desc?: string | undefined;
                     status?: string | undefined;
                     uri?: string | undefined;
-                }[];
-                status?: string | undefined;
+                  }[];
+              status?: string | undefined;
             };
-            relstarted: {
-                request?: undefined | {
-                    task?: undefined | {
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
+            name?: string | undefined;
+            desc?: string | undefined;
+          }[];
+      modifiable: {
+        request?:
+          | undefined
+          | {
+              task?:
+                | undefined
+                | {
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
                         }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
-                        }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
-                    link?: undefined | {
-                        href: string;
-                        rel?: string | undefined;
-                        type?: string | undefined;
-                        hreflang?: string | undefined;
-                        title?: string | undefined;
-                        length?: number | undefined;
-                        etag?: string | undefined;
-                        _text?: string | undefined;
-                    }[];
-                    abap_object?: undefined | {
-                        pgmid?: string | undefined;
-                        type?: string | undefined;
-                        name?: string | undefined;
-                        wbtype?: string | undefined;
-                        uri?: string | undefined;
-                        dummy_uri?: string | undefined;
-                        obj_info?: string | undefined;
-                        obj_desc?: string | undefined;
-                    }[];
                     number?: string | undefined;
                     owner?: string | undefined;
                     desc?: string | undefined;
                     status?: string | undefined;
                     uri?: string | undefined;
-                }[];
-                status?: string | undefined;
-            };
-            released: {
-                request?: undefined | {
-                    task?: undefined | {
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
+                  }[];
+              link?:
+                | undefined
+                | {
+                    href: string;
+                    rel?: string | undefined;
+                    type?: string | undefined;
+                    hreflang?: string | undefined;
+                    title?: string | undefined;
+                    length?: number | undefined;
+                    etag?: string | undefined;
+                    _text?: string | undefined;
+                  }[];
+              abap_object?:
+                | undefined
+                | {
+                    pgmid?: string | undefined;
+                    type?: string | undefined;
+                    name?: string | undefined;
+                    wbtype?: string | undefined;
+                    uri?: string | undefined;
+                    dummy_uri?: string | undefined;
+                    obj_info?: string | undefined;
+                    obj_desc?: string | undefined;
+                  }[];
+              number?: string | undefined;
+              owner?: string | undefined;
+              desc?: string | undefined;
+              status?: string | undefined;
+              uri?: string | undefined;
+            }[];
+        status?: string | undefined;
+      };
+      relstarted: {
+        request?:
+          | undefined
+          | {
+              task?:
+                | undefined
+                | {
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
                         }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
+                    number?: string | undefined;
+                    owner?: string | undefined;
+                    desc?: string | undefined;
+                    status?: string | undefined;
+                    uri?: string | undefined;
+                  }[];
+              link?:
+                | undefined
+                | {
+                    href: string;
+                    rel?: string | undefined;
+                    type?: string | undefined;
+                    hreflang?: string | undefined;
+                    title?: string | undefined;
+                    length?: number | undefined;
+                    etag?: string | undefined;
+                    _text?: string | undefined;
+                  }[];
+              abap_object?:
+                | undefined
+                | {
+                    pgmid?: string | undefined;
+                    type?: string | undefined;
+                    name?: string | undefined;
+                    wbtype?: string | undefined;
+                    uri?: string | undefined;
+                    dummy_uri?: string | undefined;
+                    obj_info?: string | undefined;
+                    obj_desc?: string | undefined;
+                  }[];
+              number?: string | undefined;
+              owner?: string | undefined;
+              desc?: string | undefined;
+              status?: string | undefined;
+              uri?: string | undefined;
+            }[];
+        status?: string | undefined;
+      };
+      released: {
+        request?:
+          | undefined
+          | {
+              task?:
+                | undefined
+                | {
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
                         }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
-                    link?: undefined | {
-                        href: string;
-                        rel?: string | undefined;
-                        type?: string | undefined;
-                        hreflang?: string | undefined;
-                        title?: string | undefined;
-                        length?: number | undefined;
-                        etag?: string | undefined;
-                        _text?: string | undefined;
-                    }[];
-                    abap_object?: undefined | {
-                        pgmid?: string | undefined;
-                        type?: string | undefined;
-                        name?: string | undefined;
-                        wbtype?: string | undefined;
-                        uri?: string | undefined;
-                        dummy_uri?: string | undefined;
-                        obj_info?: string | undefined;
-                        obj_desc?: string | undefined;
-                    }[];
                     number?: string | undefined;
                     owner?: string | undefined;
                     desc?: string | undefined;
                     status?: string | undefined;
                     uri?: string | undefined;
-                }[];
-                status?: string | undefined;
-            };
-            category?: string | undefined;
-        };
-        customizing: {
-            target?: undefined | {
-                modifiable: {
-                    request?: undefined | {
-                        task?: undefined | {
-                            abap_object?: undefined | {
+                  }[];
+              link?:
+                | undefined
+                | {
+                    href: string;
+                    rel?: string | undefined;
+                    type?: string | undefined;
+                    hreflang?: string | undefined;
+                    title?: string | undefined;
+                    length?: number | undefined;
+                    etag?: string | undefined;
+                    _text?: string | undefined;
+                  }[];
+              abap_object?:
+                | undefined
+                | {
+                    pgmid?: string | undefined;
+                    type?: string | undefined;
+                    name?: string | undefined;
+                    wbtype?: string | undefined;
+                    uri?: string | undefined;
+                    dummy_uri?: string | undefined;
+                    obj_info?: string | undefined;
+                    obj_desc?: string | undefined;
+                  }[];
+              number?: string | undefined;
+              owner?: string | undefined;
+              desc?: string | undefined;
+              status?: string | undefined;
+              uri?: string | undefined;
+            }[];
+        status?: string | undefined;
+      };
+      category?: string | undefined;
+    };
+    customizing: {
+      target?:
+        | undefined
+        | {
+            modifiable: {
+              request?:
+                | undefined
+                | {
+                    task?:
+                      | undefined
+                      | {
+                          abap_object?:
+                            | undefined
+                            | {
                                 pgmid?: string | undefined;
                                 type?: string | undefined;
                                 name?: string | undefined;
@@ -370,8 +452,10 @@ export type TransportmanagmentSchema = {
                                 dummy_uri?: string | undefined;
                                 obj_info?: string | undefined;
                                 obj_desc?: string | undefined;
-                            }[];
-                            link?: undefined | {
+                              }[];
+                          link?:
+                            | undefined
+                            | {
                                 href: string;
                                 rel?: string | undefined;
                                 type?: string | undefined;
@@ -380,45 +464,55 @@ export type TransportmanagmentSchema = {
                                 length?: number | undefined;
                                 etag?: string | undefined;
                                 _text?: string | undefined;
-                            }[];
-                            number?: string | undefined;
-                            owner?: string | undefined;
-                            desc?: string | undefined;
-                            status?: string | undefined;
-                            uri?: string | undefined;
+                              }[];
+                          number?: string | undefined;
+                          owner?: string | undefined;
+                          desc?: string | undefined;
+                          status?: string | undefined;
+                          uri?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
                         }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
-                        }[];
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
-                        }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
+                    number?: string | undefined;
+                    owner?: string | undefined;
+                    desc?: string | undefined;
                     status?: string | undefined;
-                };
-                relstarted: {
-                    request?: undefined | {
-                        task?: undefined | {
-                            abap_object?: undefined | {
+                    uri?: string | undefined;
+                  }[];
+              status?: string | undefined;
+            };
+            relstarted: {
+              request?:
+                | undefined
+                | {
+                    task?:
+                      | undefined
+                      | {
+                          abap_object?:
+                            | undefined
+                            | {
                                 pgmid?: string | undefined;
                                 type?: string | undefined;
                                 name?: string | undefined;
@@ -427,8 +521,10 @@ export type TransportmanagmentSchema = {
                                 dummy_uri?: string | undefined;
                                 obj_info?: string | undefined;
                                 obj_desc?: string | undefined;
-                            }[];
-                            link?: undefined | {
+                              }[];
+                          link?:
+                            | undefined
+                            | {
                                 href: string;
                                 rel?: string | undefined;
                                 type?: string | undefined;
@@ -437,45 +533,55 @@ export type TransportmanagmentSchema = {
                                 length?: number | undefined;
                                 etag?: string | undefined;
                                 _text?: string | undefined;
-                            }[];
-                            number?: string | undefined;
-                            owner?: string | undefined;
-                            desc?: string | undefined;
-                            status?: string | undefined;
-                            uri?: string | undefined;
+                              }[];
+                          number?: string | undefined;
+                          owner?: string | undefined;
+                          desc?: string | undefined;
+                          status?: string | undefined;
+                          uri?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
                         }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
-                        }[];
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
-                        }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
+                    number?: string | undefined;
+                    owner?: string | undefined;
+                    desc?: string | undefined;
                     status?: string | undefined;
-                };
-                released: {
-                    request?: undefined | {
-                        task?: undefined | {
-                            abap_object?: undefined | {
+                    uri?: string | undefined;
+                  }[];
+              status?: string | undefined;
+            };
+            released: {
+              request?:
+                | undefined
+                | {
+                    task?:
+                      | undefined
+                      | {
+                          abap_object?:
+                            | undefined
+                            | {
                                 pgmid?: string | undefined;
                                 type?: string | undefined;
                                 name?: string | undefined;
@@ -484,8 +590,10 @@ export type TransportmanagmentSchema = {
                                 dummy_uri?: string | undefined;
                                 obj_info?: string | undefined;
                                 obj_desc?: string | undefined;
-                            }[];
-                            link?: undefined | {
+                              }[];
+                          link?:
+                            | undefined
+                            | {
                                 href: string;
                                 rel?: string | undefined;
                                 type?: string | undefined;
@@ -494,265 +602,317 @@ export type TransportmanagmentSchema = {
                                 length?: number | undefined;
                                 etag?: string | undefined;
                                 _text?: string | undefined;
-                            }[];
-                            number?: string | undefined;
-                            owner?: string | undefined;
-                            desc?: string | undefined;
-                            status?: string | undefined;
-                            uri?: string | undefined;
+                              }[];
+                          number?: string | undefined;
+                          owner?: string | undefined;
+                          desc?: string | undefined;
+                          status?: string | undefined;
+                          uri?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
+                        }[];
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
                         }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
-                        }[];
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
-                        }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
-                    status?: string | undefined;
-                };
-                name?: string | undefined;
-                desc?: string | undefined;
-            }[];
-            modifiable: {
-                request?: undefined | {
-                    task?: undefined | {
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
-                        }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
-                        }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
-                    link?: undefined | {
-                        href: string;
-                        rel?: string | undefined;
-                        type?: string | undefined;
-                        hreflang?: string | undefined;
-                        title?: string | undefined;
-                        length?: number | undefined;
-                        etag?: string | undefined;
-                        _text?: string | undefined;
-                    }[];
-                    abap_object?: undefined | {
-                        pgmid?: string | undefined;
-                        type?: string | undefined;
-                        name?: string | undefined;
-                        wbtype?: string | undefined;
-                        uri?: string | undefined;
-                        dummy_uri?: string | undefined;
-                        obj_info?: string | undefined;
-                        obj_desc?: string | undefined;
-                    }[];
                     number?: string | undefined;
                     owner?: string | undefined;
                     desc?: string | undefined;
                     status?: string | undefined;
                     uri?: string | undefined;
-                }[];
-                status?: string | undefined;
+                  }[];
+              status?: string | undefined;
             };
-            relstarted: {
-                request?: undefined | {
-                    task?: undefined | {
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
-                        }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
+            name?: string | undefined;
+            desc?: string | undefined;
+          }[];
+      modifiable: {
+        request?:
+          | undefined
+          | {
+              task?:
+                | undefined
+                | {
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
                         }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
-                    link?: undefined | {
-                        href: string;
-                        rel?: string | undefined;
-                        type?: string | undefined;
-                        hreflang?: string | undefined;
-                        title?: string | undefined;
-                        length?: number | undefined;
-                        etag?: string | undefined;
-                        _text?: string | undefined;
-                    }[];
-                    abap_object?: undefined | {
-                        pgmid?: string | undefined;
-                        type?: string | undefined;
-                        name?: string | undefined;
-                        wbtype?: string | undefined;
-                        uri?: string | undefined;
-                        dummy_uri?: string | undefined;
-                        obj_info?: string | undefined;
-                        obj_desc?: string | undefined;
-                    }[];
                     number?: string | undefined;
                     owner?: string | undefined;
                     desc?: string | undefined;
                     status?: string | undefined;
                     uri?: string | undefined;
-                }[];
-                status?: string | undefined;
-            };
-            released: {
-                request?: undefined | {
-                    task?: undefined | {
-                        abap_object?: undefined | {
-                            pgmid?: string | undefined;
-                            type?: string | undefined;
-                            name?: string | undefined;
-                            wbtype?: string | undefined;
-                            uri?: string | undefined;
-                            dummy_uri?: string | undefined;
-                            obj_info?: string | undefined;
-                            obj_desc?: string | undefined;
-                        }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
+                  }[];
+              link?:
+                | undefined
+                | {
+                    href: string;
+                    rel?: string | undefined;
+                    type?: string | undefined;
+                    hreflang?: string | undefined;
+                    title?: string | undefined;
+                    length?: number | undefined;
+                    etag?: string | undefined;
+                    _text?: string | undefined;
+                  }[];
+              abap_object?:
+                | undefined
+                | {
+                    pgmid?: string | undefined;
+                    type?: string | undefined;
+                    name?: string | undefined;
+                    wbtype?: string | undefined;
+                    uri?: string | undefined;
+                    dummy_uri?: string | undefined;
+                    obj_info?: string | undefined;
+                    obj_desc?: string | undefined;
+                  }[];
+              number?: string | undefined;
+              owner?: string | undefined;
+              desc?: string | undefined;
+              status?: string | undefined;
+              uri?: string | undefined;
+            }[];
+        status?: string | undefined;
+      };
+      relstarted: {
+        request?:
+          | undefined
+          | {
+              task?:
+                | undefined
+                | {
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
                         }[];
-                        number?: string | undefined;
-                        owner?: string | undefined;
-                        desc?: string | undefined;
-                        status?: string | undefined;
-                        uri?: string | undefined;
-                    }[];
-                    link?: undefined | {
-                        href: string;
-                        rel?: string | undefined;
-                        type?: string | undefined;
-                        hreflang?: string | undefined;
-                        title?: string | undefined;
-                        length?: number | undefined;
-                        etag?: string | undefined;
-                        _text?: string | undefined;
-                    }[];
-                    abap_object?: undefined | {
-                        pgmid?: string | undefined;
-                        type?: string | undefined;
-                        name?: string | undefined;
-                        wbtype?: string | undefined;
-                        uri?: string | undefined;
-                        dummy_uri?: string | undefined;
-                        obj_info?: string | undefined;
-                        obj_desc?: string | undefined;
-                    }[];
                     number?: string | undefined;
                     owner?: string | undefined;
                     desc?: string | undefined;
                     status?: string | undefined;
                     uri?: string | undefined;
-                }[];
-                status?: string | undefined;
-            };
-            category?: string | undefined;
-        };
-        releasereports: {
-            checkReport?: undefined | {
-                checkMessageList?: undefined | {
-                    checkMessage?: undefined | {
-                        t100Key?: undefined | {
-                            msgno?: number | undefined;
-                            msgid?: string | undefined;
-                            msgv1?: string | undefined;
-                            msgv2?: string | undefined;
-                            msgv3?: string | undefined;
-                            msgv4?: string | undefined;
-                        };
-                        correctionHint?: undefined | {
-                            number?: number | undefined;
-                            kind?: string | undefined;
-                            line?: number | undefined;
-                            column?: number | undefined;
-                            word?: string | undefined;
-                        }[];
-                        link?: undefined | {
-                            href: string;
-                            rel?: string | undefined;
-                            type?: string | undefined;
-                            hreflang?: string | undefined;
-                            title?: string | undefined;
-                            length?: number | undefined;
-                            etag?: string | undefined;
-                            _text?: string | undefined;
+                  }[];
+              link?:
+                | undefined
+                | {
+                    href: string;
+                    rel?: string | undefined;
+                    type?: string | undefined;
+                    hreflang?: string | undefined;
+                    title?: string | undefined;
+                    length?: number | undefined;
+                    etag?: string | undefined;
+                    _text?: string | undefined;
+                  }[];
+              abap_object?:
+                | undefined
+                | {
+                    pgmid?: string | undefined;
+                    type?: string | undefined;
+                    name?: string | undefined;
+                    wbtype?: string | undefined;
+                    uri?: string | undefined;
+                    dummy_uri?: string | undefined;
+                    obj_info?: string | undefined;
+                    obj_desc?: string | undefined;
+                  }[];
+              number?: string | undefined;
+              owner?: string | undefined;
+              desc?: string | undefined;
+              status?: string | undefined;
+              uri?: string | undefined;
+            }[];
+        status?: string | undefined;
+      };
+      released: {
+        request?:
+          | undefined
+          | {
+              task?:
+                | undefined
+                | {
+                    abap_object?:
+                      | undefined
+                      | {
+                          pgmid?: string | undefined;
+                          type?: string | undefined;
+                          name?: string | undefined;
+                          wbtype?: string | undefined;
+                          uri?: string | undefined;
+                          dummy_uri?: string | undefined;
+                          obj_info?: string | undefined;
+                          obj_desc?: string | undefined;
+                        }[];
+                    link?:
+                      | undefined
+                      | {
+                          href: string;
+                          rel?: string | undefined;
+                          type?: string | undefined;
+                          hreflang?: string | undefined;
+                          title?: string | undefined;
+                          length?: number | undefined;
+                          etag?: string | undefined;
+                          _text?: string | undefined;
                         }[];
+                    number?: string | undefined;
+                    owner?: string | undefined;
+                    desc?: string | undefined;
+                    status?: string | undefined;
+                    uri?: string | undefined;
+                  }[];
+              link?:
+                | undefined
+                | {
+                    href: string;
+                    rel?: string | undefined;
+                    type?: string | undefined;
+                    hreflang?: string | undefined;
+                    title?: string | undefined;
+                    length?: number | undefined;
+                    etag?: string | undefined;
+                    _text?: string | undefined;
+                  }[];
+              abap_object?:
+                | undefined
+                | {
+                    pgmid?: string | undefined;
+                    type?: string | undefined;
+                    name?: string | undefined;
+                    wbtype?: string | undefined;
+                    uri?: string | undefined;
+                    dummy_uri?: string | undefined;
+                    obj_info?: string | undefined;
+                    obj_desc?: string | undefined;
+                  }[];
+              number?: string | undefined;
+              owner?: string | undefined;
+              desc?: string | undefined;
+              status?: string | undefined;
+              uri?: string | undefined;
+            }[];
+        status?: string | undefined;
+      };
+      category?: string | undefined;
+    };
+    releasereports: {
+      checkReport?:
+        | undefined
+        | {
+            checkMessageList?:
+              | undefined
+              | {
+                  checkMessage?:
+                    | undefined
+                    | {
+                        t100Key?:
+                          | undefined
+                          | {
+                              msgno?: number | undefined;
+                              msgid?: string | undefined;
+                              msgv1?: string | undefined;
+                              msgv2?: string | undefined;
+                              msgv3?: string | undefined;
+                              msgv4?: string | undefined;
+                            };
+                        correctionHint?:
+                          | undefined
+                          | {
+                              number?: number | undefined;
+                              kind?: string | undefined;
+                              line?: number | undefined;
+                              column?: number | undefined;
+                              word?: string | undefined;
+                            }[];
+                        link?:
+                          | undefined
+                          | {
+                              href: string;
+                              rel?: string | undefined;
+                              type?: string | undefined;
+                              hreflang?: string | undefined;
+                              title?: string | undefined;
+                              length?: number | undefined;
+                              etag?: string | undefined;
+                              _text?: string | undefined;
+                            }[];
                         uri?: string | undefined;
                         type?: undefined | unknown;
                         shortText?: string | undefined;
                         category?: string | undefined;
                         code?: string | undefined;
-                    }[];
+                      }[];
                 };
-                reporter?: string | undefined;
-                triggeringUri?: string | undefined;
-                status?: string | undefined;
-                statusText?: string | undefined;
-            }[];
-        };
-        targetuser?: string | undefined;
-        useraction?: string | undefined;
-        releasetimestamp?: string | undefined;
-        releaseobjlock?: string | undefined;
-        number?: string | undefined;
-        desc?: string | undefined;
-        uri?: string | undefined;
+            reporter?: string | undefined;
+            triggeringUri?: string | undefined;
+            status?: string | undefined;
+            statusText?: string | undefined;
+          }[];
     };
+    targetuser?: string | undefined;
+    useraction?: string | undefined;
+    releasetimestamp?: string | undefined;
+    releaseobjlock?: string | undefined;
+    number?: string | undefined;
+    desc?: string | undefined;
+    uri?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/src/schemas/generated/types/sap/transportsearch.types.ts b/packages/adt-schemas/src/schemas/generated/types/sap/transportsearch.types.ts
index e07fbf815..c5105c0da 100644
--- a/packages/adt-schemas/src/schemas/generated/types/sap/transportsearch.types.ts
+++ b/packages/adt-schemas/src/schemas/generated/types/sap/transportsearch.types.ts
@@ -6,8 +6,8 @@
  */
 
 export type TransportsearchSchema = {
-    searchresults: {
-        requests?: string | undefined;
-        tasks?: string | undefined;
-    };
+  searchresults: {
+    requests?: string | undefined;
+    tasks?: string | undefined;
+  };
 };
diff --git a/packages/adt-schemas/tests/scenarios/atc.test.ts b/packages/adt-schemas/tests/scenarios/atc.test.ts
index d8d97a249..db97a62d6 100644
--- a/packages/adt-schemas/tests/scenarios/atc.test.ts
+++ b/packages/adt-schemas/tests/scenarios/atc.test.ts
@@ -1,13 +1,14 @@
 import { expect } from 'vitest';
 import { fixtures } from '@abapify/adt-fixtures';
 import { Scenario, runScenario } from './base/scenario';
-import { atc, atcworklist } from '../../src/schemas/index';
+import { atc, atcworklist, chkvFormTemplate } from '../../src/schemas/index';
 import type { InferTypedSchema } from '@abapify/ts-xsd';
 
 // Extract types from schemas using ts-xsd's official type extractor
 // Generated types now match parse() behavior - content directly without wrapper
 type AtcCustomizing = InferTypedSchema<typeof atc>;
 type AtcWorklist = InferTypedSchema<typeof atcworklist>;
+type ChkvFormTemplate = InferTypedSchema<typeof chkvFormTemplate>;
 
 /**
  * Test for ATC customizing response
@@ -143,6 +144,106 @@ class AtcWorklistScenario extends Scenario<typeof atcworklist> {
   }
 }
 
+/**
+ * Test for ATC check variant form template response
+ * GET /sap/bc/adt/atc/checkvariants/formtemplate?chkvName={name}
+ *
+ * The form template is the check catalog: each available check category
+ * lists its checks, and each check's implementingClass name is the checkId
+ * that ATC worklist findings carry (the basis for check category
+ * enrichment).
+ */
+class ChkvFormTemplateScenario extends Scenario<typeof chkvFormTemplate> {
+  readonly schema = chkvFormTemplate;
+  readonly fixtures = [fixtures.atc.formtemplate];
+
+  validateParsed(data: ChkvFormTemplate): void {
+    const formTemplate = (data as any).formTemplate;
+    expect(formTemplate).toBeDefined();
+
+    const categories =
+      formTemplate.availableCheckCategories?.availableCheckCategory;
+    expect(categories).toBeDefined();
+    expect(categories?.length).toBeGreaterThanOrEqual(2);
+
+    // Category objects carry name + description and a CHKC/TYP typed content
+    const performance = categories?.find(
+      (c: any) => c.checkCategoryObject?.name === 'CI_PERFORMANCE',
+    );
+    expect(performance).toBeDefined();
+    expect(performance?.checkCategoryObject?.description).toBe('Performance');
+    expect(performance?.checkCategoryObject?.content?.category?.type).toBe(
+      'CHKC/TYP',
+    );
+
+    // Checks carry the implementing class (the finding checkId) and their
+    // category assignment
+    const checks = performance?.check ?? [];
+    expect(checks.length).toBeGreaterThanOrEqual(2);
+    const analyzeWhere = checks.find(
+      (c: any) => c.checkObject?.name === 'CI_ANALYZE_WHERE',
+    );
+    expect(analyzeWhere).toBeDefined();
+    expect(analyzeWhere?.checkObject?.content?.category?.name).toBe(
+      'CI_PERFORMANCE',
+    );
+    expect(analyzeWhere?.checkObject?.content?.implementingClass?.name).toBe(
+      'CL_CI_TEST_SELECT_TAW_A',
+    );
+    expect(analyzeWhere?.checkObject?.content?.remoteEnabled).toBe(true);
+
+    // Check parameters are optional and keep their real shape
+    const parameters =
+      analyzeWhere?.checkObject?.content?.parameters?.parameter ?? [];
+    expect(parameters.length).toBeGreaterThan(0);
+    const noWhere = parameters.find(
+      (p: any) => p.parameterName === 'NoWhereCondition',
+    );
+    expect(noWhere).toBeDefined();
+    expect(noWhere?.parameterDescription).toBe('No WHERE condition');
+    expect(noWhere?.parameterModifiable).toBe(true);
+
+    // A check without parameters still parses (parameters optional)
+    const bybuf = checks.find(
+      (c: any) => c.checkObject?.name === 'CI_SELECT_TAW_BYBUF',
+    );
+    expect(bybuf).toBeDefined();
+    expect(bybuf?.checkObject?.content?.parameters).toBeUndefined();
+
+    // Documentation links are kept on each check
+    const links = analyzeWhere?.link ?? [];
+    expect(
+      links.some(
+        (l: any) => l.rel === 'http://www.sap.com/adt/relations/documentation',
+      ),
+    ).toBe(true);
+
+    // Sanitized custom category survives with its sanitized names
+    const custom = categories?.find(
+      (c: any) => c.checkCategoryObject?.name === 'ZEXAMPLE_CI_CATEGORY',
+    );
+    expect(custom).toBeDefined();
+    expect(custom?.checkCategoryObject?.description).toBe(
+      'Example custom category',
+    );
+    expect(custom?.check?.[0]?.checkObject?.content?.category?.name).toBe(
+      'ZEXAMPLE_CI_CATEGORY',
+    );
+  }
+
+  override validateBuilt(xml: string): void {
+    expect(xml).toContain(
+      'xmlns:chkvFormTemplate="http://www.sap.com/wbobj/atc/chkvFormTemplate"',
+    );
+    // Local elements are built unqualified (form="unqualified"); match the
+    // element name without assuming the wire prefix form.
+    expect(xml).toContain('<availableCheckCategories>');
+    expect(xml).toContain('CL_CI_TEST_SELECT_TAW_A');
+    expect(xml).toContain('CI_PERFORMANCE');
+  }
+}
+
 // Run all ATC scenarios
 runScenario(new AtcCustomizingScenario());
 runScenario(new AtcWorklistScenario());
+runScenario(new ChkvFormTemplateScenario());
diff --git a/packages/adt-schemas/ts-xsd.config.ts b/packages/adt-schemas/ts-xsd.config.ts
index aa8b7fdde..d32d54c7f 100644
--- a/packages/adt-schemas/ts-xsd.config.ts
+++ b/packages/adt-schemas/ts-xsd.config.ts
@@ -94,6 +94,7 @@ const targetSchemas = [
   'custom/acoverageResult',
   'custom/acoverageStatements',
   'custom/badi', // BAdI / Enhancement Implementation (ENHO) wrapper
+  'custom/chkvFormTemplate', // ATC check variant form template (check catalog: checkId -> category)
 ];
 
 export default defineConfig({
diff --git a/packages/adt-server/package.json b/packages/adt-server/package.json
index c1249ac28..eb1a5fc8f 100644
--- a/packages/adt-server/package.json
+++ b/packages/adt-server/package.json
@@ -22,6 +22,7 @@
   ],
   "dependencies": {
     "@abapify/adt-client": "0.4.20",
+    "@abapify/adt-atc": "0.4.20",
     "@abapify/adt-mcp": "0.4.20",
     "@abapify/adt-services": "0.4.20",
     "yaml": "^2.8.2",
diff --git a/packages/adt-server/src/broker.ts b/packages/adt-server/src/broker.ts
index 6956c6eac..d4297d34d 100644
--- a/packages/adt-server/src/broker.ts
+++ b/packages/adt-server/src/broker.ts
@@ -9,6 +9,11 @@ import {
   type AdtClient,
 } from '@abapify/adt-client';
 import { ExactSourceHistoryService, BadiService } from '@abapify/adt-services';
+import {
+  fetchCheckCategoryIndex,
+  enrichFindingsWithCategories,
+  resolveCategoriesViaDocumentation,
+} from '@abapify/adt-atc';
 import type {
   DestinationContextFactory,
   DestinationLeaseProvider,
@@ -151,6 +156,11 @@ interface TransportDetail extends TransportSummary {
 type CanonicalAtcFinding = {
   checkId: string;
   checkTitle: string;
+  /**
+   * Check category name (e.g., 'CI_PERFORMANCE') from the run's check
+   * variant form template. Absent when enrichment is unavailable.
+   */
+  checkCategory?: string;
   messageText: string;
   priority: number;
   objectType: string;
@@ -1418,9 +1428,25 @@ export function createHttpBrokerOperations(
         const worklist = await client.adt.atc.worklists.get(worklistId, {
           includeExemptedFindings: 'false',
         });
+        const findings = toCanonicalAtcFindings(worklist);
+        // Enrich findings with check categories from the run's check
+        // variant form template (best-effort: never fails the run). Live
+        // worklist checkIds are GUIDs, so unresolved findings go through
+        // the documentation bridge (each finding's documentation page names
+        // the check class).
+        const categoryIndex = await fetchCheckCategoryIndex(
+          client,
+          checkVariant,
+        );
+        enrichFindingsWithCategories(findings, categoryIndex);
+        await resolveCategoriesViaDocumentation(
+          client,
+          findings,
+          categoryIndex,
+        );
         return {
           checkVariant,
-          findings: toCanonicalAtcFindings(worklist),
+          findings,
         };
       });
     },
diff --git a/packages/adt-server/src/rest-schemas.ts b/packages/adt-server/src/rest-schemas.ts
index cf7467100..8a7820143 100644
--- a/packages/adt-server/src/rest-schemas.ts
+++ b/packages/adt-server/src/rest-schemas.ts
@@ -532,6 +532,7 @@ export const atcFindingResponse = z
   .object({
     checkId: z.string().max(256),
     checkTitle: z.string().max(1_024),
+    checkCategory: z.string().trim().min(1).max(256).optional(),
     messageText: z.string().max(8 * 1_024),
     priority: z.number().int().min(1).max(99),
     objectType: objectTypePathParameter,
diff --git a/packages/adt-server/tests/broker.test.ts b/packages/adt-server/tests/broker.test.ts
index e4eeade6d..12ca20fcf 100644
--- a/packages/adt-server/tests/broker.test.ts
+++ b/packages/adt-server/tests/broker.test.ts
@@ -1258,6 +1258,262 @@ test('runs ATC from a canonical package scope and retains only the trusted docum
   }
 });
 
+test('enriches ATC findings with check categories from the variant form template', async () => {
+  const directory = await mkdtemp(path.join(os.tmpdir(), 'adt-server-broker-'));
+  const documentationReads: string[] = [];
+  const tokenFile = path.join(directory, 'broker-token');
+  await writeFile(tokenFile, 'sidecar-token\n', 'utf8');
+  const formtemplateCalls: unknown[] = [];
+  const operations = createHttpBrokerOperations({
+    baseUrl: 'http://adt-api.internal',
+    tokenFile,
+    fetch: async (input) => {
+      if (String(input).endsWith(':acquire')) {
+        return new Response(
+          JSON.stringify({
+            leaseId: 'ffffffff-ffff-4fff-8fff-ffffffffffff',
+            destination: 'dev',
+            version: 1,
+            expiresAt: '2026-07-20T00:00:00.000Z',
+            connection: {
+              baseUrl: 'https://sap.example.test',
+              sapClient: null,
+              authMethod: 'basic',
+              authConfig: { username: 'service', password: 'secret' },
+            },
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      return new Response(null, { status: 204 });
+    },
+    createClient: async () =>
+      ({
+        adt: {
+          atc: {
+            customizing: {
+              async get() {
+                return { customizing: { properties: { property: [] } } };
+              },
+            },
+            worklists: {
+              async create(value: unknown) {
+                return { worklist: { id: 'worklist-1' } };
+              },
+              async get() {
+                return {
+                  worklist: {
+                    objects: {
+                      object: [
+                        {
+                          uri: '/sap/bc/adt/oo/classes/zcl_safe',
+                          type: 'CLAS',
+                          name: 'ZCL_SAFE',
+                          findings: {
+                            finding: [
+                              {
+                                uri: '/sap/bc/adt/atc/findings/itemid/ABC/index/1',
+                                priority: '2',
+                                checkId: 'SCI',
+                                checkTitle: 'Safe check',
+                                messageTitle: 'Avoid unsafe access',
+                                location:
+                                  '/sap/bc/adt/oo/classes/zcl_safe/source/main?start=12',
+                              },
+                              {
+                                uri: '/sap/bc/adt/atc/findings/itemid/ABC/index/2',
+                                priority: '2',
+                                checkId: 'UNKNOWN_IMPL',
+                                checkTitle: 'Uncatalogued check',
+                                messageTitle: 'Outside the catalog',
+                                location:
+                                  '/sap/bc/adt/oo/classes/zcl_safe/source/main?start=20',
+                              },
+                              {
+                                uri: '/sap/bc/adt/atc/findings/itemid/DEF/index/1',
+                                priority: '2',
+                                checkId: '6A277D3B1C4E4F80A9B2C3D4E5F60718',
+                                checkTitle: 'Guid check',
+                                messageTitle: 'Guid-shaped checkId',
+                                location:
+                                  '/sap/bc/adt/oo/classes/zcl_safe/source/main?start=30',
+                                link: [
+                                  {
+                                    rel: 'http://www.sap.com/adt/relations/documentation',
+                                    href: '/sap/bc/adt/documentation/atc/documents/itemid/DEF/index/1',
+                                  },
+                                ],
+                              },
+                            ],
+                          },
+                        },
+                      ],
+                    },
+                  },
+                };
+              },
+            },
+            runs: {
+              async post() {
+                return undefined;
+              },
+            },
+            checkvariants: {
+              async formtemplate(params: unknown) {
+                formtemplateCalls.push(params);
+                return {
+                  formTemplate: {
+                    availableCheckCategories: {
+                      availableCheckCategory: [
+                        {
+                          checkCategoryObject: {
+                            name: 'CI_PERFORMANCE',
+                            description: 'Performance',
+                          },
+                          check: [
+                            {
+                              checkObject: {
+                                name: 'CI_ANALYZE_WHERE',
+                                content: {
+                                  category: { name: 'CI_PERFORMANCE' },
+                                  implementingClass: { name: 'SCI' },
+                                },
+                              },
+                            },
+                          ],
+                        },
+                      ],
+                    },
+                  },
+                };
+              },
+            },
+          },
+        },
+        async readTextBounded(uri: string) {
+          documentationReads.push(uri);
+          // The GUID finding's page names the catalogued class; the
+          // uncatalogued finding's page names a class outside the catalog
+          const checkClass = uri.endsWith('/DEF/index/1')
+            ? 'SCI'
+            : 'CL_UNCATALOGUED_IMPL';
+          return `<h3>Appl. Comp. Check / Check Class / Message Code</h3><p>BC-ABA-LA / ${checkClass} / 0501</p>`;
+        },
+      }) as never,
+  });
+
+  try {
+    const result = await operations.runAtc!({
+      destination: 'dev',
+      scope: { kind: 'package', packageName: '$TEST' },
+    });
+
+    // The catalogued check gains its category directly; the uncatalogued
+    // one keeps none; the GUID-checkId finding gains its category through
+    // the documentation bridge
+    assert.ok(result.findings[0]!.checkCategory === 'CI_PERFORMANCE');
+    assert.ok(result.findings[1]!.checkCategory === undefined);
+    assert.ok(result.findings[2]!.checkCategory === 'CI_PERFORMANCE');
+    // The form template is fetched for the run's resolved variant
+    assert.deepStrictEqual(formtemplateCalls, [{ chkvName: 'DEFAULT' }]);
+  } finally {
+    await rm(directory, { recursive: true, force: true });
+  }
+});
+
+test('runs ATC with unavailable check categories without failing the run', async () => {
+  const directory = await mkdtemp(path.join(os.tmpdir(), 'adt-server-broker-'));
+  const tokenFile = path.join(directory, 'broker-token');
+  await writeFile(tokenFile, 'sidecar-token\n', 'utf8');
+  const operations = createHttpBrokerOperations({
+    baseUrl: 'http://adt-api.internal',
+    tokenFile,
+    fetch: async (input) => {
+      if (String(input).endsWith(':acquire')) {
+        return new Response(
+          JSON.stringify({
+            leaseId: 'abababab-abab-4bab-8bab-abababababab',
+            destination: 'dev',
+            version: 1,
+            expiresAt: '2026-07-20T00:00:00.000Z',
+            connection: {
+              baseUrl: 'https://sap.example.test',
+              sapClient: null,
+              authMethod: 'basic',
+              authConfig: { username: 'service', password: 'secret' },
+            },
+          }),
+          { status: 200, headers: { 'content-type': 'application/json' } },
+        );
+      }
+      return new Response(null, { status: 204 });
+    },
+    createClient: async () =>
+      ({
+        adt: {
+          atc: {
+            customizing: {
+              async get() {
+                return { customizing: { properties: { property: [] } } };
+              },
+            },
+            worklists: {
+              async create() {
+                return { worklist: { id: 'worklist-1' } };
+              },
+              async get() {
+                return {
+                  worklist: {
+                    objects: {
+                      object: [
+                        {
+                          uri: '/sap/bc/adt/oo/classes/zcl_safe',
+                          type: 'CLAS',
+                          name: 'ZCL_SAFE',
+                          findings: {
+                            finding: [
+                              {
+                                uri: '/sap/bc/adt/atc/findings/itemid/ABC/index/1',
+                                priority: '2',
+                                checkId: 'SCI',
+                                checkTitle: 'Safe check',
+                                messageTitle: 'Avoid unsafe access',
+                                location:
+                                  '/sap/bc/adt/oo/classes/zcl_safe/source/main?start=12',
+                              },
+                            ],
+                          },
+                        },
+                      ],
+                    },
+                  },
+                };
+              },
+            },
+            runs: {
+              async post() {
+                return undefined;
+              },
+            },
+            // No checkvariants surface: enrichment must degrade to a no-op
+          },
+        },
+      }) as never,
+  });
+
+  try {
+    const result = await operations.runAtc!({
+      destination: 'dev',
+      scope: { kind: 'package', packageName: '$TEST' },
+    });
+
+    assert.ok(result.findings.length === 1);
+    assert.ok(result.findings[0]!.checkCategory === undefined);
+  } finally {
+    await rm(directory, { recursive: true, force: true });
+  }
+});
+
 test('reads trusted ATC documentation through the bounded text primitive', async () => {
   const directory = await mkdtemp(path.join(os.tmpdir(), 'adt-server-broker-'));
   const tokenFile = path.join(directory, 'broker-token');