diff --git a/.gitignore b/.gitignore
index b24d71e..d450ca7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@ Thumbs.db
 *.mov
 *.wmv
 
+test0001.camel.yaml
+testing/
diff --git a/mapping/XSL_SYSPRO_DELIVERY/DELIVERY.xsl b/mapping/XSL_SYSPRO_DELIVERY/DELIVERY.xsl
index da0bec2..9313a5c 100644
--- a/mapping/XSL_SYSPRO_DELIVERY/DELIVERY.xsl
+++ b/mapping/XSL_SYSPRO_DELIVERY/DELIVERY.xsl
@@ -12,7 +12,7 @@
 			</ns0:Message1>
 		</ns0:Messages>
 	</xsl:template>
-	<xsl:template match="/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC" name="checkForHandlingUnit">
+	<xsl:template match="//ZFSHDLV/IDOC" name="checkForHandlingUnit">
 		<xsl:if test="./E1EDL20/E1EDL37">
 			<xsl:call-template name="HandlingUnit"/>
 		</xsl:if>
@@ -38,14 +38,13 @@
 				</DocumentId>
 				<DeliveryNote>
 					<xsl:choose>
-						<xsl:when test="/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/LIFEX/node()">
-							<xsl:value-of select="/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/LIFEX"/>
+						<xsl:when test="//ZFSHDLV/IDOC/E1EDL20/LIFEX/node()">
+							<xsl:value-of select="//ZFSHDLV/IDOC/E1EDL20/LIFEX"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:value-of select="/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/VBELN"/>
+							<xsl:value-of select="//ZFSHDLV/IDOC/E1EDL20/VBELN"/>
 						</xsl:otherwise>
 					</xsl:choose>
-					
 				</DeliveryNote>
 				<DocumentType>
 					<xsl:value-of select="'XMLDESADV'"/>
@@ -59,32 +58,32 @@
 				</DocumentSubType>
 				<DocumentDate>
 					<xsl:value-of select="format-dateTime(adjust-dateTime-to-timezone(xs:dateTime(concat(
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANF,1,4), 
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANF,1,4), 
 											'-',
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANF,5,2),
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANF,5,2),
 											'-',
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANF,7,2),
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANF,7,2),
 											'T',
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANZ,1,2),
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANZ,1,2),
 											':',
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANZ,3,2),
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANZ,3,2),
 											':',
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANZ,5,2)))),
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='015']/NTANZ,5,2)))),
 								'[Y0000]-[M00]-[D00]T[H00]:[m00]:[s00].[f0000000][Z]')"/>
 				</DocumentDate>
 				<DeliveryDate>
 					<xsl:value-of select="format-dateTime(adjust-dateTime-to-timezone(xs:dateTime(concat(
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANF,1,4), 
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANF,1,4), 
 											'-',
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANF,5,2),
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANF,5,2),
 											'-',
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANF,7,2),
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANF,7,2),
 											'T',
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANZ,1,2),
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANZ,1,2),
 											':',
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANZ,3,2),
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANZ,3,2),
 											':',
-											substring(/ns0:Messages/ns0:Message1/ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANZ,5,2)))),
+											substring(//ZFSHDLV/IDOC/E1EDL20/E1EDT13[QUALF='007']/NTANZ,5,2)))),
 								'[Y0000]-[M00]-[D00]T[H00]:[m00]:[s00].[f0000000][Z]')"/>
 				</DeliveryDate>
 				<ReferenceSupplierOrder/>
@@ -204,20 +203,32 @@
 						<ReferenceBuyerOrder/>
 						<xsl:if test="exists(./E1EPC03)">
 							<xsl:for-each select="./E1EPC03">
-								<XMLEPC>
-									<EPC>
-										<xsl:value-of select="./EPC"/>
-									</EPC>
-								</XMLEPC>
+								<xsl:if test="exists(./URN) and (./URN != '')">
+									<XMLEPC>
+										<EPC>
+											<xsl:value-of select="./URN"/>
+										</EPC>
+									</XMLEPC>
+								</xsl:if>
 							</xsl:for-each>
 						</xsl:if>
 					</XMLITEMS>
 				</xsl:for-each>
 			</xsl:variable>
+			<xsl:variable name="EXIDV">
+				<xsl:choose>
+					<xsl:when test="string-length(translate(./EXIDV, '0123456789', '')) != 0">
+						<xsl:value-of select="./EXIDV"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="replace(./EXIDV, '^0+', '')"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
 			<xsl:call-template name="Message">
 				<xsl:with-param name="CASE" select="'HandlingUnit'"/>
 				<xsl:with-param name="ID" select="concat(../VBELN,'_',./EXIDV)"/>
-				<xsl:with-param name="SSCCID" select="format-number(./EXIDV,'#')"/>
+				<xsl:with-param name="SSCCID" select="$EXIDV"/>
 				<xsl:with-param name="POSITIONS" select="$POSITIONS"/>
 			</xsl:call-template>
 		</xsl:for-each>