Index: AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimension.cls.xml
===================================================================
diff -u -r34868 -r34870
--- AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimension.cls.xml	(.../AxdEntityLedgerJournalDimension.cls.xml)	(revision 34868)
+++ AXaif/LedgerGeneralJournal/AxdEntityLedgerJournalDimension.cls.xml	(.../AxdEntityLedgerJournalDimension.cls.xml)	(revision 34870)
@@ -43,7 +43,6 @@
 <Property name="Values">
 <Type>AXaif.LedgerGeneralJournal.AxdEntityLedgerJournalDimensionAttributeValue</Type>
 <Collection>list</Collection>
-<SqlFieldName>_Values</SqlFieldName>
 <Parameter name="REFNAMESPACE" value="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes"/>
 <Parameter name="XMLITEMNAME" value="Value"/>
 <Parameter name="XMLNAME" value="Values"/>
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34868 -r34870
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml)	(revision 34868)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopcreditnota-export/AIF/Inbound/SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 586689  - VHBE - 20160501_091500.xml)	(revision 34870)
@@ -25,7 +25,7 @@
             <LedgerDimension>
               <DisplayValue xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes"><![CDATA[09283 - L & P INTERIEURPRODUKTIE]]></DisplayValue>
               <Account xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">09283</Account>
-              <Values>
+              <Values xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">
                 <Value>
                   <Name>Klant</Name>
                   <Value>09283</Value>
@@ -57,7 +57,7 @@
             <LedgerDimension>
               <DisplayValue xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">703000</DisplayValue>
               <Account xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">703000</Account>
-              <Values>
+              <Values xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">
                 <Value>
                   <Name>Klant</Name>
                   <Value>09283</Value>
Index: AX/common/impl/FileWriter.cls.xml
===================================================================
diff -u -r34159 -r34870
--- AX/common/impl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 34159)
+++ AX/common/impl/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 34870)
@@ -67,9 +67,19 @@
 <FormalSpec>XMLObject:%XML.Adaptor,XMLExportOpties:%String="literal,indent",TopTag:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	do ..FileWriter.WriteXML(XMLObject,XMLExportOpties,TopTag)
-	#dim From As %String = "<DirParty xmlns:s01=""http://schemas.microsoft.com/dynamics/2008/01/documents/Customer"" xsi:type=""s01:AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"">"
-	#dim To As %String = "<DirParty xsi:type=""AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"">"
+	
+	#dim From As %String = ""
+	#dim To As %String = ""
+	
+	set From = "<DirParty xmlns:s01=""http://schemas.microsoft.com/dynamics/2008/01/documents/Customer"" xsi:type=""s01:AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"">"
+	set To = "<DirParty xsi:type=""AxdEntity_DirParty_DirOrganization"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" class=""entity"">"
+	
 	do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
+	
+	set From = "<Values>"
+	set To = "<Values xmlns=""http://schemas.microsoft.com/dynamics/2008/01/sharedtypes"">"
+	
+	do ##class(TECH.StreamUtils).Replace(..FileWriter.GetStream(),From,To)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml
===================================================================
diff -u -r34868 -r34870
--- vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml)	(revision 34868)
+++ vhTestFiles/UnitTests/AX.Uitgaand.common.impl.AifGenerator.Generate/Test/TestVerkoopfactuur-export/AIF/Inbound/SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml	(.../SalesInvoice-Create 300500  - VHBE - 20160501_091500.xml)	(revision 34870)
@@ -25,7 +25,7 @@
             <LedgerDimension>
               <DisplayValue xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">01313 - HEREMANS KEUKENS</DisplayValue>
               <Account xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">01313</Account>
-              <Values>
+              <Values xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">
                 <Value>
                   <Name>Klant</Name>
                   <Value>01313</Value>
@@ -57,7 +57,7 @@
             <LedgerDimension>
               <DisplayValue xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">703100</DisplayValue>
               <Account xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">703100</Account>
-              <Values>
+              <Values xmlns="http://schemas.microsoft.com/dynamics/2008/01/sharedtypes">
                 <Value>
                   <Name>Klant</Name>
                   <Value>01313</Value>