diff --git a/configurations/xrechnung/pom.xml b/configurations/xrechnung/pom.xml
index db7dbec..93c2cd7 100644
--- a/configurations/xrechnung/pom.xml
+++ b/configurations/xrechnung/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>de.kosit</groupId>
         <artifactId>validationtool-base</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/configurations/xrechnung/resources/xrechnung/cii/xsl/XRechnung-CII-validation.xsl b/configurations/xrechnung/resources/xrechnung/cii/xsl/XRechnung-CII-validation.xsl
index 3762400..8993297 100644
--- a/configurations/xrechnung/resources/xrechnung/cii/xsl/XRechnung-CII-validation.xsl
+++ b/configurations/xrechnung/resources/xrechnung/cii/xsl/XRechnung-CII-validation.xsl
@@ -206,7 +206,7 @@
 
 
 	  <!--RULE -->
-   <xsl:template match="/rsm:CrossIndustryInvoice" priority="1006" mode="M7">
+   <xsl:template match="//rsm:CrossIndustryInvoice" priority="1006" mode="M7">
 
 		<!--ASSERT -->
       <xsl:choose>
@@ -226,10 +226,10 @@
 
 		    <!--ASSERT -->
       <xsl:choose>
-         <xsl:when test="count(rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:PayeePartyCreditorFinancialAccount[1]) + count(rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:ApplicableTradeSettlementFinancialCard) + count((rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DirectDebitMandateID, rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:CreditorReferenceID, rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:PayerPartyDebtorFinancialAccount/ram:IBANID)[1]) = 1"/>
+         <xsl:when test="count((rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:PayeePartyCreditorFinancialAccount)[1]) + count(rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:ApplicableTradeSettlementFinancialCard) + count((rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DirectDebitMandateID, rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:CreditorReferenceID, rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:PayerPartyDebtorFinancialAccount/ram:IBANID)[1]) = 1"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-                                test="count(rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:PayeePartyCreditorFinancialAccount[1]) + count(rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:ApplicableTradeSettlementFinancialCard) + count((rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DirectDebitMandateID, rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:CreditorReferenceID, rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:PayerPartyDebtorFinancialAccount/ram:IBANID)[1]) = 1">
+                                test="count((rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:PayeePartyCreditorFinancialAccount)[1]) + count(rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:ApplicableTradeSettlementFinancialCard) + count((rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DirectDebitMandateID, rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:CreditorReferenceID, rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeSettlementPaymentMeans/ram:PayerPartyDebtorFinancialAccount/ram:IBANID)[1]) = 1">
                <xsl:attribute name="id">BR-DE-13</xsl:attribute>
                <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
@@ -283,7 +283,7 @@
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
                </xsl:attribute>
-               <svrl:text>[BR-DE-17] TODO REGEL BT-3 ggf. mit anderer ID</svrl:text>
+               <svrl:text>[BR-DE-17] Mit dem Element "Invoice type code" (BT-3) sollen ausschließlich folgende Codes aus der Codeliste UNTDID 1001a übermittelt werden: 326 (Partial invoice), 380 (Commercial invoice), 384 (Corrected invoice) und 381 (Credit note).</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -295,11 +295,11 @@
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                                 test="every $line in tokenize(rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:Description,'\n\r?') satisfies if(count(tokenize($line,'#')) &gt; 1) then tokenize($line,'#')[1]='' and (tokenize($line,'#')[2]='SKONTO' or tokenize($line,'#')[2]='VERZUG') and string-length(replace(tokenize($line,'#')[3],'TAGE=[0-9]+',''))=0 and string-length(replace(tokenize($line,'#')[4],'PROZENT=[0-9]+\.[0-9]{2}',''))=0 and (tokenize($line,'#')[5]='' and empty(tokenize($line,'#')[6]) or string-length(replace(tokenize($line,'#')[5],'BASISBETRAG=[0-9]+\.[0-9]{2}',''))=0 and tokenize($line,'#')[6]='' and empty(tokenize($line,'#')[7])) else true()">
                <xsl:attribute name="id">BR-DE-18</xsl:attribute>
-               <xsl:attribute name="flag">warning</xsl:attribute>
+               <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
                </xsl:attribute>
-               <svrl:text>[BR-DE-18] TODO REGEL BT-20 ggf. mit anderer ID</svrl:text>
+               <svrl:text>[BR-DE-18] Informationen zur Gewährung von Skonto oder zur Berechnung von Verzugszinsen müssen wie folgt im Element "Payment terms" (BT-20) jeweils in einer eigenen Zeile übermittelt werden: Anzugeben ist im ersten Segment "SKONTO" oder "VERZUG", im zweiten "TAGE=n", im dritten "PROZENT=n", wobei die Segmente jeweils von einer "#" umfasst sind. Prozentzahlen sind mit Punkt getrennt von zwei Nachkommastellen anzugeben. Liegt dem zu berechnenden Betrag nicht BT-115, "fälliger Betrag" zugrunde, sondern nur ein Teil des fälligen Betrags der Rechnung, ist der Grundwert zur Berechnung von Skonto oder Verzugszins als viertes Segment "BASISBETRAG=n" mit dem semantischen Datentyp Amount anzugeben.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -307,7 +307,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty"
+   <xsl:template match="//rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty"
                  priority="1005"
                  mode="M7">
 
@@ -329,7 +329,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:PostalTradeAddress"
+   <xsl:template match="//rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:PostalTradeAddress"
                  priority="1004"
                  mode="M7">
 
@@ -366,7 +366,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:DefinedTradeContact"
+   <xsl:template match="//rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTradeParty/ram:DefinedTradeContact"
                  priority="1003"
                  mode="M7">
 
@@ -420,7 +420,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerTradeParty/ram:PostalTradeAddress"
+   <xsl:template match="//rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerTradeParty/ram:PostalTradeAddress"
                  priority="1002"
                  mode="M7">
 
@@ -457,7 +457,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipToTradeParty/ram:PostalTradeAddress"
+   <xsl:template match="//rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipToTradeParty/ram:PostalTradeAddress"
                  priority="1001"
                  mode="M7">
 
@@ -494,7 +494,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:ApplicableTradeTax"
+   <xsl:template match="//rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:ApplicableTradeTax"
                  priority="1000"
                  mode="M7">
 
diff --git a/configurations/xrechnung/resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl b/configurations/xrechnung/resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl
index 791408d..5bbb9e5 100644
--- a/configurations/xrechnung/resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl
+++ b/configurations/xrechnung/resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl
@@ -3999,21 +3999,6 @@
 
 		    <!--ASSERT -->
       <xsl:choose>
-         <xsl:when test="not(cbc:UBLVersionID)"/>
-         <xsl:otherwise>
-            <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl" test="not(cbc:UBLVersionID)">
-               <xsl:attribute name="id">UBL-CR-002</xsl:attribute>
-               <xsl:attribute name="flag">warning</xsl:attribute>
-               <xsl:attribute name="location">
-                  <xsl:apply-templates select="." mode="schematron-select-full-path"/>
-               </xsl:attribute>
-               <svrl:text>[UBL-CR-002]-A UBL invoice should not include the UBLVersionID</svrl:text>
-            </svrl:failed-assert>
-         </xsl:otherwise>
-      </xsl:choose>
-
-		    <!--ASSERT -->
-      <xsl:choose>
          <xsl:when test="not(cbc:ProfileExecutionID)"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
@@ -5787,16 +5772,16 @@
 
 		    <!--ASSERT -->
       <xsl:choose>
-         <xsl:when test="not(cac:AdditionalDocumentReference/cbc:DocumentTypeCode)"/>
+         <xsl:when test="not(cac:AdditionalDocumentReference/cbc:DocumentType)"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-                                test="not(cac:AdditionalDocumentReference/cbc:DocumentTypeCode)">
+                                test="not(cac:AdditionalDocumentReference/cbc:DocumentType)">
                <xsl:attribute name="id">UBL-CR-114</xsl:attribute>
                <xsl:attribute name="flag">warning</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
                </xsl:attribute>
-               <svrl:text>[UBL-CR-114]-A UBL invoice should not include the AdditionalDocumentReference DocumentTypeCode</svrl:text>
+               <svrl:text>[UBL-CR-114]-A UBL invoice should not include the AdditionalDocumentReference DocumentType</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -12518,22 +12503,6 @@
 
 		    <!--ASSERT -->
       <xsl:choose>
-         <xsl:when test="not(cac:InvoiceLine/cac:DocumentReference/cbc:DocumentTypeCode)"/>
-         <xsl:otherwise>
-            <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-                                test="not(cac:InvoiceLine/cac:DocumentReference/cbc:DocumentTypeCode)">
-               <xsl:attribute name="id">UBL-CR-536</xsl:attribute>
-               <xsl:attribute name="flag">warning</xsl:attribute>
-               <xsl:attribute name="location">
-                  <xsl:apply-templates select="." mode="schematron-select-full-path"/>
-               </xsl:attribute>
-               <svrl:text>[UBL-CR-536]-A UBL invoice should not include the InvoiceLine DocumentReference DocumentTypeCode</svrl:text>
-            </svrl:failed-assert>
-         </xsl:otherwise>
-      </xsl:choose>
-
-		    <!--ASSERT -->
-      <xsl:choose>
          <xsl:when test="not(cac:InvoiceLine/cac:DocumentReference/cbc:DocumentType)"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
@@ -14463,9 +14432,10 @@
 
 		    <!--ASSERT -->
       <xsl:choose>
-         <xsl:when test="not(//@name)"/>
+         <xsl:when test="count(//@name) - count(//cbc:PaymentMeansCode/@name) &lt;= 0"/>
          <xsl:otherwise>
