diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb
index dd52a29d..87807a0d 100644
--- a/GUIs.Test.ZUGFeRDTest/Form1.vb
+++ b/GUIs.Test.ZUGFeRDTest/Form1.vb
@@ -140,7 +140,8 @@ Public Class Form1
                .RejectedEmailDirectory = "E:\DocumentProcessing\Output\Rejected_eml",
                .AttachmentsSubDirectory = "Attachments",
                .RejectionTemplateId = 1,
-               .MinFileAgeInMinutes = 1
+               .MinFileAgeInMinutes = 1,
+               .AllowPeppolBISBill3x = True
             }
             args = LoadPropertyMapFor(args)
 
diff --git a/WEBSERVICES/ZUGFeRDRESTService/Database.cs b/WEBSERVICES/ZUGFeRDRESTService/Database.cs
index 0cc2246c..c78aefd0 100644
--- a/WEBSERVICES/ZUGFeRDRESTService/Database.cs
+++ b/WEBSERVICES/ZUGFeRDRESTService/Database.cs
@@ -5,6 +5,8 @@ using Microsoft.Extensions.Configuration;
 using System.Collections.Generic;
 using System.Data;
 using DigitalData.Modules.Logging;
+using DigitalData.Modules.Interfaces.Peppol.BISBilling30CreditNote;
+using System;
 
 namespace ZUGFeRDRESTService
 {
@@ -68,7 +70,8 @@ namespace ZUGFeRDRESTService
                         GroupScope = oRow["GROUP_SCOPE"].ToString(),
                         IsRequired = (bool)oRow["IS_REQUIRED"],
                         IsGrouped = (bool)oRow["IS_GROUPED"],
-                        Specification = oRow["SPECIFICATION"].ToString()
+                        Specification = oRow["SPECIFICATION"].ToString(),
+                        ItemType = oRow["ITEM_TYPE"] != null ? Convert.ToInt32(oRow["ITEM_TYPE"]) : 0
                     });
                 }
             } else