diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
index 053555c7..8966ac70 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
@@ -225,7 +225,10 @@ public class ZUGFeRD1PullProvider implements IXMLProvider, IProfileProvider {
 					+ XMLTools.encodeXML(trans.getSubjectNote())+ "</ram:Content>\n"
 					+ "</ram:IncludedNote>\n";
 		}
-
+		String typecode="380";
+		if (trans.getDocumentCode()!=null) {
+			typecode=trans.getDocumentCode();
+		}
 		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 
 				+ "<rsm:CrossIndustryDocument xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:rsm=\"urn:ferd:CrossIndustryDocument:invoice:1p0\""
@@ -245,7 +248,7 @@ public class ZUGFeRD1PullProvider implements IXMLProvider, IProfileProvider {
 				+ "	<rsm:HeaderExchangedDocument>\n"
 				+ "		<ram:ID>" + XMLTools.encodeXML(trans.getNumber()) + "</ram:ID>\n" //$NON-NLS-2$
 				+ "     <ram:Name>RECHNUNG</ram:Name>\n"
-				+ "		<ram:TypeCode>380</ram:TypeCode>\n"
+				+ "		<ram:TypeCode>"+typecode+"</ram:TypeCode>\n"
 				+ "		<ram:IssueDateTime><udt:DateTimeString format=\"102\">"
 				+ zugferdDateFormat.format(trans.getIssueDate()) + "</udt:DateTimeString></ram:IssueDateTime>\n" // date
 																													// format
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index be92c3fd..3d5ce961 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -227,6 +227,10 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
 					+ "</ram:IncludedNote>\n";
 		}
 
+		String typecode="380";
+		if (trans.getDocumentCode()!=null) {
+			typecode=trans.getDocumentCode();
+		}
 		String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" //$NON-NLS-1$
 
 				+ "<rsm:CrossIndustryInvoice xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:rsm=\"urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100\""
@@ -247,7 +251,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IProfileProvider {
 				+ "		<ram:ID>" + XMLTools.encodeXML(trans.getNumber()) + "</ram:ID>\n" //$NON-NLS-1$ //$NON-NLS-2$
 				// + " <ram:Name>RECHNUNG</ram:Name>\n" //$NON-NLS-1$
 				// + "		<ram:TypeCode>380</ram:TypeCode>\n" //$NON-NLS-1$
-				+ "		<ram:TypeCode>" + XMLTools.encodeXML(trans.getDocumentCode()) + "</ram:TypeCode>\n" //$NON-NLS-1$
+				+ "		<ram:TypeCode>" + typecode + "</ram:TypeCode>\n" //$NON-NLS-1$
 				+ "		<ram:IssueDateTime><udt:DateTimeString format=\"102\">" //$NON-NLS-1$
 				+ zugferdDateFormat.format(trans.getIssueDate()) + "</udt:DateTimeString></ram:IssueDateTime>\n" // date //$NON-NLS-1$
 																													// format
diff --git a/validator/src/main/resources/schematron/XR/CII/XRechnung-CII-model.part b/validator/src/main/resources/schematron/XR_20/CII/XRechnung-CII-model.part
similarity index 100%
rename from validator/src/main/resources/schematron/XR/CII/XRechnung-CII-model.part
rename to validator/src/main/resources/schematron/XR_20/CII/XRechnung-CII-model.part
diff --git a/validator/src/main/resources/schematron/XR/XRechnung-CII-validation.sch b/validator/src/main/resources/schematron/XR_20/XRechnung-CII-validation.sch
similarity index 100%
rename from validator/src/main/resources/schematron/XR/XRechnung-CII-validation.sch
rename to validator/src/main/resources/schematron/XR_20/XRechnung-CII-validation.sch
diff --git a/validator/src/main/resources/schematron/XR/abstract/XRechnung-model.part b/validator/src/main/resources/schematron/XR_20/abstract/XRechnung-model.part
similarity index 100%
rename from validator/src/main/resources/schematron/XR/abstract/XRechnung-model.part
rename to validator/src/main/resources/schematron/XR_20/abstract/XRechnung-model.part
diff --git a/validator/utils/ZUGFeRD-Validierer-kriterien.pdf b/validator/utils/ZUGFeRD-Validierer-kriterien.pdf
deleted file mode 100644
index 0110b23d..00000000
Binary files a/validator/utils/ZUGFeRD-Validierer-kriterien.pdf and /dev/null differ