-            <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl" test="not(//@name)">
+            <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
+                                test="count(//@name) - count(//cbc:PaymentMeansCode/@name) &lt;= 0">
                <xsl:attribute name="id">UBL-DT-18</xsl:attribute>
                <xsl:attribute name="flag">warning</xsl:attribute>
                <xsl:attribute name="location">
@@ -15321,7 +15291,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="cac:AdditionalDocumentReference[cbc:DocumentTypeCode = '130']/cbc:ID/@schemeID"
+   <xsl:template match="cac:AdditionalDocumentReference[cbc:DocumentTypeCode = '130']/cbc:ID/@schemeID | cac:DocumentReference[cbc:DocumentTypeCode = '130']/cbc:ID/@schemeID"
                  priority="1013"
                  mode="M13">
 
@@ -15348,10 +15318,10 @@
 
 		<!--ASSERT -->
       <xsl:choose>
-         <xsl:when test="((not(contains(normalize-space(.), ' ')) and contains(' 0001 0002 0003 0004 0005 0006 0007 0008 0009 0010 0011 0012 0013 0014 0015 0016 0017 0018 0019 0020 0021 0022 0023 0024 0025 0026 0027 0028 0029 0030 0031 0032 0033 0034 0035 0036 0037 0038 0039 0040 0041 0042 0043 0044 0045 0046 0047 0048 0049 0050 0051 0052 0053 0054 0055 0056 0057 0058 0059 0060 0061 0062 0063 0064 0065 0066 0067 0068 0069 0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 0080 0081 0082 0083 0084 0085 0086 0087 0088 0089 0090 0091 0092 0093 0094 0095 0096 0097 0098 0099 0100 0101 0102 0103 0104 0105 0106 0107 0108 0109 0110 0111 0112 0113 0114 0115 0116 0117 0118 0119 0120 0121 0122 0123 0124 0125 0126 0127 0128 0129 0130 0131 0132 0133 0134 0135 0136 0137 0138 0139 0140 0141 0142 0143 0144 0145 0146 0147 0148 0149 0150 0151 0152 0153 0154 0155 0156 0157 0158 0159 0160 0161 0162 0163 0164 0165 0166 0167 0168 0169 0170 0171 0172 0173 0174 0175 0176 0177 0178 0179 0180 0183 ', concat(' ', normalize-space(.), ' '))))"/>
+         <xsl:when test="((not(contains(normalize-space(.), ' ')) and contains(' 0001 0002 0003 0004 0005 0006 0007 0008 0009 0010 0011 0012 0013 0014 0015 0016 0017 0018 0019 0020 0021 0022 0023 0024 0025 0026 0027 0028 0029 0030 0031 0032 0033 0034 0035 0036 0037 0038 0039 0040 0041 0042 0043 0044 0045 0046 0047 0048 0049 0050 0051 0052 0053 0054 0055 0056 0057 0058 0059 0060 0061 0062 0063 0064 0065 0066 0067 0068 0069 0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 0080 0081 0082 0083 0084 0085 0086 0087 0088 0089 0090 0091 0092 0093 0094 0095 0096 0097 0098 0099 0100 0101 0102 0103 0104 0105 0106 0107 0108 0109 0110 0111 0112 0113 0114 0115 0116 0117 0118 0119 0120 0121 0122 0123 0124 0125 0126 0127 0128 0129 0130 0131 0132 0133 0134 0135 0136 0137 0138 0139 0140 0141 0142 0143 0144 0145 0146 0147 0148 0149 0150 0151 0152 0153 0154 0155 0156 0157 0158 0159 0160 0161 0162 0163 0164 0165 0166 0167 0168 0169 0170 0171 0172 0173 0174 0175 0176 0177 0178 0179 0180 0183 ', concat(' ', normalize-space(.), ' '))))  or ((not(contains(normalize-space(.), ' ')) and contains(' SEPA ', concat(' ', normalize-space(.), ' '))) and (//ancestor::cac:AccountingSupplierParty) or (//ancestor::cac:PayeeParty))"/>
          <xsl:otherwise>
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-                                test="((not(contains(normalize-space(.), ' ')) and contains(' 0001 0002 0003 0004 0005 0006 0007 0008 0009 0010 0011 0012 0013 0014 0015 0016 0017 0018 0019 0020 0021 0022 0023 0024 0025 0026 0027 0028 0029 0030 0031 0032 0033 0034 0035 0036 0037 0038 0039 0040 0041 0042 0043 0044 0045 0046 0047 0048 0049 0050 0051 0052 0053 0054 0055 0056 0057 0058 0059 0060 0061 0062 0063 0064 0065 0066 0067 0068 0069 0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 0080 0081 0082 0083 0084 0085 0086 0087 0088 0089 0090 0091 0092 0093 0094 0095 0096 0097 0098 0099 0100 0101 0102 0103 0104 0105 0106 0107 0108 0109 0110 0111 0112 0113 0114 0115 0116 0117 0118 0119 0120 0121 0122 0123 0124 0125 0126 0127 0128 0129 0130 0131 0132 0133 0134 0135 0136 0137 0138 0139 0140 0141 0142 0143 0144 0145 0146 0147 0148 0149 0150 0151 0152 0153 0154 0155 0156 0157 0158 0159 0160 0161 0162 0163 0164 0165 0166 0167 0168 0169 0170 0171 0172 0173 0174 0175 0176 0177 0178 0179 0180 0183 ', concat(' ', normalize-space(.), ' '))))">
+                                test="((not(contains(normalize-space(.), ' ')) and contains(' 0001 0002 0003 0004 0005 0006 0007 0008 0009 0010 0011 0012 0013 0014 0015 0016 0017 0018 0019 0020 0021 0022 0023 0024 0025 0026 0027 0028 0029 0030 0031 0032 0033 0034 0035 0036 0037 0038 0039 0040 0041 0042 0043 0044 0045 0046 0047 0048 0049 0050 0051 0052 0053 0054 0055 0056 0057 0058 0059 0060 0061 0062 0063 0064 0065 0066 0067 0068 0069 0070 0071 0072 0073 0074 0075 0076 0077 0078 0079 0080 0081 0082 0083 0084 0085 0086 0087 0088 0089 0090 0091 0092 0093 0094 0095 0096 0097 0098 0099 0100 0101 0102 0103 0104 0105 0106 0107 0108 0109 0110 0111 0112 0113 0114 0115 0116 0117 0118 0119 0120 0121 0122 0123 0124 0125 0126 0127 0128 0129 0130 0131 0132 0133 0134 0135 0136 0137 0138 0139 0140 0141 0142 0143 0144 0145 0146 0147 0148 0149 0150 0151 0152 0153 0154 0155 0156 0157 0158 0159 0160 0161 0162 0163 0164 0165 0166 0167 0168 0169 0170 0171 0172 0173 0174 0175 0176 0177 0178 0179 0180 0183 ', concat(' ', normalize-space(.), ' ')))) or ((not(contains(normalize-space(.), ' ')) and contains(' SEPA ', concat(' ', normalize-space(.), ' '))) and (//ancestor::cac:AccountingSupplierParty) or (//ancestor::cac:PayeeParty))">
                <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
diff --git a/configurations/xrechnung/resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-CreditNote.xsl b/configurations/xrechnung/resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-CreditNote.xsl
index e5da6d0..e076b22 100644
--- a/configurations/xrechnung/resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-CreditNote.xsl
+++ b/configurations/xrechnung/resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-CreditNote.xsl
@@ -207,7 +207,7 @@
 
 
 	  <!--RULE -->
-   <xsl:template match="/cn:CreditNote" priority="1007" mode="M8">
+   <xsl:template match="//cn:CreditNote" priority="1007" mode="M8">
 
 		<!--ASSERT -->
       <xsl:choose>
@@ -266,7 +266,7 @@
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
                </xsl:attribute>
-               <svrl:text>[BR-DE-17] TODO REGEL BT-3 ggf. mit anderer ID</svrl:text>
+               <svrl:text>[BR-DE-17] Mit dem Element "Invoice type code" (BT-3) sollen ausschließlich folgende Codes aus der Codeliste UNTDID 1001a übermittelt werden: 326 (Partial invoice), 380 (Commercial invoice), 384 (Corrected invoice) und 381 (Credit note).</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -278,11 +278,11 @@
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                                 test="every $line in tokenize(cac:PaymentTerms/cbc:Note,'\n\r?') satisfies if(count(tokenize($line,'#')) &gt; 1) then tokenize($line,'#')[1]='' and (tokenize($line,'#')[2]='SKONTO' or tokenize($line,'#')[2]='VERZUG') and string-length(replace(tokenize($line,'#')[3],'TAGE=[0-9]+',''))=0 and string-length(replace(tokenize($line,'#')[4],'PROZENT=[0-9]+\.[0-9]{2}',''))=0 and (tokenize($line,'#')[5]='' and empty(tokenize($line,'#')[6]) or string-length(replace(tokenize($line,'#')[5],'BASISBETRAG=[0-9]+\.[0-9]{2}',''))=0 and tokenize($line,'#')[6]='' and empty(tokenize($line,'#')[7])) else true()">
                <xsl:attribute name="id">BR-DE-18</xsl:attribute>
-               <xsl:attribute name="flag">warning</xsl:attribute>
+               <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
                </xsl:attribute>
-               <svrl:text>[BR-DE-18] TODO REGEL BT-20 ggf. mit anderer ID</svrl:text>
+               <svrl:text>[BR-DE-18] Informationen zur Gewährung von Skonto oder zur Berechnung von Verzugszinsen müssen wie folgt im Element "Payment terms" (BT-20) jeweils in einer eigenen Zeile übermittelt werden: Anzugeben ist im ersten Segment "SKONTO" oder "VERZUG", im zweiten "TAGE=n", im dritten "PROZENT=n", wobei die Segmente jeweils von einer "#" umfasst sind. Prozentzahlen sind mit Punkt getrennt von zwei Nachkommastellen anzugeben. Liegt dem zu berechnenden Betrag nicht BT-115, "fälliger Betrag" zugrunde, sondern nur ein Teil des fälligen Betrags der Rechnung, ist der Grundwert zur Berechnung von Skonto oder Verzugszins als viertes Segment "BASISBETRAG=n" mit dem semantischen Datentyp Amount anzugeben.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -290,7 +290,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/cn:CreditNote/cac:AccountingSupplierParty"
+   <xsl:template match="//cn:CreditNote/cac:AccountingSupplierParty"
                  priority="1006"
                  mode="M8">
 
@@ -312,7 +312,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/cn:CreditNote/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress"
+   <xsl:template match="//cn:CreditNote/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress"
                  priority="1005"
                  mode="M8">
 
@@ -349,7 +349,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/cn:CreditNote/cac:AccountingSupplierParty/cac:Party/cac:Contact"
+   <xsl:template match="//cn:CreditNote/cac:AccountingSupplierParty/cac:Party/cac:Contact"
                  priority="1004"
                  mode="M8">
 
@@ -401,7 +401,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/cn:CreditNote/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress"
+   <xsl:template match="//cn:CreditNote/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress"
                  priority="1003"
                  mode="M8">
 
@@ -438,7 +438,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/cn:CreditNote/cac:Delivery/cac:DeliveryLocation/cac:Address"
+   <xsl:template match="//cn:CreditNote/cac:Delivery/cac:DeliveryLocation/cac:Address"
                  priority="1002"
                  mode="M8">
 
@@ -475,7 +475,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/cn:CreditNote/cac:PaymentMeans" priority="1001" mode="M8">
+   <xsl:template match="//cn:CreditNote/cac:PaymentMeans" priority="1001" mode="M8">
 
 		<!--ASSERT -->
       <xsl:choose>
@@ -496,7 +496,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/cn:CreditNote/cac:TaxTotal/cac:TaxSubtotal"
+   <xsl:template match="//cn:CreditNote/cac:TaxTotal/cac:TaxSubtotal"
                  priority="1000"
                  mode="M8">
 
diff --git a/configurations/xrechnung/resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl b/configurations/xrechnung/resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl
index 315c2c4..f1313a4 100644
--- a/configurations/xrechnung/resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl
+++ b/configurations/xrechnung/resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl
@@ -207,7 +207,7 @@
 
 
 	  <!--RULE -->
-   <xsl:template match="/ubl:Invoice" priority="1007" mode="M8">
+   <xsl:template match="//ubl:Invoice" priority="1007" mode="M8">
 
 		<!--ASSERT -->
       <xsl:choose>
@@ -266,7 +266,7 @@
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
                </xsl:attribute>
-               <svrl:text>[BR-DE-17] TODO REGEL BT-3 ggf. mit anderer ID</svrl:text>
+               <svrl:text>[BR-DE-17] Mit dem Element "Invoice type code" (BT-3) sollen ausschließlich folgende Codes aus der Codeliste UNTDID 1001a übermittelt werden: 326 (Partial invoice), 380 (Commercial invoice), 384 (Corrected invoice) und 381 (Credit note).</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -278,11 +278,11 @@
             <svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
                                 test="every $line in tokenize(cac:PaymentTerms/cbc:Note,'\n\r?') satisfies if(count(tokenize($line,'#')) &gt; 1) then tokenize($line,'#')[1]='' and (tokenize($line,'#')[2]='SKONTO' or tokenize($line,'#')[2]='VERZUG') and string-length(replace(tokenize($line,'#')[3],'TAGE=[0-9]+',''))=0 and string-length(replace(tokenize($line,'#')[4],'PROZENT=[0-9]+\.[0-9]{2}',''))=0 and (tokenize($line,'#')[5]='' and empty(tokenize($line,'#')[6]) or string-length(replace(tokenize($line,'#')[5],'BASISBETRAG=[0-9]+\.[0-9]{2}',''))=0 and tokenize($line,'#')[6]='' and empty(tokenize($line,'#')[7])) else true()">
                <xsl:attribute name="id">BR-DE-18</xsl:attribute>
-               <xsl:attribute name="flag">warning</xsl:attribute>
+               <xsl:attribute name="flag">fatal</xsl:attribute>
                <xsl:attribute name="location">
                   <xsl:apply-templates select="." mode="schematron-select-full-path"/>
                </xsl:attribute>
-               <svrl:text>[BR-DE-18] TODO REGEL BT-20 ggf. mit anderer ID</svrl:text>
+               <svrl:text>[BR-DE-18] Informationen zur Gewährung von Skonto oder zur Berechnung von Verzugszinsen müssen wie folgt im Element "Payment terms" (BT-20) jeweils in einer eigenen Zeile übermittelt werden: Anzugeben ist im ersten Segment "SKONTO" oder "VERZUG", im zweiten "TAGE=n", im dritten "PROZENT=n", wobei die Segmente jeweils von einer "#" umfasst sind. Prozentzahlen sind mit Punkt getrennt von zwei Nachkommastellen anzugeben. Liegt dem zu berechnenden Betrag nicht BT-115, "fälliger Betrag" zugrunde, sondern nur ein Teil des fälligen Betrags der Rechnung, ist der Grundwert zur Berechnung von Skonto oder Verzugszins als viertes Segment "BASISBETRAG=n" mit dem semantischen Datentyp Amount anzugeben.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
@@ -290,7 +290,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/ubl:Invoice/cac:AccountingSupplierParty"
+   <xsl:template match="//ubl:Invoice/cac:AccountingSupplierParty"
                  priority="1006"
                  mode="M8">
 
@@ -312,7 +312,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/ubl:Invoice/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress"
+   <xsl:template match="//ubl:Invoice/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress"
                  priority="1005"
                  mode="M8">
 
@@ -349,7 +349,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/ubl:Invoice/cac:AccountingSupplierParty/cac:Party/cac:Contact"
+   <xsl:template match="//ubl:Invoice/cac:AccountingSupplierParty/cac:Party/cac:Contact"
                  priority="1004"
                  mode="M8">
 
@@ -401,7 +401,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/ubl:Invoice/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress"
+   <xsl:template match="//ubl:Invoice/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress"
                  priority="1003"
                  mode="M8">
 
@@ -438,7 +438,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/ubl:Invoice/cac:Delivery/cac:DeliveryLocation/cac:Address"
+   <xsl:template match="//ubl:Invoice/cac:Delivery/cac:DeliveryLocation/cac:Address"
                  priority="1002"
                  mode="M8">
 
@@ -475,7 +475,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/ubl:Invoice/cac:PaymentMeans" priority="1001" mode="M8">
+   <xsl:template match="//ubl:Invoice/cac:PaymentMeans" priority="1001" mode="M8">
 
 		<!--ASSERT -->
       <xsl:choose>
@@ -496,7 +496,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-   <xsl:template match="/ubl:Invoice/cac:TaxTotal/cac:TaxSubtotal"
+   <xsl:template match="//ubl:Invoice/cac:TaxTotal/cac:TaxSubtotal"
                  priority="1000"
                  mode="M8">
 
diff --git a/configurations/xrechnung/scenarios.xml b/configurations/xrechnung/scenarios.xml
index 27e526f..98e9c83 100644
--- a/configurations/xrechnung/scenarios.xml
+++ b/configurations/xrechnung/scenarios.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scenarios xmlns="http://www.xoev.de/de/validator/framework/1/scenarios" frameworkVersion="1.0.0">
-    <name>Prüftool-Konfiguration XRechnung (Entwurf)</name>
+    <name>Prüftool-Konfiguration XRechnung 1.1</name>
     <author>KoSIT</author>
-    <date>2017-09-20</date>
+    <date>2017-12-19</date>
     <description>
-        <p>Prüfung von Dokumenten auf Konformität zum Standard XRechnung (www.xoev.de/de/xrechnung)</p>
+        <p>Prüfung von Dokumenten auf Konformität zum Standard XRechnung 1.1 (https://www.xoev.de/de/xrechnung/1_1).</p>
+        <p>Diese Konfiguration enthält die Schematron-Regeln der EN16931 mit dem Stand 19.12.2017 (https://github.com/CenPC434/validation/commit/5a82a74d239efea67bcc4381a2facad3bc524758).</p>
+        <p>Diese Konfiguration enthält die Schematron-Regeln der CIUS XRechnung 1.1 mit dem Stand 19.12.2017 (https://github.com/itplr-kosit/xrechnung-artefacts/releases/tag/xrechnung-1_1-schematron-2017-12-19).</p>
     </description>
 
     <scenario>
         <name>EN16931 CIUS XRechnung (UBL Invoice)</name>
         <namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</namespace>
         <namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</namespace>
-        <match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</match>
+        <match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017') or
+                                starts-with(cbc:CustomizationID, 'urn:ce.eu:en16931:2017']</match>
         <validateWithXmlSchema>
             <resource>
                 <name>XML Schema for UBL 2.1 Invoice</name>
@@ -42,7 +45,8 @@
         <name>EN16931 CIUS XRechnung (UBL CreditNote)</name>
         <namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</namespace>
         <namespace prefix="creditnote">urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2</namespace>
-        <match>/creditnote:CreditNote[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</match>
+        <match>/creditnote:CreditNote[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017') or
+                                      starts-with(cbc:CustomizationID, 'urn:ce.eu:en16931:2017')]</match>
         <validateWithXmlSchema>
             <resource>
                 <name>XML Schema for UBL 2.1 CreditNote</name>
@@ -73,7 +77,8 @@
         <name>EN16931 CIUS XRechnung (CII)</name>
         <namespace prefix="rsm">urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100</namespace>
         <namespace prefix="ram">urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100</namespace>
-        <match>/rsm:CrossIndustryInvoice[starts-with(rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID, 'urn:cen.eu:en16931:2017')]</match>
+        <match>/rsm:CrossIndustryInvoice[starts-with(rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID, 'urn:cen.eu:en16931:2017') or
+                                         starts-with(rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID, 'urn:ce.eu:en16931:2017')]</match>
         <validateWithXmlSchema>
             <resource>
                 <name>XML Schema for UN/CEFACT XML (SCRDM - CII)</name>
diff --git a/configurations/xrechnung/test/build.xml b/configurations/xrechnung/test/build.xml
index f45164a..94999a5 100644
--- a/configurations/xrechnung/test/build.xml
+++ b/configurations/xrechnung/test/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." name="test-xrechnung" default="test-xrechnung">
    
-    <property name="prueftool.jar"  value="${basedir}/../../validationtool-1.0.0-standalone.jar"/>
+    <property name="prueftool.jar"  value="${basedir}/../../validationtool-1.0.1-standalone.jar"/>
     <property name="schema.dir"  value="${basedir}/../../xsd"/>
     <property name="testfiles.dir"  value="${basedir}/instances"/>
     <property name="reports.dir"  value="${basedir}/reports"/>
diff --git a/configurations/xrechnung/test/reports/bin001-report.html b/configurations/xrechnung/test/reports/bin001-report.html
index c0be209..8ae125c 100644
--- a/configurations/xrechnung/test/reports/bin001-report.html
+++ b/configurations/xrechnung/test/reports/bin001-report.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>Prüfbericht</title><style>
@@ -131,9 +131,9 @@
          <p class="important">Angaben zum geprüften Dokument</p>
          <dl>
             <dt>Referenz:</dt>
-            <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\bin001.xml</dd>
+            <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\bin001.xml</dd>
             <dt>Zeitpunkt der Prüfung:</dt>
-            <dd>21.9.2017 11:08:04</dd>
+            <dd>19.12.2017 15:50:48</dd>
             <dt>Erkannter Dokumenttyp:</dt>
             <dd><b class="error">unbekannt</b></dd>
          </dl>
diff --git a/configurations/xrechnung/test/reports/bin001-report.xml b/configurations/xrechnung/test/reports/bin001-report.xml
index ef39aca..5441272 100644
--- a/configurations/xrechnung/test/reports/bin001-report.xml
+++ b/configurations/xrechnung/test/reports/bin001-report.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rep:report xmlns:rep="http://www.xoev.de/de/validator/varl/1"
-            xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
             xmlns:html="http://www.w3.org/1999/xhtml"
             xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput"
             xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios"
             xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-            xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
             xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             valid="false"
@@ -14,13 +11,13 @@
    <rep:engine>
       <rep:name>KoSIT Prüftool</rep:name>
    </rep:engine>
-   <rep:timestamp>2017-09-21T11:08:04.311+02:00</rep:timestamp>
+   <rep:timestamp>2017-12-19T15:50:48.269+01:00</rep:timestamp>
    <rep:documentIdentification>
       <rep:documentHash>
          <rep:hashAlgorithm>SHA-256</rep:hashAlgorithm>
          <rep:hashValue>fGsWeDjyK0xy/p2b0DmSP73UVY8p8ZZJxNM0WnjLZSs=</rep:hashValue>
       </rep:documentHash>
-      <rep:documentReference>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\bin001.xml</rep:documentReference>
+      <rep:documentReference>c:\fb\git\validationtool\configurations\xrechnung\test\instances\bin001.xml</rep:documentReference>
    </rep:documentIdentification>
    <rep:noScenarioMatched>
       <rep:validationStepResult id="val-xml" valid="false">
@@ -168,9 +165,9 @@
                      <p class="important">Angaben zum geprüften Dokument</p>
                      <dl>
                         <dt>Referenz:</dt>
-                        <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\bin001.xml</dd>
+                        <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\bin001.xml</dd>
                         <dt>Zeitpunkt der Prüfung:</dt>
-                        <dd>21.9.2017 11:08:04</dd>
+                        <dd>19.12.2017 15:50:48</dd>
                         <dt>Erkannter Dokumenttyp:</dt>
                         <dd>
                            <b class="error">unbekannt</b>
diff --git a/configurations/xrechnung/test/reports/cii001-report.html b/configurations/xrechnung/test/reports/cii001-report.html
index d6b74e6..f6a545c 100644
--- a/configurations/xrechnung/test/reports/cii001-report.html
+++ b/configurations/xrechnung/test/reports/cii001-report.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>Prüfbericht</title><style>
@@ -131,13 +131,13 @@
          <p class="important">Angaben zum geprüften Dokument</p>
          <dl>
             <dt>Referenz:</dt>
-            <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\cii001.xml</dd>
+            <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\cii001.xml</dd>
             <dt>Zeitpunkt der Prüfung:</dt>
-            <dd>21.9.2017 11:08:04</dd>
+            <dd>19.12.2017 15:50:48</dd>
             <dt>Erkannter Dokumenttyp:</dt>
             <dd>EN16931 CIUS XRechnung (CII)</dd>
          </dl>
-         <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+         <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
             <dt>Erkannter Rechnungssteller:</dt>
             <dd>De Koksmaat</dd>
             <dt>Erkannte Rechnungsnummer:</dt>
diff --git a/configurations/xrechnung/test/reports/cii001-report.xml b/configurations/xrechnung/test/reports/cii001-report.xml
index 852b377..fb90904 100644
--- a/configurations/xrechnung/test/reports/cii001-report.xml
+++ b/configurations/xrechnung/test/reports/cii001-report.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rep:report xmlns:rep="http://www.xoev.de/de/validator/varl/1"
-            xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
             xmlns:html="http://www.w3.org/1999/xhtml"
             xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput"
             xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios"
             xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-            xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
             xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             valid="false"
@@ -14,66 +11,66 @@
    <rep:engine>
       <rep:name>KoSIT Prüftool</rep:name>
    </rep:engine>
-   <rep:timestamp>2017-09-21T11:08:04.501+02:00</rep:timestamp>
+   <rep:timestamp>2017-12-19T15:50:48.456+01:00</rep:timestamp>
    <rep:documentIdentification>
       <rep:documentHash>
          <rep:hashAlgorithm>SHA-256</rep:hashAlgorithm>
          <rep:hashValue>I380LFZjDxRMY8cygtS3z+WYtHLkctg0SRBnIv4Nuuc=</rep:hashValue>
       </rep:documentHash>
-      <rep:documentReference>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\cii001.xml</rep:documentReference>
+      <rep:documentReference>c:\fb\git\validationtool\configurations\xrechnung\test\instances\cii001.xml</rep:documentReference>
    </rep:documentIdentification>
    <rep:scenarioMatched>
-      <ns2:scenario xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                    xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-         <ns2:name>EN16931 CIUS XRechnung (CII)</ns2:name>
-         <ns2:namespace prefix="rsm">urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100</ns2:namespace>
-         <ns2:namespace prefix="ram">urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100</ns2:namespace>
-         <ns2:match>/rsm:CrossIndustryInvoice[starts-with(rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID, 'urn:cen.eu:en16931:2017')]</ns2:match>
-         <ns2:validateWithXmlSchema>
-            <ns2:resource>
-               <ns2:name>XML Schema for UN/CEFACT XML (SCRDM - CII)</ns2:name>
-               <ns2:location>resources/xrechnung/cii/xsd/CrossIndustryInvoice_100pD16B.xsd</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithXmlSchema>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for EN16931 (CII)</ns2:name>
-               <ns2:location>resources/xrechnung/cii/xsl/EN16931-CII-validation.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for CIUS XRechnung (CII)</ns2:name>
-               <ns2:location>resources/xrechnung/cii/xsl/XRechnung-CII-validation.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:createReport>
-            <ns2:resource>
-               <ns2:name>Prüfbericht für XRechnung</ns2:name>
-               <ns2:location>resources/xrechnung/xrechnung-report.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:createReport>
-      </ns2:scenario>
-      <rep:documentData xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+      <s:scenario>
+         <s:name>EN16931 CIUS XRechnung (CII)</s:name>
+         <s:namespace prefix="rsm">urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100</s:namespace>
+         <s:namespace prefix="ram">urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100</s:namespace>
+         <s:match>/rsm:CrossIndustryInvoice[starts-with(rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID, 'urn:cen.eu:en16931:2017')]</s:match>
+         <s:validateWithXmlSchema>
+            <s:resource>
+               <s:name>XML Schema for UN/CEFACT XML (SCRDM - CII)</s:name>
+               <s:location>resources/xrechnung/cii/xsd/CrossIndustryInvoice_100pD16B.xsd</s:location>
+            </s:resource>
+         </s:validateWithXmlSchema>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for EN16931 (CII)</s:name>
+               <s:location>resources/xrechnung/cii/xsl/EN16931-CII-validation.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for CIUS XRechnung (CII)</s:name>
+               <s:location>resources/xrechnung/cii/xsl/XRechnung-CII-validation.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:createReport>
+            <s:resource>
+               <s:name>Prüfbericht für XRechnung</s:name>
+               <s:location>resources/xrechnung/xrechnung-report.xsl</s:location>
+            </s:resource>
+         </s:createReport>
+      </s:scenario>
+      <rep:documentData xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                        xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                        xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                         xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                        xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                         xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
          <seller>De Koksmaat</seller>
          <id>12115118</id>
          <issueDate>20150109</issueDate>
       </rep:documentData>
       <rep:validationStepResult id="val-xsd" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>XML Schema for UN/CEFACT XML (SCRDM - CII)</ns2:name>
-            <ns2:location>resources/xrechnung/cii/xsd/CrossIndustryInvoice_100pD16B.xsd</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>XML Schema for UN/CEFACT XML (SCRDM - CII)</s:name>
+            <s:location>resources/xrechnung/cii/xsd/CrossIndustryInvoice_100pD16B.xsd</s:location>
+         </s:resource>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.1" valid="false">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for EN16931 (CII)</ns2:name>
-            <ns2:location>resources/xrechnung/cii/xsl/EN16931-CII-validation.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for EN16931 (CII)</s:name>
+            <s:location>resources/xrechnung/cii/xsl/EN16931-CII-validation.xsl</s:location>
+         </s:resource>
          <rep:message code="BR-S-08"
                       id="val-sch.1.1"
                       level="error"
@@ -84,11 +81,10 @@
                       xpathLocation="/rsm:CrossIndustryInvoice/rsm:ExchangedDocument/ram:TypeCode">[CL-01]-The document type code MUST be coded by the invoice and credit note related code lists of UNTDID 1001.</rep:message>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.2" valid="false">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for CIUS XRechnung (CII)</ns2:name>
-            <ns2:location>resources/xrechnung/cii/xsl/XRechnung-CII-validation.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for CIUS XRechnung (CII)</s:name>
+            <s:location>resources/xrechnung/cii/xsl/XRechnung-CII-validation.xsl</s:location>
+         </s:resource>
          <rep:message code="BR-DE-15"
                       id="val-sch.2.1"
                       level="error"
@@ -236,14 +232,17 @@
                      <p class="important">Angaben zum geprüften Dokument</p>
                      <dl>
                         <dt>Referenz:</dt>
-                        <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\cii001.xml</dd>
+                        <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\cii001.xml</dd>
                         <dt>Zeitpunkt der Prüfung:</dt>
-                        <dd>21.9.2017 11:08:04</dd>
+                        <dd>19.12.2017 15:50:48</dd>
                         <dt>Erkannter Dokumenttyp:</dt>
                         <dd>EN16931 CIUS XRechnung (CII)</dd>
                      </dl>
-                     <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+                     <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                         xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                         xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                          xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                         xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                          xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
                         <dt>Erkannter Rechnungssteller:</dt>
                         <dd>De Koksmaat</dd>
diff --git a/configurations/xrechnung/test/reports/ubl001-report.html b/configurations/xrechnung/test/reports/ubl001-report.html
index e7378ea..b0d9ef3 100644
--- a/configurations/xrechnung/test/reports/ubl001-report.html
+++ b/configurations/xrechnung/test/reports/ubl001-report.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>Prüfbericht</title><style>
@@ -131,13 +131,13 @@
          <p class="important">Angaben zum geprüften Dokument</p>
          <dl>
             <dt>Referenz:</dt>
-            <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl001.xml</dd>
+            <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl001.xml</dd>
             <dt>Zeitpunkt der Prüfung:</dt>
-            <dd>21.9.2017 11:08:05</dd>
+            <dd>19.12.2017 15:50:48</dd>
             <dt>Erkannter Dokumenttyp:</dt>
             <dd>EN16931 CIUS XRechnung (UBL Invoice)</dd>
          </dl>
-         <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+         <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
             <dt>Erkannter Rechnungssteller:</dt>
             <dd>De Koksmaat</dd>
             <dt>Erkannte Rechnungsnummer:</dt>
diff --git a/configurations/xrechnung/test/reports/ubl001-report.xml b/configurations/xrechnung/test/reports/ubl001-report.xml
index e5cec93..7881bd9 100644
--- a/configurations/xrechnung/test/reports/ubl001-report.xml
+++ b/configurations/xrechnung/test/reports/ubl001-report.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rep:report xmlns:rep="http://www.xoev.de/de/validator/varl/1"
-            xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
             xmlns:html="http://www.w3.org/1999/xhtml"
             xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput"
             xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios"
             xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-            xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
             xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             valid="true"
@@ -14,74 +11,73 @@
    <rep:engine>
       <rep:name>KoSIT Prüftool</rep:name>
    </rep:engine>
-   <rep:timestamp>2017-09-21T11:08:05.102+02:00</rep:timestamp>
+   <rep:timestamp>2017-12-19T15:50:48.784+01:00</rep:timestamp>
    <rep:documentIdentification>
       <rep:documentHash>
          <rep:hashAlgorithm>SHA-256</rep:hashAlgorithm>
          <rep:hashValue>TfvPbPcDevSv5anZIbgsyLioTLdzjnLTSXRhMsBlCIo=</rep:hashValue>
       </rep:documentHash>
-      <rep:documentReference>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl001.xml</rep:documentReference>
+      <rep:documentReference>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl001.xml</rep:documentReference>
    </rep:documentIdentification>
    <rep:scenarioMatched>
-      <ns2:scenario xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                    xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-         <ns2:name>EN16931 CIUS XRechnung (UBL Invoice)</ns2:name>
-         <ns2:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</ns2:namespace>
-         <ns2:namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</ns2:namespace>
-         <ns2:match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</ns2:match>
-         <ns2:validateWithXmlSchema>
-            <ns2:resource>
-               <ns2:name>XML Schema for UBL 2.1 Invoice</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithXmlSchema>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:createReport>
-            <ns2:resource>
-               <ns2:name>Prüfbericht für XRechnung</ns2:name>
-               <ns2:location>resources/xrechnung/xrechnung-report.xsl</ns2:location>
-            </ns2:resource>
-            <ns2:customLevel level="warning">BR-CL-04</ns2:customLevel>
-         </ns2:createReport>
-      </ns2:scenario>
-      <rep:documentData xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+      <s:scenario>
+         <s:name>EN16931 CIUS XRechnung (UBL Invoice)</s:name>
+         <s:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</s:namespace>
+         <s:namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</s:namespace>
+         <s:match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</s:match>
+         <s:validateWithXmlSchema>
+            <s:resource>
+               <s:name>XML Schema for UBL 2.1 Invoice</s:name>
+               <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</s:location>
+            </s:resource>
+         </s:validateWithXmlSchema>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for EN16931 (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:createReport>
+            <s:resource>
+               <s:name>Prüfbericht für XRechnung</s:name>
+               <s:location>resources/xrechnung/xrechnung-report.xsl</s:location>
+            </s:resource>
+            <s:customLevel level="warning">BR-CL-04</s:customLevel>
+         </s:createReport>
+      </s:scenario>
+      <rep:documentData xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                        xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                        xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                         xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                        xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                         xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
          <seller>De Koksmaat</seller>
          <id>12115118</id>
          <issueDate>2015-01-09</issueDate>
       </rep:documentData>
       <rep:validationStepResult id="val-xsd" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>XML Schema for UBL 2.1 Invoice</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>XML Schema for UBL 2.1 Invoice</s:name>
+            <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</s:location>
+         </s:resource>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.1" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for EN16931 (UBL)</s:name>
+            <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+         </s:resource>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.2" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</s:name>
+            <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</s:location>
+         </s:resource>
       </rep:validationStepResult>
    </rep:scenarioMatched>
    <rep:assessment>
@@ -221,14 +217,17 @@
                      <p class="important">Angaben zum geprüften Dokument</p>
                      <dl>
                         <dt>Referenz:</dt>
-                        <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl001.xml</dd>
+                        <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl001.xml</dd>
                         <dt>Zeitpunkt der Prüfung:</dt>
-                        <dd>21.9.2017 11:08:05</dd>
+                        <dd>19.12.2017 15:50:48</dd>
                         <dt>Erkannter Dokumenttyp:</dt>
                         <dd>EN16931 CIUS XRechnung (UBL Invoice)</dd>
                      </dl>
-                     <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+                     <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                         xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                         xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                          xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                         xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                          xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
                         <dt>Erkannter Rechnungssteller:</dt>
                         <dd>De Koksmaat</dd>
diff --git a/configurations/xrechnung/test/reports/ubl002-report.html b/configurations/xrechnung/test/reports/ubl002-report.html
index ffdbe43..2468896 100644
--- a/configurations/xrechnung/test/reports/ubl002-report.html
+++ b/configurations/xrechnung/test/reports/ubl002-report.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>Prüfbericht</title><style>
@@ -131,13 +131,13 @@
          <p class="important">Angaben zum geprüften Dokument</p>
          <dl>
             <dt>Referenz:</dt>
-            <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl002.xml</dd>
+            <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl002.xml</dd>
             <dt>Zeitpunkt der Prüfung:</dt>
-            <dd>21.9.2017 11:08:05</dd>
+            <dd>19.12.2017 15:50:48</dd>
             <dt>Erkannter Dokumenttyp:</dt>
             <dd>EN16931 CIUS XRechnung (UBL Invoice)</dd>
          </dl>
-         <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+         <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
             <dt>Erkannte Rechnungsnummer:</dt>
             <dd>12115118</dd>
             <dt>Erkanntes Rechnungsdatum:</dt>
@@ -192,7 +192,7 @@
                <td rowspan="2">val-sch.1.1</td>
                <td rowspan="2">BR-06</td>
                <td rowspan="2">error</td>
-               <td>[BR-06]-An Invoice shall contain Seller name.</td>
+               <td>[BR-06]-An Invoice shall contain the Seller name (BT-27).</td>
             </tr>
             <tr class="error">
                <td>Pfad: /Invoice</td>
diff --git a/configurations/xrechnung/test/reports/ubl002-report.xml b/configurations/xrechnung/test/reports/ubl002-report.xml
index ba20f4f..026cc6a 100644
--- a/configurations/xrechnung/test/reports/ubl002-report.xml
+++ b/configurations/xrechnung/test/reports/ubl002-report.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rep:report xmlns:rep="http://www.xoev.de/de/validator/varl/1"
-            xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
             xmlns:html="http://www.w3.org/1999/xhtml"
             xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput"
             xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios"
             xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-            xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
             xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             valid="false"
@@ -14,81 +11,80 @@
    <rep:engine>
       <rep:name>KoSIT Prüftool</rep:name>
    </rep:engine>
-   <rep:timestamp>2017-09-21T11:08:05.307+02:00</rep:timestamp>
+   <rep:timestamp>2017-12-19T15:50:48.971+01:00</rep:timestamp>
    <rep:documentIdentification>
       <rep:documentHash>
          <rep:hashAlgorithm>SHA-256</rep:hashAlgorithm>
          <rep:hashValue>OP1I4VZkYBrccyER0+07Df8ZlgJK69gzNDlg6+tEjKk=</rep:hashValue>
       </rep:documentHash>
-      <rep:documentReference>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl002.xml</rep:documentReference>
+      <rep:documentReference>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl002.xml</rep:documentReference>
    </rep:documentIdentification>
    <rep:scenarioMatched>
-      <ns2:scenario xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                    xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-         <ns2:name>EN16931 CIUS XRechnung (UBL Invoice)</ns2:name>
-         <ns2:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</ns2:namespace>
-         <ns2:namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</ns2:namespace>
-         <ns2:match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</ns2:match>
-         <ns2:validateWithXmlSchema>
-            <ns2:resource>
-               <ns2:name>XML Schema for UBL 2.1 Invoice</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithXmlSchema>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:createReport>
-            <ns2:resource>
-               <ns2:name>Prüfbericht für XRechnung</ns2:name>
-               <ns2:location>resources/xrechnung/xrechnung-report.xsl</ns2:location>
-            </ns2:resource>
-            <ns2:customLevel level="warning">BR-CL-04</ns2:customLevel>
-         </ns2:createReport>
-      </ns2:scenario>
-      <rep:documentData xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+      <s:scenario>
+         <s:name>EN16931 CIUS XRechnung (UBL Invoice)</s:name>
+         <s:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</s:namespace>
+         <s:namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</s:namespace>
+         <s:match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</s:match>
+         <s:validateWithXmlSchema>
+            <s:resource>
+               <s:name>XML Schema for UBL 2.1 Invoice</s:name>
+               <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</s:location>
+            </s:resource>
+         </s:validateWithXmlSchema>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for EN16931 (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:createReport>
+            <s:resource>
+               <s:name>Prüfbericht für XRechnung</s:name>
+               <s:location>resources/xrechnung/xrechnung-report.xsl</s:location>
+            </s:resource>
+            <s:customLevel level="warning">BR-CL-04</s:customLevel>
+         </s:createReport>
+      </s:scenario>
+      <rep:documentData xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                        xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                        xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                         xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                        xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                         xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
          <id>12115118</id>
          <issueDate>2015-01-09</issueDate>
       </rep:documentData>
       <rep:validationStepResult id="val-xsd" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>XML Schema for UBL 2.1 Invoice</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>XML Schema for UBL 2.1 Invoice</s:name>
+            <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</s:location>
+         </s:resource>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.1" valid="false">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for EN16931 (UBL)</s:name>
+            <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+         </s:resource>
          <rep:message code="BR-06"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/Invoice">[BR-06]-An Invoice shall contain Seller name. </rep:message>
+                      xpathLocation="/Invoice">[BR-06]-An Invoice shall contain the Seller name (BT-27).</rep:message>
          <rep:message code="UBL-CR-001"
                       id="val-sch.1.1"
                       level="warning"
                       xpathLocation="/Invoice">[UBL-CR-001]-A UBL invoice should not include extensions</rep:message>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.2" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</s:name>
+            <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</s:location>
+         </s:resource>
       </rep:validationStepResult>
    </rep:scenarioMatched>
    <rep:assessment>
@@ -228,14 +224,17 @@
                      <p class="important">Angaben zum geprüften Dokument</p>
                      <dl>
                         <dt>Referenz:</dt>
-                        <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl002.xml</dd>
+                        <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl002.xml</dd>
                         <dt>Zeitpunkt der Prüfung:</dt>
-                        <dd>21.9.2017 11:08:05</dd>
+                        <dd>19.12.2017 15:50:48</dd>
                         <dt>Erkannter Dokumenttyp:</dt>
                         <dd>EN16931 CIUS XRechnung (UBL Invoice)</dd>
                      </dl>
-                     <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+                     <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                         xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                         xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                          xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                         xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                          xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
                         <dt>Erkannte Rechnungsnummer:</dt>
                         <dd>12115118</dd>
@@ -291,7 +290,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-06</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-06]-An Invoice shall contain Seller name.</td>
+                           <td>[BR-06]-An Invoice shall contain the Seller name (BT-27).</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /Invoice</td>
diff --git a/configurations/xrechnung/test/reports/ubl003-report.html b/configurations/xrechnung/test/reports/ubl003-report.html
index dabe3f3..798ddc8 100644
--- a/configurations/xrechnung/test/reports/ubl003-report.html
+++ b/configurations/xrechnung/test/reports/ubl003-report.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>Prüfbericht</title><style>
@@ -131,13 +131,13 @@
          <p class="important">Angaben zum geprüften Dokument</p>
          <dl>
             <dt>Referenz:</dt>
-            <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl003.xml</dd>
+            <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl003.xml</dd>
             <dt>Zeitpunkt der Prüfung:</dt>
-            <dd>21.9.2017 11:08:05</dd>
+            <dd>19.12.2017 15:50:49</dd>
             <dt>Erkannter Dokumenttyp:</dt>
             <dd>EN16931 CIUS XRechnung (UBL Invoice)</dd>
          </dl>
-         <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+         <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
             <dt>Erkannter Rechnungssteller:</dt>
             <dd>De Koksmaat</dd>
             <dt>Erkannte Rechnungsnummer:</dt>
diff --git a/configurations/xrechnung/test/reports/ubl003-report.xml b/configurations/xrechnung/test/reports/ubl003-report.xml
index c34bff6..03ec4a2 100644
--- a/configurations/xrechnung/test/reports/ubl003-report.xml
+++ b/configurations/xrechnung/test/reports/ubl003-report.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rep:report xmlns:rep="http://www.xoev.de/de/validator/varl/1"
-            xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
             xmlns:html="http://www.w3.org/1999/xhtml"
             xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput"
             xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios"
             xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-            xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
             xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             valid="false"
@@ -14,78 +11,77 @@
    <rep:engine>
       <rep:name>KoSIT Prüftool</rep:name>
    </rep:engine>
-   <rep:timestamp>2017-09-21T11:08:05.460+02:00</rep:timestamp>
+   <rep:timestamp>2017-12-19T15:50:49.111+01:00</rep:timestamp>
    <rep:documentIdentification>
       <rep:documentHash>
          <rep:hashAlgorithm>SHA-256</rep:hashAlgorithm>
          <rep:hashValue>vnhEaK4dbrJMInPkDxtngdDZgdgeB5nffUxqXC3gzEY=</rep:hashValue>
       </rep:documentHash>
-      <rep:documentReference>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl003.xml</rep:documentReference>
+      <rep:documentReference>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl003.xml</rep:documentReference>
    </rep:documentIdentification>
    <rep:scenarioMatched>
-      <ns2:scenario xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                    xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-         <ns2:name>EN16931 CIUS XRechnung (UBL Invoice)</ns2:name>
-         <ns2:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</ns2:namespace>
-         <ns2:namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</ns2:namespace>
-         <ns2:match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</ns2:match>
-         <ns2:validateWithXmlSchema>
-            <ns2:resource>
-               <ns2:name>XML Schema for UBL 2.1 Invoice</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithXmlSchema>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:createReport>
-            <ns2:resource>
-               <ns2:name>Prüfbericht für XRechnung</ns2:name>
-               <ns2:location>resources/xrechnung/xrechnung-report.xsl</ns2:location>
-            </ns2:resource>
-            <ns2:customLevel level="warning">BR-CL-04</ns2:customLevel>
-         </ns2:createReport>
-      </ns2:scenario>
-      <rep:documentData xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+      <s:scenario>
+         <s:name>EN16931 CIUS XRechnung (UBL Invoice)</s:name>
+         <s:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</s:namespace>
+         <s:namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</s:namespace>
+         <s:match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</s:match>
+         <s:validateWithXmlSchema>
+            <s:resource>
+               <s:name>XML Schema for UBL 2.1 Invoice</s:name>
+               <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</s:location>
+            </s:resource>
+         </s:validateWithXmlSchema>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for EN16931 (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:createReport>
+            <s:resource>
+               <s:name>Prüfbericht für XRechnung</s:name>
+               <s:location>resources/xrechnung/xrechnung-report.xsl</s:location>
+            </s:resource>
+            <s:customLevel level="warning">BR-CL-04</s:customLevel>
+         </s:createReport>
+      </s:scenario>
+      <rep:documentData xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                        xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                        xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                         xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                        xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                         xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
          <seller>De Koksmaat</seller>
          <id>12115118</id>
          <issueDate>2015-01-09</issueDate>
       </rep:documentData>
       <rep:validationStepResult id="val-xsd" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>XML Schema for UBL 2.1 Invoice</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>XML Schema for UBL 2.1 Invoice</s:name>
+            <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</s:location>
+         </s:resource>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.1" valid="false">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for EN16931 (UBL)</s:name>
+            <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+         </s:resource>
          <rep:message code="BR-CL-04"
                       id="val-sch.1.1"
                       level="error"
                       xpathLocation="/Invoice/cbc:DocumentCurrencyCode">[BR-CL-04]-Invoice currency code MUST be coded using ISO code list 4217 alpha-3</rep:message>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.2" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</s:name>
+            <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</s:location>
+         </s:resource>
       </rep:validationStepResult>
    </rep:scenarioMatched>
    <rep:assessment>
@@ -225,14 +221,17 @@
                      <p class="important">Angaben zum geprüften Dokument</p>
                      <dl>
                         <dt>Referenz:</dt>
-                        <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl003.xml</dd>
+                        <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl003.xml</dd>
                         <dt>Zeitpunkt der Prüfung:</dt>
-                        <dd>21.9.2017 11:08:05</dd>
+                        <dd>19.12.2017 15:50:49</dd>
                         <dt>Erkannter Dokumenttyp:</dt>
                         <dd>EN16931 CIUS XRechnung (UBL Invoice)</dd>
                      </dl>
-                     <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+                     <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                         xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                         xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                          xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                         xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                          xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
                         <dt>Erkannter Rechnungssteller:</dt>
                         <dd>De Koksmaat</dd>
diff --git a/configurations/xrechnung/test/reports/ubl004-report.html b/configurations/xrechnung/test/reports/ubl004-report.html
index 6245bc0..6ade6e4 100644
--- a/configurations/xrechnung/test/reports/ubl004-report.html
+++ b/configurations/xrechnung/test/reports/ubl004-report.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>Prüfbericht</title><style>
@@ -131,13 +131,13 @@
          <p class="important">Angaben zum geprüften Dokument</p>
          <dl>
             <dt>Referenz:</dt>
-            <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl004.xml</dd>
+            <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl004.xml</dd>
             <dt>Zeitpunkt der Prüfung:</dt>
-            <dd>21.9.2017 11:08:05</dd>
+            <dd>19.12.2017 15:50:49</dd>
             <dt>Erkannter Dokumenttyp:</dt>
             <dd>EN16931 CIUS XRechnung (UBL Invoice)</dd>
          </dl>
-         <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+         <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
             <dt>Erkannter Rechnungssteller:</dt>
             <dd>De Koksmaat</dd>
             <dt>Erkannte Rechnungsnummer:</dt>
diff --git a/configurations/xrechnung/test/reports/ubl004-report.xml b/configurations/xrechnung/test/reports/ubl004-report.xml
index 3411ea9..3ae3bd8 100644
--- a/configurations/xrechnung/test/reports/ubl004-report.xml
+++ b/configurations/xrechnung/test/reports/ubl004-report.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rep:report xmlns:rep="http://www.xoev.de/de/validator/varl/1"
-            xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
             xmlns:html="http://www.w3.org/1999/xhtml"
             xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput"
             xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios"
             xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-            xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
             xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             valid="false"
@@ -14,74 +11,73 @@
    <rep:engine>
       <rep:name>KoSIT Prüftool</rep:name>
    </rep:engine>
-   <rep:timestamp>2017-09-21T11:08:05.617+02:00</rep:timestamp>
+   <rep:timestamp>2017-12-19T15:50:49.252+01:00</rep:timestamp>
    <rep:documentIdentification>
       <rep:documentHash>
          <rep:hashAlgorithm>SHA-256</rep:hashAlgorithm>
          <rep:hashValue>EsZfD9vQAuYIs60kxtOUoraNWHEboDi+SPY3YQswqqs=</rep:hashValue>
       </rep:documentHash>
-      <rep:documentReference>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl004.xml</rep:documentReference>
+      <rep:documentReference>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl004.xml</rep:documentReference>
    </rep:documentIdentification>
    <rep:scenarioMatched>
-      <ns2:scenario xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                    xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-         <ns2:name>EN16931 CIUS XRechnung (UBL Invoice)</ns2:name>
-         <ns2:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</ns2:namespace>
-         <ns2:namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</ns2:namespace>
-         <ns2:match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</ns2:match>
-         <ns2:validateWithXmlSchema>
-            <ns2:resource>
-               <ns2:name>XML Schema for UBL 2.1 Invoice</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithXmlSchema>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:createReport>
-            <ns2:resource>
-               <ns2:name>Prüfbericht für XRechnung</ns2:name>
-               <ns2:location>resources/xrechnung/xrechnung-report.xsl</ns2:location>
-            </ns2:resource>
-            <ns2:customLevel level="warning">BR-CL-04</ns2:customLevel>
-         </ns2:createReport>
-      </ns2:scenario>
-      <rep:documentData xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+      <s:scenario>
+         <s:name>EN16931 CIUS XRechnung (UBL Invoice)</s:name>
+         <s:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</s:namespace>
+         <s:namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</s:namespace>
+         <s:match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</s:match>
+         <s:validateWithXmlSchema>
+            <s:resource>
+               <s:name>XML Schema for UBL 2.1 Invoice</s:name>
+               <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</s:location>
+            </s:resource>
+         </s:validateWithXmlSchema>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for EN16931 (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:createReport>
+            <s:resource>
+               <s:name>Prüfbericht für XRechnung</s:name>
+               <s:location>resources/xrechnung/xrechnung-report.xsl</s:location>
+            </s:resource>
+            <s:customLevel level="warning">BR-CL-04</s:customLevel>
+         </s:createReport>
+      </s:scenario>
+      <rep:documentData xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                        xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                        xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                         xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                        xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                         xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
          <seller>De Koksmaat</seller>
          <id>12115118</id>
          <issueDate>2015-01-09</issueDate>
       </rep:documentData>
       <rep:validationStepResult id="val-xsd" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>XML Schema for UBL 2.1 Invoice</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>XML Schema for UBL 2.1 Invoice</s:name>
+            <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</s:location>
+         </s:resource>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.1" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for EN16931 (UBL)</s:name>
+            <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+         </s:resource>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.2" valid="false">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</s:name>
+            <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</s:location>
+         </s:resource>
          <rep:message code="BR-DE-3"
                       id="val-sch.2.1"
                       level="error"
@@ -225,14 +221,17 @@
                      <p class="important">Angaben zum geprüften Dokument</p>
                      <dl>
                         <dt>Referenz:</dt>
-                        <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl004.xml</dd>
+                        <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl004.xml</dd>
                         <dt>Zeitpunkt der Prüfung:</dt>
-                        <dd>21.9.2017 11:08:05</dd>
+                        <dd>19.12.2017 15:50:49</dd>
                         <dt>Erkannter Dokumenttyp:</dt>
                         <dd>EN16931 CIUS XRechnung (UBL Invoice)</dd>
                      </dl>
-                     <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+                     <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                         xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                         xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                          xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                         xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                          xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
                         <dt>Erkannter Rechnungssteller:</dt>
                         <dd>De Koksmaat</dd>
diff --git a/configurations/xrechnung/test/reports/ubl005-report.html b/configurations/xrechnung/test/reports/ubl005-report.html
index afe6edb..924ab48 100644
--- a/configurations/xrechnung/test/reports/ubl005-report.html
+++ b/configurations/xrechnung/test/reports/ubl005-report.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>Prüfbericht</title><style>
@@ -131,13 +131,13 @@
          <p class="important">Angaben zum geprüften Dokument</p>
          <dl>
             <dt>Referenz:</dt>
-            <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl005.xml</dd>
+            <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl005.xml</dd>
             <dt>Zeitpunkt der Prüfung:</dt>
-            <dd>21.9.2017 11:08:05</dd>
+            <dd>19.12.2017 15:50:49</dd>
             <dt>Erkannter Dokumenttyp:</dt>
             <dd>EN16931 CIUS XRechnung (UBL Invoice)</dd>
          </dl>
-         <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+         <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
             <dt>Erkannter Rechnungssteller:</dt>
             <dd>De Koksmaat</dd>
             <dt>Erkannte Rechnungsnummer:</dt>
diff --git a/configurations/xrechnung/test/reports/ubl005-report.xml b/configurations/xrechnung/test/reports/ubl005-report.xml
index ee2d611..bd4b1de 100644
--- a/configurations/xrechnung/test/reports/ubl005-report.xml
+++ b/configurations/xrechnung/test/reports/ubl005-report.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rep:report xmlns:rep="http://www.xoev.de/de/validator/varl/1"
-            xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
             xmlns:html="http://www.w3.org/1999/xhtml"
             xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput"
             xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios"
             xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-            xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
             xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             valid="false"
@@ -14,59 +11,60 @@
    <rep:engine>
       <rep:name>KoSIT Prüftool</rep:name>
    </rep:engine>
-   <rep:timestamp>2017-09-21T11:08:05.759+02:00</rep:timestamp>
+   <rep:timestamp>2017-12-19T15:50:49.392+01:00</rep:timestamp>
    <rep:documentIdentification>
       <rep:documentHash>
          <rep:hashAlgorithm>SHA-256</rep:hashAlgorithm>
          <rep:hashValue>riDl9AhkZzKVqU9CnYNm0WKz0FUox42TcjGgZjZCHCI=</rep:hashValue>
       </rep:documentHash>
-      <rep:documentReference>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl005.xml</rep:documentReference>
+      <rep:documentReference>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl005.xml</rep:documentReference>
    </rep:documentIdentification>
    <rep:scenarioMatched>
-      <ns2:scenario xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                    xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-         <ns2:name>EN16931 CIUS XRechnung (UBL Invoice)</ns2:name>
-         <ns2:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</ns2:namespace>
-         <ns2:namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</ns2:namespace>
-         <ns2:match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</ns2:match>
-         <ns2:validateWithXmlSchema>
-            <ns2:resource>
-               <ns2:name>XML Schema for UBL 2.1 Invoice</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithXmlSchema>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:createReport>
-            <ns2:resource>
-               <ns2:name>Prüfbericht für XRechnung</ns2:name>
-               <ns2:location>resources/xrechnung/xrechnung-report.xsl</ns2:location>
-            </ns2:resource>
-            <ns2:customLevel level="warning">BR-CL-04</ns2:customLevel>
-         </ns2:createReport>
-      </ns2:scenario>
-      <rep:documentData xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+      <s:scenario>
+         <s:name>EN16931 CIUS XRechnung (UBL Invoice)</s:name>
+         <s:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</s:namespace>
+         <s:namespace prefix="invoice">urn:oasis:names:specification:ubl:schema:xsd:Invoice-2</s:namespace>
+         <s:match>/invoice:Invoice[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</s:match>
+         <s:validateWithXmlSchema>
+            <s:resource>
+               <s:name>XML Schema for UBL 2.1 Invoice</s:name>
+               <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</s:location>
+            </s:resource>
+         </s:validateWithXmlSchema>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for EN16931 (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for Invoice - CIUS XRechnung (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-Invoice.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:createReport>
+            <s:resource>
+               <s:name>Prüfbericht für XRechnung</s:name>
+               <s:location>resources/xrechnung/xrechnung-report.xsl</s:location>
+            </s:resource>
+            <s:customLevel level="warning">BR-CL-04</s:customLevel>
+         </s:createReport>
+      </s:scenario>
+      <rep:documentData xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                        xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                        xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                         xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                        xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                         xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
          <seller>De Koksmaat</seller>
          <id>12115118</id>
       </rep:documentData>
       <rep:validationStepResult id="val-xsd" valid="false">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>XML Schema for UBL 2.1 Invoice</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>XML Schema for UBL 2.1 Invoice</s:name>
+            <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-Invoice-2.1.xsd</s:location>
+         </s:resource>
          <rep:message code="cvc-complex-type.2.4.a"
                       columnNumber="18"
                       id="val-xsd.1"
@@ -211,14 +209,17 @@
                      <p class="important">Angaben zum geprüften Dokument</p>
                      <dl>
                         <dt>Referenz:</dt>
-                        <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl005.xml</dd>
+                        <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl005.xml</dd>
                         <dt>Zeitpunkt der Prüfung:</dt>
-                        <dd>21.9.2017 11:08:05</dd>
+                        <dd>19.12.2017 15:50:49</dd>
                         <dt>Erkannter Dokumenttyp:</dt>
                         <dd>EN16931 CIUS XRechnung (UBL Invoice)</dd>
                      </dl>
-                     <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+                     <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                         xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                         xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                          xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                         xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                          xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
                         <dt>Erkannter Rechnungssteller:</dt>
                         <dd>De Koksmaat</dd>
diff --git a/configurations/xrechnung/test/reports/ubl006-report.html b/configurations/xrechnung/test/reports/ubl006-report.html
index a2a541f..6057efd 100644
--- a/configurations/xrechnung/test/reports/ubl006-report.html
+++ b/configurations/xrechnung/test/reports/ubl006-report.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>Prüfbericht</title><style>
@@ -131,9 +131,9 @@
          <p class="important">Angaben zum geprüften Dokument</p>
          <dl>
             <dt>Referenz:</dt>
-            <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl006.xml</dd>
+            <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl006.xml</dd>
             <dt>Zeitpunkt der Prüfung:</dt>
-            <dd>21.9.2017 11:08:05</dd>
+            <dd>19.12.2017 15:50:49</dd>
             <dt>Erkannter Dokumenttyp:</dt>
             <dd><b class="error">unbekannt</b></dd>
          </dl>
diff --git a/configurations/xrechnung/test/reports/ubl006-report.xml b/configurations/xrechnung/test/reports/ubl006-report.xml
index 1416b54..953e1cf 100644
--- a/configurations/xrechnung/test/reports/ubl006-report.xml
+++ b/configurations/xrechnung/test/reports/ubl006-report.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rep:report xmlns:rep="http://www.xoev.de/de/validator/varl/1"
-            xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
             xmlns:html="http://www.w3.org/1999/xhtml"
             xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput"
             xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios"
             xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-            xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
             xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             valid="false"
@@ -14,13 +11,13 @@
    <rep:engine>
       <rep:name>KoSIT Prüftool</rep:name>
    </rep:engine>
-   <rep:timestamp>2017-09-21T11:08:05.849+02:00</rep:timestamp>
+   <rep:timestamp>2017-12-19T15:50:49.486+01:00</rep:timestamp>
    <rep:documentIdentification>
       <rep:documentHash>
          <rep:hashAlgorithm>SHA-256</rep:hashAlgorithm>
          <rep:hashValue>BKKOJO/vyijaAlUZ4l/3JmjUeo9RKNjDn9rfo5XmDu8=</rep:hashValue>
       </rep:documentHash>
-      <rep:documentReference>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl006.xml</rep:documentReference>
+      <rep:documentReference>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl006.xml</rep:documentReference>
    </rep:documentIdentification>
    <rep:noScenarioMatched>
       <rep:validationStepResult id="val-xml" valid="true"/>
@@ -162,9 +159,9 @@
                      <p class="important">Angaben zum geprüften Dokument</p>
                      <dl>
                         <dt>Referenz:</dt>
-                        <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl006.xml</dd>
+                        <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl006.xml</dd>
                         <dt>Zeitpunkt der Prüfung:</dt>
-                        <dd>21.9.2017 11:08:05</dd>
+                        <dd>19.12.2017 15:50:49</dd>
                         <dt>Erkannter Dokumenttyp:</dt>
                         <dd>
                            <b class="error">unbekannt</b>
diff --git a/configurations/xrechnung/test/reports/ubl007-report.html b/configurations/xrechnung/test/reports/ubl007-report.html
index 16c269c..327d9e5 100644
--- a/configurations/xrechnung/test/reports/ubl007-report.html
+++ b/configurations/xrechnung/test/reports/ubl007-report.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>Prüfbericht</title><style>
@@ -131,9 +131,9 @@
          <p class="important">Angaben zum geprüften Dokument</p>
          <dl>
             <dt>Referenz:</dt>
-            <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl007.xml</dd>
+            <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl007.xml</dd>
             <dt>Zeitpunkt der Prüfung:</dt>
-            <dd>21.9.2017 11:08:05</dd>
+            <dd>19.12.2017 15:50:49</dd>
             <dt>Erkannter Dokumenttyp:</dt>
             <dd><b class="error">unbekannt</b></dd>
          </dl>
diff --git a/configurations/xrechnung/test/reports/ubl007-report.xml b/configurations/xrechnung/test/reports/ubl007-report.xml
index bdbc71c..27bcf9c 100644
--- a/configurations/xrechnung/test/reports/ubl007-report.xml
+++ b/configurations/xrechnung/test/reports/ubl007-report.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rep:report xmlns:rep="http://www.xoev.de/de/validator/varl/1"
-            xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
             xmlns:html="http://www.w3.org/1999/xhtml"
             xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput"
             xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios"
             xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-            xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
             xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             valid="false"
@@ -14,13 +11,13 @@
    <rep:engine>
       <rep:name>KoSIT Prüftool</rep:name>
    </rep:engine>
-   <rep:timestamp>2017-09-21T11:08:05.929+02:00</rep:timestamp>
+   <rep:timestamp>2017-12-19T15:50:49.579+01:00</rep:timestamp>
    <rep:documentIdentification>
       <rep:documentHash>
          <rep:hashAlgorithm>SHA-256</rep:hashAlgorithm>
          <rep:hashValue>j3mjlUm+6rbalED9U4bo+zEqm3nCIYAgOGImBP2IGhc=</rep:hashValue>
       </rep:documentHash>
-      <rep:documentReference>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl007.xml</rep:documentReference>
+      <rep:documentReference>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl007.xml</rep:documentReference>
    </rep:documentIdentification>
    <rep:noScenarioMatched>
       <rep:validationStepResult id="val-xml" valid="false">
@@ -168,9 +165,9 @@
                      <p class="important">Angaben zum geprüften Dokument</p>
                      <dl>
                         <dt>Referenz:</dt>
-                        <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl007.xml</dd>
+                        <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl007.xml</dd>
                         <dt>Zeitpunkt der Prüfung:</dt>
-                        <dd>21.9.2017 11:08:05</dd>
+                        <dd>19.12.2017 15:50:49</dd>
                         <dt>Erkannter Dokumenttyp:</dt>
                         <dd>
                            <b class="error">unbekannt</b>
diff --git a/configurations/xrechnung/test/reports/ubl008-report.html b/configurations/xrechnung/test/reports/ubl008-report.html
index f37021f..8572a41 100644
--- a/configurations/xrechnung/test/reports/ubl008-report.html
+++ b/configurations/xrechnung/test/reports/ubl008-report.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
+<?xml version="1.0" encoding="UTF-8"?><html xmlns="http://www.w3.org/1999/xhtml" xmlns:rep="http://www.xoev.de/de/validator/varl/1" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput" xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios" xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" data-report-type="report">
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>Prüfbericht</title><style>
@@ -131,13 +131,13 @@
          <p class="important">Angaben zum geprüften Dokument</p>
          <dl>
             <dt>Referenz:</dt>
-            <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl008.xml</dd>
+            <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl008.xml</dd>
             <dt>Zeitpunkt der Prüfung:</dt>
-            <dd>21.9.2017 11:08:05</dd>
+            <dd>19.12.2017 15:50:49</dd>
             <dt>Erkannter Dokumenttyp:</dt>
             <dd>EN16931 CIUS XRechnung (UBL CreditNote)</dd>
          </dl>
-         <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
+         <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100" xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
             <dt>Erkannter Rechnungssteller:</dt>
             <dd>De Koksmaat</dd>
             <dt>Erkannte Rechnungsnummer:</dt>
@@ -146,7 +146,7 @@
             <dd>2015-01-09</dd>
          </dl>
       </div>
-      <p class="important"><b>Konformitätsprüfung: </b>Das geprüfte Dokument enthält 14 Fehler / 0 Warnungen. Es ist <b>nicht konform</b> zu den formalen Vorgaben.
+      <p class="important"><b>Konformitätsprüfung: </b>Das geprüfte Dokument enthält 13 Fehler / 0 Warnungen. Es ist <b>nicht konform</b> zu den formalen Vorgaben.
       </p>
       <p>Übersicht der Validierungsergebnisse:</p>
       <table class="tbl-errors">
@@ -167,7 +167,7 @@
             </tr>
             <tr>
                <td>Schematron rules for EN16931 (UBL) (val-sch.1)</td>
-               <td style="width: 30mm;">13</td>
+               <td style="width: 30mm;">12</td>
                <td style="width: 30mm;">0</td>
                <td style="width: 30mm;">0</td>
             </tr>
@@ -194,10 +194,10 @@
                <td rowspan="2">val-sch.1.1</td>
                <td rowspan="2">BR-S-01</td>
                <td rowspan="2">error</td>
-               <td>[BR-S-01]-An Invoice that contains a line, a document level allowance or a document
-                  level charge where the Invoiced item VAT category code (BT-151, BT-95 or BT-102) is
-                  “Standard rated” shall contain in the VAT breakdown (BG-23) at least one VAT category
-                  code (BT-118) equal with "Standard rated".
+               <td>[BR-S-01]-An Invoice that contains an Invoice line (BG-25), a Document level allowance
+                  (BG-20) or a Document level charge (BG-21) where the VAT category code (BT-151, BT-95
+                  or BT-102) is “Standard rated” shall contain in the VATBReakdown (BG-23) at least
+                  one VAT category code (BT-118) equal with "Standard rated".
                </td>
             </tr>
             <tr class="error">
@@ -208,11 +208,11 @@
                <td rowspan="2">BR-S-08</td>
                <td rowspan="2">error</td>
                <td>[BR-S-08]-For each different value of VAT category rate (BT-119) where the VAT category
-                  code (BT-118) is "Standard rated", the VAT category taxable amount (BT-116) in a VAT
-                  breakdown (BG-23) shall equal the sum of Invoice line net amounts (BT-131) plus the
-                  sum of document level charge amounts (BT-99) minus the sum of document level allowance
-                  amounts (BT-92) where the VAT category code (BT-151, BT-102, BT-95) is “Standard rated”
-                  and the VAT rate (BT-152, BT-103, BT-96) equals the VAT category rate (BT-119).
+                  code (BT-118) is "Standard rated", the VAT category taxable amount (BT-116) in a VATBReakdown
+                  (BG-23) shall equal the sum of Invoice line net amounts (BT-131) plus the sum of document
+                  level charge amounts (BT-99) minus the sum of document level allowance amounts (BT-92)
+                  where the VAT category code (BT-151, BT-102, BT-95) is “Standard rated” and the VAT
+                  rate (BT-152, BT-103, BT-96) equals the VAT category rate (BT-119).
                </td>
             </tr>
             <tr class="error">
@@ -223,11 +223,11 @@
                <td rowspan="2">BR-S-08</td>
                <td rowspan="2">error</td>
                <td>[BR-S-08]-For each different value of VAT category rate (BT-119) where the VAT category
-                  code (BT-118) is "Standard rated", the VAT category taxable amount (BT-116) in a VAT
-                  breakdown (BG-23) shall equal the sum of Invoice line net amounts (BT-131) plus the
-                  sum of document level charge amounts (BT-99) minus the sum of document level allowance
-                  amounts (BT-92) where the VAT category code (BT-151, BT-102, BT-95) is “Standard rated”
-                  and the VAT rate (BT-152, BT-103, BT-96) equals the VAT category rate (BT-119).
+                  code (BT-118) is "Standard rated", the VAT category taxable amount (BT-116) in a VATBReakdown
+                  (BG-23) shall equal the sum of Invoice line net amounts (BT-131) plus the sum of document
+                  level charge amounts (BT-99) minus the sum of document level allowance amounts (BT-92)
+                  where the VAT category code (BT-151, BT-102, BT-95) is “Standard rated” and the VAT
+                  rate (BT-152, BT-103, BT-96) equals the VAT category rate (BT-119).
                </td>
             </tr>
             <tr class="error">
@@ -237,7 +237,7 @@
                <td rowspan="2">val-sch.1.1</td>
                <td rowspan="2">BR-CO-10</td>
                <td rowspan="2">error</td>
-               <td>[BR-CO-10]-Sum of Invoice line net amount = Σ Invoice line net amount.</td>
+               <td>[BR-CO-10]-Sum of Invoice line net amount (BT-106) = Σ Invoice line net amount (BT-131).</td>
             </tr>
             <tr class="error">
                <td>Pfad: /CreditNote/cac:LegalMonetaryTotal</td>
@@ -257,7 +257,7 @@
                <td rowspan="2">val-sch.1.1</td>
                <td rowspan="2">BR-22</td>
                <td rowspan="2">error</td>
-               <td>[BR-22]-Each Invoice line shall have an Invoiced quantity.</td>
+               <td>[BR-22]-Each Invoice line (BG-25) shall have an Invoiced quantity (BT-129).</td>
             </tr>
             <tr class="error">
                <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -266,7 +266,9 @@
                <td rowspan="2">val-sch.1.1</td>
                <td rowspan="2">BR-23</td>
                <td rowspan="2">error</td>
-               <td>[BR-23]-An invoiced quantity shall have an Invoice quantity unit of measure.</td>
+               <td>[BR-23]-An Invoice line (BG-25) shall have an Invoiced quantity unit of measure code
+                  (BT-130).
+               </td>
             </tr>
             <tr class="error">
                <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -275,7 +277,7 @@
                <td rowspan="2">val-sch.1.1</td>
                <td rowspan="2">BR-24</td>
                <td rowspan="2">error</td>
-               <td>[BR-24]-Each Invoice line shall have an Invoice line net amount.</td>
+               <td>[BR-24]-Each Invoice line (BG-25) shall have an Invoice line net amount (BT-131).</td>
             </tr>
             <tr class="error">
                <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -284,7 +286,7 @@
                <td rowspan="2">val-sch.1.1</td>
                <td rowspan="2">BR-25</td>
                <td rowspan="2">error</td>
-               <td>[BR-25]-Each Invoice line shall contain the Item name.</td>
+               <td>[BR-25]-Each Invoice line (BG-25) shall contain the Item name (BT-153).</td>
             </tr>
             <tr class="error">
                <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -293,7 +295,7 @@
                <td rowspan="2">val-sch.1.1</td>
                <td rowspan="2">BR-26</td>
                <td rowspan="2">error</td>
-               <td>[BR-26]-Each Invoice line shall contain the Item net price.</td>
+               <td>[BR-26]-Each Invoice line (BG-25) shall contain the Item net price (BT-146).</td>
             </tr>
             <tr class="error">
                <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -302,7 +304,7 @@
                <td rowspan="2">val-sch.1.1</td>
                <td rowspan="2">BR-27</td>
                <td rowspan="2">error</td>
-               <td>[BR-27]-The item net price shall NOT be negative.</td>
+               <td>[BR-27]-The Item net price (BT-146) shall NOT be negative.</td>
             </tr>
             <tr class="error">
                <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -311,22 +313,13 @@
                <td rowspan="2">val-sch.1.1</td>
                <td rowspan="2">BR-CO-04</td>
                <td rowspan="2">error</td>
-               <td>[BR-CO-04]-Each Invoice line shall be categorized with an Invoiced item VAT category
-                  code.
+               <td>[BR-CO-04]-Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT
+                  category code (BT-151).
                </td>
             </tr>
             <tr class="error">
                <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
             </tr>
-            <tr class="error">
-               <td rowspan="2">val-sch.1.1</td>
-               <td rowspan="2">BR-CL-16</td>
-               <td rowspan="2">error</td>
-               <td>[BR-CL-16]-Credit Note type code MUST be coded using UNCL1001 credit note codes.</td>
-            </tr>
-            <tr class="error">
-               <td>Pfad: /CreditNote/cbc:CreditNoteTypeCode</td>
-            </tr>
             <tr class="error">
                <td rowspan="2">val-sch.2.1</td>
                <td rowspan="2">BR-DE-15</td>
@@ -407,7 +400,7 @@
          <tr class="row" id="0005">
             <td class="pos">0005</td>
             <td class="element level2" title="CreditNoteTypeCode">
-               <div class="val">070</div>
+               <div class="val">326</div>
             </td>
          </tr>
          <tr class="row" id="0006">
diff --git a/configurations/xrechnung/test/reports/ubl008-report.xml b/configurations/xrechnung/test/reports/ubl008-report.xml
index 065399f..e34f4b5 100644
--- a/configurations/xrechnung/test/reports/ubl008-report.xml
+++ b/configurations/xrechnung/test/reports/ubl008-report.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rep:report xmlns:rep="http://www.xoev.de/de/validator/varl/1"
-            xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
             xmlns:html="http://www.w3.org/1999/xhtml"
             xmlns:in="http://www.xoev.de/de/validator/framework/1/createreportinput"
             xmlns:s="http://www.xoev.de/de/validator/framework/1/scenarios"
             xmlns:svrl="http://purl.oclc.org/dsdl/svrl"
-            xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
             xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             valid="false"
@@ -14,136 +11,120 @@
    <rep:engine>
       <rep:name>KoSIT Prüftool</rep:name>
    </rep:engine>
-   <rep:timestamp>2017-09-21T11:08:05.949+02:00</rep:timestamp>
+   <rep:timestamp>2017-12-19T15:50:49.595+01:00</rep:timestamp>
    <rep:documentIdentification>
       <rep:documentHash>
          <rep:hashAlgorithm>SHA-256</rep:hashAlgorithm>
-         <rep:hashValue>AOefPeWvVAS0lMISrG+1jxGNU6C/3W4zi1rbXQRoKoo=</rep:hashValue>
+         <rep:hashValue>8XlAzTl+VbCoxYLM5ne8r7f1qmQ1sXpfczUM0eUdeRI=</rep:hashValue>
       </rep:documentHash>
-      <rep:documentReference>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl008.xml</rep:documentReference>
+      <rep:documentReference>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl008.xml</rep:documentReference>
    </rep:documentIdentification>
    <rep:scenarioMatched>
-      <ns2:scenario xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                    xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-         <ns2:name>EN16931 CIUS XRechnung (UBL CreditNote)</ns2:name>
-         <ns2:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</ns2:namespace>
-         <ns2:namespace prefix="creditnote">urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2</ns2:namespace>
-         <ns2:match>/creditnote:CreditNote[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</ns2:match>
-         <ns2:validateWithXmlSchema>
-            <ns2:resource>
-               <ns2:name>XML Schema for UBL 2.1 CreditNote</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-CreditNote-2.1.xsd</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithXmlSchema>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:validateWithSchematron>
-            <ns2:resource>
-               <ns2:name>Schematron rules for CreditNote - CIUS XRechnung (UBL)</ns2:name>
-               <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-CreditNote.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:validateWithSchematron>
-         <ns2:createReport>
-            <ns2:resource>
-               <ns2:name>Prüfbericht für XRechnung</ns2:name>
-               <ns2:location>resources/xrechnung/xrechnung-report.xsl</ns2:location>
-            </ns2:resource>
-         </ns2:createReport>
-      </ns2:scenario>
-      <rep:documentData xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+      <s:scenario>
+         <s:name>EN16931 CIUS XRechnung (UBL CreditNote)</s:name>
+         <s:namespace prefix="cbc">urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2</s:namespace>
+         <s:namespace prefix="creditnote">urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2</s:namespace>
+         <s:match>/creditnote:CreditNote[starts-with(cbc:CustomizationID, 'urn:cen.eu:en16931:2017')]</s:match>
+         <s:validateWithXmlSchema>
+            <s:resource>
+               <s:name>XML Schema for UBL 2.1 CreditNote</s:name>
+               <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-CreditNote-2.1.xsd</s:location>
+            </s:resource>
+         </s:validateWithXmlSchema>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for EN16931 (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:validateWithSchematron>
+            <s:resource>
+               <s:name>Schematron rules for CreditNote - CIUS XRechnung (UBL)</s:name>
+               <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-CreditNote.xsl</s:location>
+            </s:resource>
+         </s:validateWithSchematron>
+         <s:createReport>
+            <s:resource>
+               <s:name>Prüfbericht für XRechnung</s:name>
+               <s:location>resources/xrechnung/xrechnung-report.xsl</s:location>
+            </s:resource>
+         </s:createReport>
+      </s:scenario>
+      <rep:documentData xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                        xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                        xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                         xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                        xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                         xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
          <seller>De Koksmaat</seller>
          <id>12115118</id>
          <issueDate>2015-01-09</issueDate>
       </rep:documentData>
       <rep:validationStepResult id="val-xsd" valid="true">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>XML Schema for UBL 2.1 CreditNote</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-CreditNote-2.1.xsd</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>XML Schema for UBL 2.1 CreditNote</s:name>
+            <s:location>resources/xrechnung/ubl21/xsdrt/maindoc/UBL-CreditNote-2.1.xsd</s:location>
+         </s:resource>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.1" valid="false">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for EN16931 (UBL)</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for EN16931 (UBL)</s:name>
+            <s:location>resources/xrechnung/ubl21/xsl/EN16931-UBL-validation.xsl</s:location>
+         </s:resource>
          <rep:message code="BR-S-01"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote">[BR-S-01]-An Invoice that contains a line, a document level allowance or a document level charge where the Invoiced
-						item VAT category code (BT-151, BT-95 or BT-102) is “Standard rated” shall contain in the VAT breakdown (BG-23) at least one
-						VAT category code (BT-118) equal with "Standard rated".</rep:message>
+                      xpathLocation="/CreditNote">[BR-S-01]-An Invoice that contains an Invoice line (BG-25), a Document level allowance (BG-20) or a Document level charge (BG-21) where the VAT category code (BT-151, BT-95 or BT-102) is “Standard rated” shall contain in the VATBReakdown (BG-23) at least one VAT category code (BT-118) equal with "Standard rated".</rep:message>
          <rep:message code="BR-S-08"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:TaxTotal/cac:TaxSubtotal/cac:TaxCategory">[BR-S-08]-For each different value of VAT category rate (BT-119) where the VAT category code (BT-118) is "Standard
-						rated", the VAT category taxable amount (BT-116) in a VAT breakdown (BG-23) shall equal the sum of Invoice line net amounts
-						(BT-131) plus the sum of document level charge amounts (BT-99) minus the sum of document level allowance amounts (BT-92) where
-						the VAT category code (BT-151, BT-102, BT-95) is “Standard rated” and the VAT rate (BT-152, BT-103, BT-96) equals the VAT
-						category rate (BT-119).</rep:message>
+                      xpathLocation="/CreditNote/cac:TaxTotal/cac:TaxSubtotal/cac:TaxCategory">[BR-S-08]-For each different value of VAT category rate (BT-119) where the VAT category code (BT-118) is "Standard rated", the VAT category taxable amount (BT-116) in a VATBReakdown (BG-23) shall equal the sum of Invoice line net amounts (BT-131) plus the sum of document level charge amounts (BT-99) minus the sum of document level allowance amounts (BT-92) where the VAT category code (BT-151, BT-102, BT-95) is “Standard rated” and the VAT rate (BT-152, BT-103, BT-96) equals the VAT category rate (BT-119).</rep:message>
          <rep:message code="BR-S-08"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:TaxTotal/cac:TaxSubtotal[2]/cac:TaxCategory">[BR-S-08]-For each different value of VAT category rate (BT-119) where the VAT category code (BT-118) is "Standard
-						rated", the VAT category taxable amount (BT-116) in a VAT breakdown (BG-23) shall equal the sum of Invoice line net amounts
-						(BT-131) plus the sum of document level charge amounts (BT-99) minus the sum of document level allowance amounts (BT-92) where
-						the VAT category code (BT-151, BT-102, BT-95) is “Standard rated” and the VAT rate (BT-152, BT-103, BT-96) equals the VAT
-						category rate (BT-119).</rep:message>
+                      xpathLocation="/CreditNote/cac:TaxTotal/cac:TaxSubtotal[2]/cac:TaxCategory">[BR-S-08]-For each different value of VAT category rate (BT-119) where the VAT category code (BT-118) is "Standard rated", the VAT category taxable amount (BT-116) in a VATBReakdown (BG-23) shall equal the sum of Invoice line net amounts (BT-131) plus the sum of document level charge amounts (BT-99) minus the sum of document level allowance amounts (BT-92) where the VAT category code (BT-151, BT-102, BT-95) is “Standard rated” and the VAT rate (BT-152, BT-103, BT-96) equals the VAT category rate (BT-119).</rep:message>
          <rep:message code="BR-CO-10"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:LegalMonetaryTotal">[BR-CO-10]-Sum of Invoice line net amount = Σ Invoice line net amount. </rep:message>
+                      xpathLocation="/CreditNote/cac:LegalMonetaryTotal">[BR-CO-10]-Sum of Invoice line net amount (BT-106) = Σ Invoice line net amount (BT-131).</rep:message>
          <rep:message code="BR-CO-25"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:LegalMonetaryTotal/cbc:PayableAmount">[BR-CO-25]-In case the Amount due for payment (BT-115) is positive, either the Payment due date (BT-9) or the Payment
-						terms (BT-20) shall be present.</rep:message>
+                      xpathLocation="/CreditNote/cac:LegalMonetaryTotal/cbc:PayableAmount">[BR-CO-25]-In case the Amount due for payment (BT-115) is positive, either the Payment due date (BT-9) or the Payment terms (BT-20) shall be present.</rep:message>
          <rep:message code="BR-22"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-22]-Each Invoice line shall have an Invoiced quantity. </rep:message>
+                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-22]-Each Invoice line (BG-25) shall have an Invoiced quantity (BT-129).</rep:message>
          <rep:message code="BR-23"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-23]-An invoiced quantity shall have an Invoice quantity unit of measure. </rep:message>
+                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-23]-An Invoice line (BG-25) shall have an Invoiced quantity unit of measure code (BT-130).</rep:message>
          <rep:message code="BR-24"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-24]-Each Invoice line shall have an Invoice line net amount. </rep:message>
+                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-24]-Each Invoice line (BG-25) shall have an Invoice line net amount (BT-131).</rep:message>
          <rep:message code="BR-25"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-25]-Each Invoice line shall contain the Item name. </rep:message>
+                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-25]-Each Invoice line (BG-25) shall contain the Item name (BT-153).</rep:message>
          <rep:message code="BR-26"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-26]-Each Invoice line shall contain the Item net price. </rep:message>
+                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-26]-Each Invoice line (BG-25) shall contain the Item net price (BT-146).</rep:message>
          <rep:message code="BR-27"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-27]-The item net price shall NOT be negative. </rep:message>
+                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-27]-The Item net price (BT-146) shall NOT be negative.</rep:message>
          <rep:message code="BR-CO-04"
                       id="val-sch.1.1"
                       level="error"
-                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-CO-04]-Each Invoice line shall be categorized with an Invoiced item VAT category code. </rep:message>
-         <rep:message code="BR-CL-16"
-                      id="val-sch.1.1"
-                      level="error"
-                      xpathLocation="/CreditNote/cbc:CreditNoteTypeCode">[BR-CL-16]-Credit Note type code MUST be coded using UNCL1001 credit note codes.</rep:message>
+                      xpathLocation="/CreditNote/cac:CreditNoteLine">[BR-CO-04]-Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT category code (BT-151).</rep:message>
       </rep:validationStepResult>
       <rep:validationStepResult id="val-sch.2" valid="false">
