Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test015DubbeleSifonlade/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test015DubbeleSifonlade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test015DubbeleSifonlade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -695,18 +695,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test016/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test016/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test016/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -680,18 +680,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222221</id>
+  <productionOrderKey>222221</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>2</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -1385,18 +1385,26 @@
     <name>002-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222221</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222221</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test010/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test010/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test010/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -835,18 +835,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test011/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test011/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test011/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -660,18 +660,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test020LadeMetDwarsverdeling/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test020LadeMetDwarsverdeling/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test020LadeMetDwarsverdeling/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -705,18 +705,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test013Spoelbaklade/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test013Spoelbaklade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test013Spoelbaklade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -865,18 +865,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test012/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test012/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test012/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -590,18 +590,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test019StalenRug/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test019StalenRug/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test019StalenRug/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -590,18 +590,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test014EnkeleSifonlade/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test014EnkeleSifonlade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test014EnkeleSifonlade/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -675,18 +675,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test021VHossVerpakking/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test021VHossVerpakking/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test021VHossVerpakking/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>4</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -2470,18 +2470,26 @@
     <name>004-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test023CFMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test023CFMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test023CFMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222221</id>
+  <productionOrderKey>222221</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>2</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -1315,18 +1315,26 @@
     <name>002-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222221</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222221</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test008/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test008/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test008/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -665,18 +665,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test009/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test009/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test009/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -780,18 +780,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test022PalletVerpakking/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test022PalletVerpakking/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test022PalletVerpakking/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>4</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -2605,18 +2605,26 @@
     <name>004-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test001/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test001/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test001/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -690,18 +690,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -510,18 +510,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0002.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test002/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>6</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -3865,18 +3865,26 @@
     <name>006-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00002</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00002</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test017DubbeleSifonladeMetGekoppeldeMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r72093 -r72118
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test017DubbeleSifonladeMetGekoppeldeMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72093)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Tandembox.Aansturing/Test017DubbeleSifonladeMetGekoppeldeMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72118)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222222</id>
+  <productionOrderKey>222222</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>1</qtyPlanned>
-  <recipeKey>Template Lade TLM.Template M1.8</recipeKey>
+  <recipeVariantVersionKey>Template Lade TLM.Template M1.20</recipeVariantVersionKey>
   <dtsDueBefore>2014-11-14T00:00:00.000Z</dtsDueBefore>
   <options>
     <description>_TOELEVERING</description>
@@ -730,18 +730,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222222</usrTxt1>
-  <usrTxt2>200_00001</usrTxt2>
-  <usrTxt3>15000</usrTxt3>
-  <usrTxt4>null</usrTxt4>
-  <usrTxt5>1</usrTxt5>
-  <usrTxt6>null</usrTxt6>
-  <usrTxt7>null</usrTxt7>
-  <usrTxt8>null</usrTxt8>
-  <usrTxt9>DI1</usrTxt9>
-  <usrTxt10>UNITTEST KLANT</usrTxt10>
-  <usrTxt11>00010</usrTxt11>
-  <usrTxt12>null</usrTxt12>
-  <usrTxt13>null</usrTxt13>
+  <userFields>
+    <date>
+      <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
+    </date>
+    <flag></flag>
+    <numeric></numeric>
+    <text>
+      <usrTxt1>222222</usrTxt1>
+      <usrTxt2>200_00001</usrTxt2>
+      <usrTxt3>15000</usrTxt3>
+      <usrTxt4>null</usrTxt4>
+      <usrTxt5>1</usrTxt5>
+      <usrTxt6>null</usrTxt6>
+      <usrTxt7>null</usrTxt7>
+      <usrTxt8>null</usrTxt8>
+      <usrTxt9>DI1</usrTxt9>
+      <usrTxt10>UNITTEST KLANT</usrTxt10>
+      <usrTxt11>00010</usrTxt11>
+      <usrTxt12>null</usrTxt12>
+      <usrTxt13>null</usrTxt13>
+    </text>
+  </userFields>
 </XML>
\ No newline at end of file