diff --git a/src/Xml/Writer.php b/src/Xml/Writer.php
index 31323f4a1..6a5103880 100644
--- a/src/Xml/Writer.php
+++ b/src/Xml/Writer.php
@@ -8,7 +8,6 @@ declare(strict_types=1);
 
 namespace App\Xml;
 
-use RuntimeException;
 use XMLWriter;
 
 final class Writer
@@ -29,9 +28,6 @@ final class Writer
 
         $writer->startElement($baseElement);
 
-        // Make sure attributes come first
-        uksort($config, [self::class, 'attributesFirst']);
-
         foreach ($config as $sectionName => $data) {
             if (!is_array($data)) {
                 if (str_starts_with($sectionName, '@')) {
@@ -55,54 +51,50 @@ final class Writer
         array $config,
         XMLWriter $writer
     ): void {
-        $branchType = null;
-
-        // Ensure attributes come first.
-        uksort($config, [self::class, 'attributesFirst']);
+        $attributes = [];
+        $innerText = null;
 
         foreach ($config as $key => $value) {
-            if ($branchType === null) {
-                if (is_numeric($key)) {
-                    $branchType = 'numeric';
-                } else {
-                    $writer->startElement($branchName);
-                    $branchType = 'string';
+            if (str_starts_with((string)$key, '@')) {
+                $attributes[substr($key, 1)] = (string)$value;
+                unset($config[$key]);
+            } else {
+                if ('_' === $key) {
+                    $innerText = (string)$value;
+                    unset($config[$key]);
                 }
-            } elseif ($branchType !== (is_numeric($key) ? 'numeric' : 'string')) {
-                throw new RuntimeException('Mixing of string and numeric keys is not allowed');
             }
+        }
 
-            if ($branchType === 'numeric') {
+        if (0 !== count($config) && array_is_list($config)) {
+            foreach ($config as $value) {
                 if (is_array($value)) {
                     self::addBranch($branchName, $value, $writer);
                 } else {
                     $writer->writeElement($branchName, (string)$value);
                 }
-            } else {
+            }
+        } else {
+            $writer->startElement($branchName);
+
+            foreach ($attributes as $attrKey => $attrVal) {
+                $writer->writeAttribute($attrKey, $attrVal);
+            }
+
+            if (null !== $innerText) {
+                $writer->text($innerText);
+            }
+
+            foreach ($config as $key => $value) {
                 /** @var string $key */
                 if (is_array($value)) {
                     self::addBranch($key, $value, $writer);
-                } elseif (str_starts_with($key, '@')) {
-                    $writer->writeAttribute(substr($key, 1), (string)$value);
                 } else {
                     $writer->writeElement($key, (string)$value);
                 }
             }
-        }
 
-        if ($branchType === 'string') {
             $writer->endElement();
         }
     }
-
-    private static function attributesFirst(mixed $a, mixed $b): int
-    {
-        if (str_starts_with((string)$a, '@')) {
-            return -1;
-        }
-        if (str_starts_with((string)$b, '@')) {
-            return 1;
-        }
-        return 0;
-    }
 }