-         <ns2:resource xmlns:ns2="http://www.xoev.de/de/validator/framework/1/scenarios"
-                       xmlns="http://www.xoev.de/de/validator/framework/1/createreportinput">
-            <ns2:name>Schematron rules for CreditNote - CIUS XRechnung (UBL)</ns2:name>
-            <ns2:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-CreditNote.xsl</ns2:location>
-         </ns2:resource>
+         <s:resource>
+            <s:name>Schematron rules for CreditNote - CIUS XRechnung (UBL)</s:name>
+            <s:location>resources/xrechnung/ubl21/xsl/XRechnung-UBL-validation-CreditNote.xsl</s:location>
+         </s:resource>
          <rep:message code="BR-DE-15"
                       id="val-sch.2.1"
                       level="error"
@@ -287,14 +268,17 @@
                      <p class="important">Angaben zum geprüften Dokument</p>
                      <dl>
                         <dt>Referenz:</dt>
-                        <dd>c:\fb\svn\xoev\produkte\prueftool\trunk\xrechnung\test\instances\ubl008.xml</dd>
+                        <dd>c:\fb\git\validationtool\configurations\xrechnung\test\instances\ubl008.xml</dd>
                         <dt>Zeitpunkt der Prüfung:</dt>
-                        <dd>21.9.2017 11:08:05</dd>
+                        <dd>19.12.2017 15:50:49</dd>
                         <dt>Erkannter Dokumenttyp:</dt>
                         <dd>EN16931 CIUS XRechnung (UBL CreditNote)</dd>
                      </dl>
