diff --git a/CHANGELOG.md b/CHANGELOG.md
index db861be..1833f6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,12 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+## [6.1.0] 2026-10-22
+
+- Adding children information to Attachment SBSYS
+- os2forms_webform_maps translation page fix
+- Upgrading Gin theme versions
+
 ## [6.0.0] 2026-09-30
 
 - [PR-346](https://github.com/OS2Forms/os2forms/pull/346)
diff --git a/composer.json b/composer.json
index 00a0560..171c936 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "drupal/entity_print": "^2.1",
         "drupal/eu_cookie_compliance": "^1.8",
         "drupal/events_logging": "^2.0@beta",
-        "drupal/gin": "^3.0-rc",
+        "drupal/gin": "^4.0 || ^5.0",
         "drupal/honeypot": "^2.0",
         "drupal/ldap": "^4.2",
         "drupal/leaflet": "^10.0",
diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/MitidChildElementBase.php b/modules/os2forms_nemid/src/Plugin/WebformElement/MitidChildElementBase.php
index fbdd7dc..79d78cc 100644
--- a/modules/os2forms_nemid/src/Plugin/WebformElement/MitidChildElementBase.php
+++ b/modules/os2forms_nemid/src/Plugin/WebformElement/MitidChildElementBase.php
@@ -12,7 +12,7 @@
  * @see \Drupal\webform\Plugin\WebformElementInterface
  * @see \Drupal\webform\Annotation\WebformElement
  */
-abstract class MitidChildElementBase extends WebformElementBase {
+abstract class MitidChildElementBase extends WebformElementBase implements NemidChildElementInterface {
 
   /**
    * {@inheritdoc}
diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildElementInterface.php b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildElementInterface.php
new file mode 100644
index 0000000..967b3c7
--- /dev/null
+++ b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildElementInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\os2forms_nemid\Plugin\WebformElement;
+
+/**
+ * Marks child-related Webform elements that provide one submission value.
+ */
+interface NemidChildElementInterface {
+
+}
diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildrenRadios.php b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildrenRadios.php
index 489de90..b220c8e 100644
--- a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildrenRadios.php
+++ b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildrenRadios.php
@@ -20,7 +20,7 @@
  * @see \Drupal\os2forms_nemid\Plugin\NemidElementBase
  * @see \Drupal\os2forms_nemid\Element\NemidChildrenRadios
  */
-class NemidChildrenRadios extends Radios implements NemidElementPersonalInterface, NemidPrepopulateFieldInterface {
+class NemidChildrenRadios extends Radios implements NemidElementPersonalInterface, NemidPrepopulateFieldInterface, NemidChildElementInterface {
 
   /**
    * {@inheritdoc}
diff --git a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildrenSelect.php b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildrenSelect.php
index b7d36b9..18b3144 100644
--- a/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildrenSelect.php
+++ b/modules/os2forms_nemid/src/Plugin/WebformElement/NemidChildrenSelect.php
@@ -20,7 +20,7 @@
  * @see \Drupal\os2forms_nemid\Plugin\NemidElementBase
  * @see \Drupal\os2forms_nemid\Element\NemidChildrenRadios
  */
-class NemidChildrenSelect extends Select implements NemidElementPersonalInterface, NemidPrepopulateFieldInterface {
+class NemidChildrenSelect extends Select implements NemidElementPersonalInterface, NemidPrepopulateFieldInterface, NemidChildElementInterface {
 
   /**
    * {@inheritdoc}
diff --git a/modules/os2forms_sbsys/src/Element/WebformAttachmentSbsysXml.php b/modules/os2forms_sbsys/src/Element/WebformAttachmentSbsysXml.php
index b5a9db6..6f5374c 100644
--- a/modules/os2forms_sbsys/src/Element/WebformAttachmentSbsysXml.php
+++ b/modules/os2forms_sbsys/src/Element/WebformAttachmentSbsysXml.php
@@ -271,6 +271,10 @@ protected static function getWebformElementsAsList(WebformSubmissionInterface $w
    *   Element configuration value
    */
   public static function getConfigurationValue($name, array $config, WebformSubmissionInterface $webform_submission) {
+    if (!isset($config[$name])) {
+      return '';
+    }
+
     if ($config[$name] == 'default_nemid_value') {
       return 'default_nemid_value';
     }
diff --git a/modules/os2forms_sbsys/src/Plugin/WebformElement/WebformAttachmentSbsysXml.php b/modules/os2forms_sbsys/src/Plugin/WebformElement/WebformAttachmentSbsysXml.php
index 4fde772..739ad56 100644
--- a/modules/os2forms_sbsys/src/Plugin/WebformElement/WebformAttachmentSbsysXml.php
+++ b/modules/os2forms_sbsys/src/Plugin/WebformElement/WebformAttachmentSbsysXml.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\os2forms\Plugin\WebformElement\WebformAttachmentXml;
+use Drupal\os2forms_nemid\Plugin\WebformElement\NemidChildElementInterface;
 use Drupal\os2forms_nemid\Plugin\WebformElement\NemidElementBase;
 use Drupal\webform\Plugin\WebformElement\DateBase;
 use Drupal\webform\Plugin\WebformElement\TextBase;
@@ -123,7 +124,11 @@ public function form(array $form, FormStateInterface $form_state) {
       }
 
       // Skipping if is of type we do not support.
-      if (!$elementInstance instanceof TextBase && !$elementInstance instanceof NemidElementBase && !$elementInstance instanceof DateBase && !$elementInstance instanceof WebformComputedBase) {
+      if (!$elementInstance instanceof TextBase
+        && !$elementInstance instanceof NemidElementBase
+        && !$elementInstance instanceof DateBase
+        && !$elementInstance instanceof WebformComputedBase
+        && !$elementInstance instanceof NemidChildElementInterface) {
         continue;
       }
 
diff --git a/modules/os2forms_webform_maps/os2forms_webform_maps.module b/modules/os2forms_webform_maps/os2forms_webform_maps.module
index af545a5..a0991a8 100644
--- a/modules/os2forms_webform_maps/os2forms_webform_maps.module
+++ b/modules/os2forms_webform_maps/os2forms_webform_maps.module
@@ -27,7 +27,13 @@ function os2forms_webform_maps_theme() {
 function os2forms_webform_maps_locale_translation_projects_alter(&$projects) {
   $module_handler = \Drupal::service('module_handler');
   $path = $module_handler->getModule('os2forms_webform_maps')->getPath();
-  $projects['os2forms_webform_maps']['info']['interface translation server pattern'] = $path . '/translations/%language.po';
+  $projects['os2forms_webform_maps'] = [
+    'project_type' => 'module',
+    'info' => [
+      'name' => 'OS2Forms Webform Maps',
+      'interface translation server pattern' => $path . '/translations/%language.po'
+    ],
+  ];
 }
 
 /**