diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
index a3d89bbf..2a8b8eb4 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
@@ -20,6 +20,7 @@
  */
 package org.mustangproject.ZUGFeRD;
 
+import static org.mustangproject.ZUGFeRD.ZUGFeRDDateFormat.DATE;
 import static org.mustangproject.ZUGFeRD.model.TaxCategoryCodeTypeConstants.CATEGORY_CODES_WITH_EXEMPTION_REASON;
 
 import java.io.IOException;
@@ -46,8 +47,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr
 
 	protected byte[] zugferdData;
 	private String paymentTermsDescription;
-	SimpleDateFormat zugferdDateFormat = new SimpleDateFormat("yyyyMMdd");
-	protected Profile profile = Profiles.getByName("COMFORT", 1);
+  protected Profile profile = Profiles.getByName("COMFORT", 1);
 
 
 	/**
@@ -169,8 +169,8 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr
 				+ "		<ram:ID>" + XMLTools.encodeXML(trans.getNumber()) + "</ram:ID>\n"
 				+ "     <ram:Name>RECHNUNG</ram:Name>\n"
 				+ "		<ram:TypeCode>" + typecode + "</ram:TypeCode>\n"
-				+ "		<ram:IssueDateTime><udt:DateTimeString format=\"102\">"
-				+ zugferdDateFormat.format(trans.getIssueDate()) + "</udt:DateTimeString></ram:IssueDateTime>\n" // date
+				+ "		<ram:IssueDateTime>"
+				+ DATE.udtFormat(trans.getIssueDate()) + "</ram:IssueDateTime>\n" // date
 				// format
 				// was
 				// 20130605
@@ -225,8 +225,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr
 				+ "				<ram:OccurrenceDateTime>";
 
 		if (trans.getDeliveryDate() != null) {
-			xml += "<udt:DateTimeString format=\"102\">" + zugferdDateFormat.format(trans.getDeliveryDate())
-					+ "</udt:DateTimeString>";
+			xml += DATE.udtFormat(trans.getDeliveryDate());
 		} else {
 			throw new IllegalStateException("No delivery date provided");
 		}
@@ -292,9 +291,9 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr
 			}
 
 			if (hasDueDate && (trans.getDueDate() != null)) {
-				xml = xml + "				<ram:DueDateDateTime><udt:DateTimeString format=\"102\">" // $NON-NLS-2$
-						+ zugferdDateFormat.format(trans.getDueDate())
-						+ "</udt:DateTimeString></ram:DueDateDateTime>\n";// 20130704
+				xml = xml + "				<ram:DueDateDateTime>" // $NON-NLS-2$
+						+ DATE.udtFormat(trans.getDueDate())
+						+ "</ram:DueDateDateTime>\n";// 20130704
 
 			}
 			xml = xml + "			</ram:SpecifiedTradePaymentTerms>\n";
@@ -440,8 +439,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr
 		paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>";
 		if (dueDate != null) {
 			paymentTermsXml += "<ram:DueDateDateTime>";
-			paymentTermsXml += "<udt:DateTimeString format=\"102\">"
-					+ zugferdDateFormat.format(dueDate.getDate()) + "</udt:DateTimeString>";
+			paymentTermsXml += DATE.udtFormat(dueDate) ;
 			paymentTermsXml += "</ram:DueDateDateTime>";
 		}
 
@@ -456,7 +454,7 @@ public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLPr
 			if (discountTerms.getBaseDate() != null) {
 				final Date baseDate = discountTerms.getBaseDate();
 				paymentTermsXml += "<ram:BasisDateTime>";
-				paymentTermsXml += "<udt:DateTimeString format=\"102\">" + zugferdDateFormat.format(baseDate) + "</udt:DateTimeString>";
+				paymentTermsXml +=  DATE.udtFormat(baseDate) ;
 				paymentTermsXml += "</ram:BasisDateTime>";
 
 				paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">"
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index 3a028126..dd07f767 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -20,6 +20,7 @@
  */
 package org.mustangproject.ZUGFeRD;
 
