Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test006/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test006/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test006/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>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>
@@ -1375,18 +1375,26 @@
     <name>002-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.Legrabox.Aansturing/TestDesignZijkant/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestDesignZijkant/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestDesignZijkant/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>8</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>
@@ -4435,18 +4435,26 @@
     <name>008-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.Legrabox.Aansturing/Test010MetVHoss/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test010MetVHoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test010MetVHoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>40</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>
@@ -19480,18 +19480,26 @@
     <name>040-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.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0003.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0003.xml	(.../15000_0003.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0003.xml	(.../15000_0003.xml)	(revision 72119)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222223</id>
+  <productionOrderKey>222223</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>
@@ -1230,18 +1230,26 @@
     <name>002-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222223</usrTxt1>
-  <usrTxt2>200_00003</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>222223</usrTxt1>
+      <usrTxt2>200_00003</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.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0002.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 72119)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>222224</id>
+  <productionOrderKey>222224</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>
@@ -625,18 +625,26 @@
     <name>001-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>222224</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>222224</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.Legrabox.Aansturing/Test021MetGekoppeldeSpaceStep/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test021MetGekoppeldeSpaceStep/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test021MetGekoppeldeSpaceStep/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>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>
@@ -1780,18 +1780,26 @@
     <name>002-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.Legrabox.Aansturing/Test009/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test009/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test009/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -760,18 +760,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.Legrabox.Aansturing/Test001/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test001/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test001/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>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>
@@ -1240,18 +1240,26 @@
     <name>002-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.Legrabox.Aansturing/Test003/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test003/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test003/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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.Legrabox.Aansturing/Test014MetGekoppeldeMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test014MetGekoppeldeMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test014MetGekoppeldeMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -3870,18 +3870,26 @@
     <name>006-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.Legrabox.Aansturing/Test002/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -2265,18 +2265,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.Legrabox.Aansturing/Test002Lijn3/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002Lijn3/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test002Lijn3/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>5</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>
@@ -2835,18 +2835,26 @@
     <name>005-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.Legrabox.Aansturing/Test011/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test011/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test011/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -775,18 +775,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.Legrabox.Aansturing/Test013AantalPickingbladEnVoormontageVerschillend/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test013AantalPickingbladEnVoormontageVerschillend/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test013AantalPickingbladEnVoormontageVerschillend/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>16</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>
@@ -9070,18 +9070,26 @@
     <name>016-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.Legrabox.Aansturing/Test008/StartBatch/15000_0002.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0002.xml	(.../15000_0002.xml)	(revision 72119)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>333333</id>
+  <productionOrderKey>333333</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>333333</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>333333</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.Legrabox.Aansturing/Test008/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test008/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -2265,18 +2265,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.Legrabox.Aansturing/TestLBXFree/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestLBXFree/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestLBXFree/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>3</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>
@@ -1805,18 +1805,26 @@
     <name>003-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.Legrabox.Aansturing/Test007/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test007/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test007/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>235887</id>
+  <productionOrderKey>235887</productionOrderKey>
   <description>Productieorder gegenereerd vanuit Caché</description>
   <qtyPlanned>10</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>
@@ -5480,18 +5480,26 @@
     <name>010-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>235887</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>235887</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.Legrabox.Aansturing/Test022DubbeleSifonladeMetMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test022DubbeleSifonladeMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test022DubbeleSifonladeMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -710,18 +710,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.Legrabox.Aansturing/TestSifon/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestSifon/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/TestSifon/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -2515,18 +2515,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.Legrabox.Aansturing/Test004/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test004/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test004/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -655,18 +655,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.Legrabox.Aansturing/Test016SpoelbakMetMat/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test016SpoelbakMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test016SpoelbakMetMat/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -610,18 +610,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.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test015ProboxMetOnderdelen/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -685,18 +685,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.Legrabox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test018FrontOnly/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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.Legrabox.Aansturing/Test017SpoelbakVerpakkingVhoss/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test017SpoelbakVerpakkingVhoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test017SpoelbakVerpakkingVhoss/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -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>
@@ -505,18 +505,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.Legrabox.Aansturing/Test005/StartBatch/15000_0001.xml
===================================================================
diff -u -r72081 -r72119
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test005/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72081)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Legrabox.Aansturing/Test005/StartBatch/15000_0001.xml	(.../15000_0001.xml)	(revision 72119)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XML>
-  <id>235887</id>
+  <productionOrderKey>235887</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>
@@ -2330,18 +2330,26 @@
     <name>004-Orderlijnreferentie</name>
     <value>null</value>
   </options>
-  <usrDts1>2014-11-14T00:00:00.000Z</usrDts1>
-  <usrTxt1>235887</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>235887</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