Index: AXif/Common/EntityKey/Envelope.cls.xml
===================================================================
diff -u -r42282 -r42333
--- AXif/Common/EntityKey/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 42282)
+++ AXif/Common/EntityKey/Envelope.cls.xml	(.../Envelope.cls.xml)	(revision 42333)
@@ -5,18 +5,6 @@
 <Super>%SerialObject,%XML.Adaptor</Super>
 <Inheritance>right</Inheritance>
 
-<Property name="Body">
-<Type>AXif.Common.EntityKey.Body</Type>
-<Parameter name="XMLNAME" value="Body"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
-</Property>
-
-<Property name="Header">
-<Type>AXif.Common.EntityKey.Header</Type>
-<Parameter name="XMLNAME" value="Header"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
-</Property>
-
 <Parameter name="NAMESPACE">
 <Default>http://schemas.microsoft.com/dynamics/2011/01/documents/Message</Default>
 </Parameter>
@@ -33,13 +21,23 @@
 <Default>0</Default>
 </Parameter>
 
+<Property name="Header">
+<Type>AXif.Common.EntityKey.Header</Type>
+<Parameter name="XMLNAME" value="Header"/>
+<Parameter name="XMLPROJECTION" value="ELEMENT"/>
+</Property>
+
+<Property name="Body">
+<Type>AXif.Common.EntityKey.Body</Type>
+<Parameter name="XMLNAME" value="Body"/>
+<Parameter name="XMLPROJECTION" value="ELEMENT"/>
+</Property>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>EnvelopeState</State>
 <StreamLocation>^AXif.Common.EntitDEA8.EnvelopeS</StreamLocation>
 <Data name="EnvelopeState">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>Body</Value>
 </Value>