-                     <dl xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
+                     <dl xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                         xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                         xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                          xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
+                         xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
                          xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
                         <dt>Erkannter Rechnungssteller:</dt>
                         <dd>De Koksmaat</dd>
@@ -305,7 +289,7 @@
                      </dl>
                   </div>
                   <p class="important">
-                     <b>Konformitätsprüfung: </b>Das geprüfte Dokument enthält 14 Fehler / 0 Warnungen. Es ist <b>nicht konform</b> zu den formalen Vorgaben.</p>
+                     <b>Konformitätsprüfung: </b>Das geprüfte Dokument enthält 13 Fehler / 0 Warnungen. Es ist <b>nicht konform</b> zu den formalen Vorgaben.</p>
                   <p>Übersicht der Validierungsergebnisse:</p>
                   <table class="tbl-errors">
                      <thead>
@@ -325,7 +309,7 @@
                         </tr>
                         <tr>
                            <td>Schematron rules for EN16931 (UBL) (val-sch.1)</td>
-                           <td style="width: 30mm;">13</td>
+                           <td style="width: 30mm;">12</td>
                            <td style="width: 30mm;">0</td>
                            <td style="width: 30mm;">0</td>
                         </tr>
@@ -352,7 +336,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-S-01</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-S-01]-An Invoice that contains a line, a document level allowance or a document level charge where the Invoiced item VAT category code (BT-151, BT-95 or BT-102) is “Standard rated” shall contain in the VAT breakdown (BG-23) at least one VAT category code (BT-118) equal with "Standard rated".</td>
+                           <td>[BR-S-01]-An Invoice that contains an Invoice line (BG-25), a Document level allowance (BG-20) or a Document level charge (BG-21) where the VAT category code (BT-151, BT-95 or BT-102) is “Standard rated” shall contain in the VATBReakdown (BG-23) at least one VAT category code (BT-118) equal with "Standard rated".</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote</td>
@@ -361,7 +345,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-S-08</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-S-08]-For each different value of VAT category rate (BT-119) where the VAT category code (BT-118) is "Standard rated", the VAT category taxable amount (BT-116) in a VAT breakdown (BG-23) shall equal the sum of Invoice line net amounts (BT-131) plus the sum of document level charge amounts (BT-99) minus the sum of document level allowance amounts (BT-92) where the VAT category code (BT-151, BT-102, BT-95) is “Standard rated” and the VAT rate (BT-152, BT-103, BT-96) equals the VAT category rate (BT-119).</td>
+                           <td>[BR-S-08]-For each different value of VAT category rate (BT-119) where the VAT category code (BT-118) is "Standard rated", the VAT category taxable amount (BT-116) in a VATBReakdown (BG-23) shall equal the sum of Invoice line net amounts (BT-131) plus the sum of document level charge amounts (BT-99) minus the sum of document level allowance amounts (BT-92) where the VAT category code (BT-151, BT-102, BT-95) is “Standard rated” and the VAT rate (BT-152, BT-103, BT-96) equals the VAT category rate (BT-119).</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote/cac:TaxTotal/cac:TaxSubtotal/cac:TaxCategory</td>
@@ -370,7 +354,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-S-08</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-S-08]-For each different value of VAT category rate (BT-119) where the VAT category code (BT-118) is "Standard rated", the VAT category taxable amount (BT-116) in a VAT breakdown (BG-23) shall equal the sum of Invoice line net amounts (BT-131) plus the sum of document level charge amounts (BT-99) minus the sum of document level allowance amounts (BT-92) where the VAT category code (BT-151, BT-102, BT-95) is “Standard rated” and the VAT rate (BT-152, BT-103, BT-96) equals the VAT category rate (BT-119).</td>
+                           <td>[BR-S-08]-For each different value of VAT category rate (BT-119) where the VAT category code (BT-118) is "Standard rated", the VAT category taxable amount (BT-116) in a VATBReakdown (BG-23) shall equal the sum of Invoice line net amounts (BT-131) plus the sum of document level charge amounts (BT-99) minus the sum of document level allowance amounts (BT-92) where the VAT category code (BT-151, BT-102, BT-95) is “Standard rated” and the VAT rate (BT-152, BT-103, BT-96) equals the VAT category rate (BT-119).</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote/cac:TaxTotal/cac:TaxSubtotal[2]/cac:TaxCategory</td>
@@ -379,7 +363,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-CO-10</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-CO-10]-Sum of Invoice line net amount = Σ Invoice line net amount.</td>
+                           <td>[BR-CO-10]-Sum of Invoice line net amount (BT-106) = Σ Invoice line net amount (BT-131).</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote/cac:LegalMonetaryTotal</td>
@@ -397,7 +381,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-22</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-22]-Each Invoice line shall have an Invoiced quantity.</td>
+                           <td>[BR-22]-Each Invoice line (BG-25) shall have an Invoiced quantity (BT-129).</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -406,7 +390,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-23</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-23]-An invoiced quantity shall have an Invoice quantity unit of measure.</td>
+                           <td>[BR-23]-An Invoice line (BG-25) shall have an Invoiced quantity unit of measure code (BT-130).</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -415,7 +399,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-24</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-24]-Each Invoice line shall have an Invoice line net amount.</td>
+                           <td>[BR-24]-Each Invoice line (BG-25) shall have an Invoice line net amount (BT-131).</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -424,7 +408,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-25</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-25]-Each Invoice line shall contain the Item name.</td>
+                           <td>[BR-25]-Each Invoice line (BG-25) shall contain the Item name (BT-153).</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -433,7 +417,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-26</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-26]-Each Invoice line shall contain the Item net price.</td>
+                           <td>[BR-26]-Each Invoice line (BG-25) shall contain the Item net price (BT-146).</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -442,7 +426,7 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-27</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-27]-The item net price shall NOT be negative.</td>
+                           <td>[BR-27]-The Item net price (BT-146) shall NOT be negative.</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
@@ -451,20 +435,11 @@
                            <td rowspan="2">val-sch.1.1</td>
                            <td rowspan="2">BR-CO-04</td>
                            <td rowspan="2">error</td>
-                           <td>[BR-CO-04]-Each Invoice line shall be categorized with an Invoiced item VAT category code.</td>
+                           <td>[BR-CO-04]-Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT category code (BT-151).</td>
                         </tr>
                         <tr class="error">
                            <td>Pfad: /CreditNote/cac:CreditNoteLine</td>
                         </tr>
-                        <tr class="error">
-                           <td rowspan="2">val-sch.1.1</td>
-                           <td rowspan="2">BR-CL-16</td>
-                           <td rowspan="2">error</td>
-                           <td>[BR-CL-16]-Credit Note type code MUST be coded using UNCL1001 credit note codes.</td>
-                        </tr>
-                        <tr class="error">
-                           <td>Pfad: /CreditNote/cbc:CreditNoteTypeCode</td>
-                        </tr>
                         <tr class="error">
                            <td rowspan="2">val-sch.2.1</td>
                            <td rowspan="2">BR-DE-15</td>
@@ -532,7 +507,7 @@
                      <tr class="row" id="0005">
                         <td class="pos">0005</td>
                         <td class="element level2" title="CreditNoteTypeCode">
-                           <div class="val">070</div>
+                           <div class="val">326</div>
                         </td>
                      </tr>
                      <tr class="row" id="0006">