diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb
index c0d2a1fc..939ce281 100644
--- a/GUIs.Test.ZUGFeRDTest/Form1.vb
+++ b/GUIs.Test.ZUGFeRDTest/Form1.vb
@@ -49,6 +49,7 @@ Public Class Form1
                 Dim groupScope = oRow.Item("GROUP_SCOPE")
                 Dim specification = oRow.Item("SPECIFICATION")
                 Dim oItemType = oRow.Item("ITEM_TYPE")
+                Dim oEN16931_ID = oRow.Item("EN16931_ID")
 
                 Args.PropertyMap.Add(xmlPath, New XmlItemProperty() With {
                     .Description = description,
@@ -58,7 +59,8 @@ Public Class Form1
                     .IsGrouped = isGrouped,
                     .GroupScope = groupScope,
                     .Specification = specification,
-                    .ItemType = oItemType',.XMLPath = xmlPath.Replace(".Value", "")
+                    .ItemType = oItemType,
+                    .EN16931_ID = oEN16931_ID
                 })
             Next
 
diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb
index f15c4625..47fa79f8 100644
--- a/Services.ZUGFeRDService/ThreadRunner.vb
+++ b/Services.ZUGFeRDService/ThreadRunner.vb
@@ -185,6 +185,7 @@ Public Class ThreadRunner
             Dim oGroupScope = oRow.Item("GROUP_SCOPE")
             Dim oSpecification = oRow.Item("SPECIFICATION")
             Dim oItemType = oRow.Item("ITEM_TYPE")
+            Dim oEN16931Value = oRow.Item("EN16931_ID")
 
             pArgs.PropertyMap.Add(oXmlPath, New XmlItemProperty() With {
                 .Description = oDescription,
@@ -195,7 +196,8 @@ Public Class ThreadRunner
                 .GroupScope = oGroupScope,
                 .Specification = oSpecification,
                 .XMLPath = oXmlPath.Replace(".Value", ""),
-                .ItemType = oItemType
+                .ItemType = oItemType,
+                .EN16931_ID = oEN16931Value
             })
         Next