+import static org.mustangproject.ZUGFeRD.ZUGFeRDDateFormat.DATE;
 import static org.mustangproject.ZUGFeRD.model.DocumentCodeTypeConstants.CORRECTEDINVOICE;
 import static org.mustangproject.ZUGFeRD.model.TaxCategoryCodeTypeConstants.CATEGORY_CODES_WITH_EXEMPTION_REASON;
 
@@ -44,9 +45,7 @@ import org.mustangproject.XMLTools;
 
 public class ZUGFeRD2PullProvider implements IXMLProvider {
 
-	//// MAIN CLASS
-	protected SimpleDateFormat zugferdDateFormat = new SimpleDateFormat("yyyyMMdd");
-	protected byte[] zugferdData;
+  protected byte[] zugferdData;
 	protected IExportableTransaction trans;
 	protected TransactionCalculator calc;
 	private String paymentTermsDescription;
@@ -292,8 +291,8 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 				// + " <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
+				+ "		<ram:IssueDateTime>"
+				+ DATE.udtFormat(trans.getIssueDate()) + "</ram:IssueDateTime>\n" // date
 				+ notes
 				+ subjectNote
 				+ rebateAgreement
@@ -387,10 +386,10 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 			if ((currentItem.getDetailedDeliveryPeriodFrom() != null) || (currentItem.getDetailedDeliveryPeriodTo() != null)) {
 				xml = xml + "<ram:BillingSpecifiedPeriod>";
 				if (currentItem.getDetailedDeliveryPeriodFrom() != null) {
-					xml = xml + "<ram:StartDateTime><udt:DateTimeString format='102'>" + zugferdDateFormat.format(currentItem.getDetailedDeliveryPeriodFrom()) + "</udt:DateTimeString></ram:StartDateTime>";
+					xml = xml + "<ram:StartDateTime>>" + DATE.udtFormat(currentItem.getDetailedDeliveryPeriodFrom()) + "</ram:StartDateTime>";
 				}
 				if (currentItem.getDetailedDeliveryPeriodTo() != null) {
-					xml = xml + "<ram:EndDateTime><udt:DateTimeString format='102'>" + zugferdDateFormat.format(currentItem.getDetailedDeliveryPeriodTo()) + "</udt:DateTimeString></ram:EndDateTime>";
+					xml = xml + "<ram:EndDateTime>" + DATE.udtFormat(currentItem.getDetailedDeliveryPeriodTo()) + "</ram:EndDateTime>";
 				}
 				xml = xml + "</ram:BillingSpecifiedPeriod>";
 
@@ -478,8 +477,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 				+ "				<ram:OccurrenceDateTime>";
 
 		if (trans.getDeliveryDate() != null) {
-			xml += "<udt:DateTimeString format=\"102\">" + zugferdDateFormat.format(trans.getDeliveryDate())
-					+ "</udt:DateTimeString>";
+			xml +=  DATE.udtFormat(trans.getDeliveryDate());
 		} else {
 			throw new IllegalStateException("No delivery date provided");
 		}
@@ -537,10 +535,10 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		if ((trans.getDetailedDeliveryPeriodFrom() != null) || (trans.getDetailedDeliveryPeriodTo() != null)) {
 			xml = xml + "<ram:BillingSpecifiedPeriod>";
 			if (trans.getDetailedDeliveryPeriodFrom() != null) {
-				xml = xml + "<ram:StartDateTime><udt:DateTimeString format='102'>" + zugferdDateFormat.format(trans.getDetailedDeliveryPeriodFrom()) + "</udt:DateTimeString></ram:StartDateTime>";
+				xml = xml + "<ram:StartDateTime>" + DATE.udtFormat(trans.getDetailedDeliveryPeriodFrom()) + "</ram:StartDateTime>";
 			}
 			if (trans.getDetailedDeliveryPeriodTo() != null) {
-				xml = xml + "<ram:EndDateTime><udt:DateTimeString format='102'>" + zugferdDateFormat.format(trans.getDetailedDeliveryPeriodTo()) + "</udt:DateTimeString></ram:EndDateTime>";
+				xml = xml + "<ram:EndDateTime>" + DATE.udtFormat(trans.getDetailedDeliveryPeriodTo()) + "</ram:EndDateTime>";
 			}
 			xml = xml + "</ram:BillingSpecifiedPeriod>";
 
@@ -607,9 +605,9 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 			}
 
 			if (hasDueDate && (trans.getDueDate() != null)) {
-				xml = xml + "				<ram:DueDateDateTime><udt:DateTimeString format=\"102\">" // $NON-NLS-2$
-						+ zugferdDateFormat.format(trans.getDueDate())
-						+ "</udt:DateTimeString></ram:DueDateDateTime>\n";// 20130704
+				xml = xml + "				<ram:DueDateDateTime>" // $NON-NLS-2$
+						+ DATE.udtFormat(trans.getDueDate())
+						+ "</ram:DueDateDateTime>\n";// 20130704
 
 			}
 			xml = xml + "			</ram:SpecifiedTradePaymentTerms>\n";
@@ -643,7 +641,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 					+ XMLTools.encodeXML(trans.getInvoiceReferencedDocumentID()) + "</ram:IssuerAssignedID>\n";
 			if(trans.getInvoiceReferencedIssueDate()!= null){
 				xml += "<ram:FormattedIssueDateTime>" 
-				+ zugferdDateFormat.format(trans.getInvoiceReferencedIssueDate())
+				+ DATE.qdtFormat(trans.getInvoiceReferencedIssueDate())
 				+ "</ram:FormattedIssueDateTime>\n";
 			}
 			xml += "   </ram:InvoiceReferencedDocument>\n";
@@ -694,8 +692,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		paymentTermsXml += "<ram:Description>" + paymentTerms.getDescription() + "</ram:Description>";
 		if (dueDate != null) {
 			paymentTermsXml += "<ram:DueDateDateTime>";
-			paymentTermsXml += "<udt:DateTimeString format=\"102\">"
-					+ zugferdDateFormat.format(dueDate) + "</udt:DateTimeString>";
+			paymentTermsXml += DATE.udtFormat(dueDate) ;
 			paymentTermsXml += "</ram:DueDateDateTime>";
 		}
 
@@ -710,7 +707,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 			if (discountTerms.getBaseDate() != null) {
 				final Date baseDate = discountTerms.getBaseDate();
 				paymentTermsXml += "<ram:BasisDateTime>";
-				paymentTermsXml += "<udt:DateTimeString format=\"102\">" + zugferdDateFormat.format(baseDate) + "</udt:DateTimeString>";
+				paymentTermsXml +=  DATE.udtFormat(baseDate);
 				paymentTermsXml += "</ram:BasisDateTime>";
 
 				paymentTermsXml += "<ram:BasisPeriodMeasure unitCode=\"" + discountTerms.getBasePeriodUnitCode() + "\">"
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDDateFormat.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDDateFormat.java
index 3457fe18..15ffe24a 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDDateFormat.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDDateFormat.java
@@ -1,6 +1,7 @@
 package org.mustangproject.ZUGFeRD;
 
 import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import org.mustangproject.ZUGFeRD.model.DateTimeTypeConstants;
 
@@ -12,6 +13,8 @@ public enum ZUGFeRDDateFormat {
 
 	private String dateTimeType;
 	private SimpleDateFormat formatter;
+	private static final String QDT_FORAMT = "<qdt:DateTimeString format=\"%s\">%s</qdt:DateTimeString>";
+	private static final String UDT_FORAMT = "<udt:DateTimeString format=\"%s\">%s</udt:DateTimeString>";
 
 	private ZUGFeRDDateFormat(String dateTimeType, SimpleDateFormat formatter) {
 		this.dateTimeType = dateTimeType;
@@ -25,4 +28,14 @@ public enum ZUGFeRDDateFormat {
 	public SimpleDateFormat getFormatter() {
 		return formatter;
 	}
+	
+	public String simpleFormat(Date date){
+    return getFormatter().format(date);
+  }
+	public String qdtFormat(Date date){
+    return String.format(QDT_FORAMT, getDateTimeType(), getFormatter().format(date));
+  }
+	public String udtFormat(Date date){
+    return String.format(UDT_FORAMT, getDateTimeType(), getFormatter().format(date));
+  }
 }