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>