Index: AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEnumXMLDocPurpose.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEnumXMLDocPurpose.cls.xml	(revision 0)
+++ AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEnumXMLDocPurpose.cls.xml	(revision 44751)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEnumXMLDocPurpose">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+
+<Parameter name="VALUELIST">
+<Default>,Original,Duplicate,Proforma</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXif/Dynamics/CalculatedProductIn/MessageParts/AxdExtTypeDataAreaId.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/CalculatedProductIn/MessageParts/AxdExtTypeDataAreaId.cls.xml	(revision 0)
+++ AXif/Dynamics/CalculatedProductIn/MessageParts/AxdExtTypeDataAreaId.cls.xml	(revision 44751)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeDataAreaId">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+<Default>4</Default>
+</Parameter>
+
+<Parameter name="MINLEN">
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEntityAttribute.cls.xml
===================================================================
diff -u -r43641 -r44751
--- AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEntityAttribute.cls.xml	(.../AxdEntityAttribute.cls.xml)	(revision 43641)
+++ AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEntityAttribute.cls.xml	(.../AxdEntityAttribute.cls.xml)	(revision 44751)
@@ -50,28 +50,6 @@
 <Parameter name="XMLNAME" value="action"/>
 <Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<State>AxdEntityAttributeState</State>
-<StreamLocation>^AXif.Dynam3664.AxdEntityAt8BD7S</StreamLocation>
-<Data name="AxdEntityAttributeState">
-<Structure>listnode</Structure>
-<Subscript/>
-<Value name="1">
-<Value>Name</Value>
-</Value>
-<Value name="2">
-<Value>ValueTxt</Value>
-</Value>
-<Value name="3">
-<Value>class</Value>
-</Value>
-<Value name="4">
-<Value>action</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeUnitIDBase.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeUnitIDBase.cls.xml	(revision 0)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeUnitIDBase.cls.xml	(revision 44751)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeUnitIDBase">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+<Default>10</Default>
+</Parameter>
+
+<Parameter name="MINLEN">
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXif/Dynamics/CalculatedProductOut/Body.cls.xml
===================================================================
diff -u -r42946 -r44751
--- AXif/Dynamics/CalculatedProductOut/Body.cls.xml	(.../Body.cls.xml)	(revision 42946)
+++ AXif/Dynamics/CalculatedProductOut/Body.cls.xml	(.../Body.cls.xml)	(revision 44751)
@@ -13,7 +13,7 @@
 <Default>0</Default>
 </Parameter>
 
-<Property name="MessagePart">
+<Property name="MessageParts">
 <Type>AXif.Dynamics.CalculatedProductOut.MessageParts</Type>
 <Parameter name="REFELEMENTQUALIFIED" value="1"/>
 <Parameter name="REFNAMESPACE" value="http://schemas.microsoft.com/dynamics/2011/01/documents/Message"/>
@@ -33,7 +33,7 @@
 <Structure>listnode</Structure>
 <Subscript/>
 <Value name="1">
-<Value>MessagePart</Value>
+<Value>MessageParts</Value>
 </Value>
 </Data>
 </Storage>
Index: WS/AX/CalculatedProduct/CalculatedProductService.cls.xml
===================================================================
diff -u -r44545 -r44751
--- WS/AX/CalculatedProduct/CalculatedProductService.cls.xml	(.../CalculatedProductService.cls.xml)	(revision 44545)
+++ WS/AX/CalculatedProduct/CalculatedProductService.cls.xml	(.../CalculatedProductService.cls.xml)	(revision 44751)
@@ -15,78 +15,16 @@
 <FormalSpec>In:%GlobalCharacterStream</FormalSpec>
 <ReturnType>%GlobalCharacterStream</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	quit ##class(%GlobalCharacterStream).%New()
-]]></Implementation>
-</Method>
-
-<UDLText name="T">
-<Content><![CDATA[
-// Method GetBOM(CalculatedProductIn As AXif.Dynamics.CalculatedProductIn.Envelope) As AXif.Dynamics.CalculatedProductOut.Envelope [ WebMethod ]
-
-]]></Content>
-</UDLText>
-
-<Method name="GetBOM">
-<FormalSpec>AdminProductNummer:%String</FormalSpec>
-<ReturnType>AXif.Dynamics.CalculatedProductOut.Envelope</ReturnType>
 <Implementation><![CDATA[
 	#dim Converter As WSimpl.AX.CalculatedProduct.Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New()
-	#dim EnvelopeIn As AXif.Dynamics.CalculatedProductIn.Envelope = ..MaakEnvelopeIn(AdminProductNummer)
-	#dim EnvelopeOut As AXif.Dynamics.CalculatedProductOut.Envelope = Converter.Convert(EnvelopeIn, "DummyMessageId")
+	#dim XmlCorrelater As TECH.XMLCorrelater = ##class(TECH.XMLCorrelater).%New()
 	
-	Quit EnvelopeOut
-]]></Implementation>
-</Method>
+	#dim BOMBOLOutQuery As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery = XmlCorrelater.FromStream(In, "AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery", "ADUMsgBOMBOLOutQuery")
+	#dim BOMBOLInQuery As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery = Converter.Convert(BOMBOLOutQuery, "DummyMessageId")
 
-<Method name="MaakEnvelopeIn">
-<FormalSpec>AdminProductNummer:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>AXif.Dynamics.CalculatedProductIn.Envelope</ReturnType>
-<Implementation><![CDATA[
-	#dim EnvelopeIn As AXif.Dynamics.CalculatedProductIn.Envelope = ##class(AXif.Dynamics.CalculatedProductIn.Envelope).%New()
-	
-	Set EnvelopeIn.Body = ##class(AXif.Dynamics.CalculatedProductIn.Body).%New()	
-	
-	Do EnvelopeIn.Body.MessagePart.MessagePart.Request.Insert(..MaakRequest(AdminProductNummer))
-	
-	Quit EnvelopeIn
+	Quit ##class(TECH.XmlObjectUtils).GeefXMLStream(BOMBOLInQuery)
 ]]></Implementation>
 </Method>
-
-<Method name="MaakRequest">
-<FormalSpec>AdminProductNummer:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</ReturnType>
-<Implementation><![CDATA[
-	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = ..MaakAttribute("AdminProductNummer", AdminProductNummer)
-	
-	Do Request.Attribute.Insert(Attribute)
-	
-	Set Request.ConfigId = "DummyConfigId"
-	Set Request.CustAccount = "DummyCustAccount"
-	Set Request.InventTransId = "DummyInventTransId"
-	Set Request.ItemId = "DummyItemId"
-	Set Request.Qty = "DummyQty"
-	Set Request.SalesId = "DummySalesId"
-	
-	Quit Request
-]]></Implementation>
-</Method>
-
-<Method name="MaakAttribute">
-<FormalSpec>Name:%String,Value:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute</ReturnType>
-<Implementation><![CDATA[
-	#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
-	
-	Set Attribute.Name = Name
-	Set Attribute.ValueTxt = Value
-	
-	Quit Attribute
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeADUAttributeKey.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeADUAttributeKey.cls.xml	(revision 0)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeADUAttributeKey.cls.xml	(revision 44751)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeADUAttributeKey">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+<Default>10</Default>
+</Parameter>
+
+<Parameter name="MINLEN">
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityVariantDescription.cls.xml
===================================================================
diff -u -r43648 -r44751
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityVariantDescription.cls.xml	(.../AxdEntityVariantDescription.cls.xml)	(revision 43648)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityVariantDescription.cls.xml	(.../AxdEntityVariantDescription.cls.xml)	(revision 44751)
@@ -56,31 +56,6 @@
 <Parameter name="XMLNAME" value="action"/>
 <Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<State>AxdEntityVariantDescriptionState</State>
-<StreamLocation>^AXif.Dynam28B3.AxdEntityVa66D1S</StreamLocation>
-<Data name="AxdEntityVariantDescriptionState">
-<Structure>listnode</Structure>
-<Subscript/>
-<Value name="1">
-<Value>ConfigVariantId</Value>
-</Value>
-<Value name="2">
-<Value>Description</Value>
-</Value>
-<Value name="3">
-<Value>LanguageId</Value>
-</Value>
-<Value name="4">
-<Value>class</Value>
-</Value>
-<Value name="5">
-<Value>action</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityConfigVariant.cls.xml
===================================================================
diff -u -r43649 -r44751
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityConfigVariant.cls.xml	(.../AxdEntityConfigVariant.cls.xml)	(revision 43649)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityConfigVariant.cls.xml	(.../AxdEntityConfigVariant.cls.xml)	(revision 44751)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant">
 <ClassType>serial</ClassType>
-<CompileAfter>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumAxdEntityAction,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeAifMessageBase,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeCompanyId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeCostPrice,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResConfigurationName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResProductName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeFilename,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeGlobalTradeItemNumber,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeInventTransId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeItemIdSmall,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRetailVariantId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRouteId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeSalesId</CompileAfter>
+<CompileAfter>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumADUInterfaceResult,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumAxdEntityAction,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeADUAttributeKey,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeAifMessageBase,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeCompanyId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeCostPrice,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResConfigurationName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResProductName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeFilename,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeFreeText,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeGlobalTradeItemNumber,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeInventTransId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeItemIdSmall,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRetailVariantId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRouteId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeSalesId</CompileAfter>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%SerialObject,%XML.Adaptor</Super>
 <Inheritance>right</Inheritance>
@@ -27,8 +27,14 @@
 <Default>AxdEntity_ConfigVariant</Default>
 </Parameter>
 
-<Property name="AttributeKey">
+<Property name="DocumentHash">
 <Type>%String</Type>
+<Parameter name="MAXLEN"/>
+<Parameter name="XMLNAME" value="_DocumentHash"/>
+</Property>
+
+<Property name="AttributeKey">
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeADUAttributeKey</Type>
 <Parameter name="XMLNAME" value="AttributeKey"/>
 </Property>
 
@@ -48,7 +54,7 @@
 </Property>
 
 <Property name="ErrorText">
-<Type>%String</Type>
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeFreeText</Type>
 <Parameter name="XMLNAME" value="ErrorText"/>
 </Property>
 
@@ -58,18 +64,13 @@
 <Parameter name="XMLNAME" value="GTIN"/>
 </Property>
 
-<Property name="IkID">
-<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeName</Type>
-<Parameter name="XMLNAME" value="IkID"/>
-</Property>
-
 <Property name="Image">
 <Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeFilename</Type>
 <Parameter name="XMLNAME" value="Image"/>
 </Property>
 
 <Property name="InterfaceResult">
-<Type>%String</Type>
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumADUInterfaceResult</Type>
 <Parameter name="XMLNAME" value="InterfaceResult"/>
 </Property>
 
@@ -129,6 +130,13 @@
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
+<Property name="Attribute">
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityAttribute</Type>
+<Collection>list</Collection>
+<Parameter name="XMLNAME" value="Attribute"/>
+<Parameter name="XMLPROJECTION" value="ELEMENT"/>
+</Property>
+
 <Property name="class">
 <Type>%String</Type>
 <Required>1</Required>
@@ -142,79 +150,6 @@
 <Parameter name="XMLNAME" value="action"/>
 <Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<State>AxdEntityConfigVariantState</State>
-<StreamLocation>^AXif.Dynam28B3.AxdEntityCo9E9BS</StreamLocation>
-<Data name="AxdEntityConfigVariantState">
-<Structure>listnode</Structure>
-<Subscript/>
-<Value name="1">
-<Value>AttributeKey</Value>
-</Value>
-<Value name="2">
-<Value>ConfigId</Value>
-</Value>
-<Value name="3">
-<Value>ConfigVariantId</Value>
-</Value>
-<Value name="4">
-<Value>CostPrice</Value>
-</Value>
-<Value name="5">
-<Value>ErrorText</Value>
-</Value>
-<Value name="6">
-<Value>GTIN</Value>
-</Value>
-<Value name="7">
-<Value>IkID</Value>
-</Value>
-<Value name="8">
-<Value>Image</Value>
-</Value>
-<Value name="9">
-<Value>InterfaceResult</Value>
-</Value>
-<Value name="10">
-<Value>InventTransId</Value>
-</Value>
-<Value name="11">
-<Value>ItemId</Value>
-</Value>
-<Value name="12">
-<Value>MessageId</Value>
-</Value>
-<Value name="13">
-<Value>ProductName</Value>
-</Value>
-<Value name="14">
-<Value>SalesId</Value>
-</Value>
-<Value name="15">
-<Value>SourcingDataAreaId</Value>
-</Value>
-<Value name="16">
-<Value>SourcingRouteId</Value>
-</Value>
-<Value name="17">
-<Value>BOMLine</Value>
-</Value>
-<Value name="18">
-<Value>VariantDescription</Value>
-</Value>
-<Value name="19">
-<Value>RouteOpr</Value>
-</Value>
-<Value name="20">
-<Value>class</Value>
-</Value>
-<Value name="21">
-<Value>action</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: WSimpl/AX/CalculatedProduct/Converter.cls.xml
===================================================================
diff -u -r43294 -r44751
--- WSimpl/AX/CalculatedProduct/Converter.cls.xml	(.../Converter.cls.xml)	(revision 43294)
+++ WSimpl/AX/CalculatedProduct/Converter.cls.xml	(.../Converter.cls.xml)	(revision 44751)
@@ -22,21 +22,17 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>CalculatedProductIn:AXif.Dynamics.CalculatedProductIn.Envelope,MessageId:%String</FormalSpec>
-<ReturnType>AXif.Dynamics.CalculatedProductOut.Envelope</ReturnType>
+<FormalSpec>CalculatedProductIn:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery,MessageId:%String</FormalSpec>
+<ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery</ReturnType>
 <Implementation><![CDATA[
-	#dim CalculatedProductOut As AXif.Dynamics.CalculatedProductOut.Envelope = ##class(AXif.Dynamics.CalculatedProductOut.Envelope).%New()
+	#dim CalculatedProductOut As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery = ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery).%New()
+	#dim RequestIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(CalculatedProductIn.Request)
 	
-	Set CalculatedProductOut.Body.MessagePart.MessagePart = ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery).%New()
-	Set CalculatedProductOut.Body.MessagePart.MessagePart.ConfigVariant = ##class(%ListOfObjects).%New()
-	
-	#dim RequestIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(CalculatedProductIn.Body.MessagePart.MessagePart.Request)
-	
 	While (RequestIterator.HasNext()) {
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = RequestIterator.Next()		
+		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = RequestIterator.Next()				
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(Request, MessageId)
 		
-		Do CalculatedProductOut.Body.MessagePart.MessagePart.ConfigVariant.Insert(ConfigVariant)
+		Do CalculatedProductOut.ConfigVariant.Insert(ConfigVariant)
 	}
 	
 	Quit CalculatedProductOut
FishEye: Tag 44751 refers to a dead (removed) revision in file `AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeName.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: AXif/Dynamics/CalculatedProductIn/MessageParts/AxdADUMsgBOMBOLOutQuery.cls.xml
===================================================================
diff -u -r43007 -r44751
--- AXif/Dynamics/CalculatedProductIn/MessageParts/AxdADUMsgBOMBOLOutQuery.cls.xml	(.../AxdADUMsgBOMBOLOutQuery.cls.xml)	(revision 43007)
+++ AXif/Dynamics/CalculatedProductIn/MessageParts/AxdADUMsgBOMBOLOutQuery.cls.xml	(.../AxdADUMsgBOMBOLOutQuery.cls.xml)	(revision 44751)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery">
 <ClassType>serial</ClassType>
-<CompileAfter/>
+<CompileAfter>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEnumXMLDocPurpose,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEnumboolean,AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeDataAreaId</CompileAfter>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%SerialObject,%XML.Adaptor</Super>
 <Inheritance>right</Inheritance>
@@ -23,25 +23,27 @@
 <Default>1</Default>
 </Parameter>
 
+<Property name="ClearNilFieldsOnUpdate">
+<Type>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEnumboolean</Type>
+<Parameter name="XMLNAME" value="ClearNilFieldsOnUpdate"/>
+</Property>
+
+<Property name="DocPurpose">
+<Type>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEnumXMLDocPurpose</Type>
+<Parameter name="XMLNAME" value="DocPurpose"/>
+</Property>
+
+<Property name="SenderId">
+<Type>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeDataAreaId</Type>
+<Parameter name="XMLNAME" value="SenderId"/>
+</Property>
+
 <Property name="Request">
 <Type>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</Type>
 <Collection>list</Collection>
 <Parameter name="XMLNAME" value="Request"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<State>AxdADUMsgBOMBOLOutQueryState</State>
-<StreamLocation>^AXif.Dynam3664.AxdADUMsgBOEC2ES</StreamLocation>
-<Data name="AxdADUMsgBOMBOLOutQueryState">
-<Structure>listnode</Structure>
-<Subscript/>
-<Value name="1">
-<Value>Request</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityRouteOpr.cls.xml
===================================================================
diff -u -r43650 -r44751
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityRouteOpr.cls.xml	(.../AxdEntityRouteOpr.cls.xml)	(revision 43650)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityRouteOpr.cls.xml	(.../AxdEntityRouteOpr.cls.xml)	(revision 44751)
@@ -32,11 +32,6 @@
 <Parameter name="XMLNAME" value="ConfigVariantId"/>
 </Property>
 
-<Property name="ParentBOMLine">
-<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeLineNum</Type>
-<Parameter name="XMLNAME" value="ParentBOMLine"/>
-</Property>
-
 <Property name="Formula">
 <Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumRouteFormula</Type>
 <Parameter name="XMLNAME" value="Formula"/>
@@ -57,6 +52,11 @@
 <Parameter name="XMLNAME" value="OprPriority"/>
 </Property>
 
+<Property name="ParentBOMLine">
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeLineNum</Type>
+<Parameter name="XMLNAME" value="ParentBOMLine"/>
+</Property>
+
 <Property name="ProcessCategoryId">
 <Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRouteCostCategoryIdProcess</Type>
 <Parameter name="XMLNAME" value="ProcessCategoryId"/>
@@ -67,11 +67,6 @@
 <Parameter name="XMLNAME" value="ProcessPerQty"/>
 </Property>
 
-<Property name="ToHours">
-<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRouteHourFactor</Type>
-<Parameter name="XMLNAME" value="ToHours"/>
-</Property>
-
 <Property name="TimeQueueAfter">
 <Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRouteOprTimeQueueAfter</Type>
 <Parameter name="XMLNAME" value="TimeQueueAfter"/>
@@ -82,6 +77,11 @@
 <Parameter name="XMLNAME" value="TimeQueueBefore"/>
 </Property>
 
+<Property name="ToHours">
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRouteHourFactor</Type>
+<Parameter name="XMLNAME" value="ToHours"/>
+</Property>
+
 <Property name="WrkCtrIdCost">
 <Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeWrkCtrIdCost</Type>
 <Parameter name="XMLNAME" value="WrkCtrIdCost"/>
@@ -100,58 +100,6 @@
 <Parameter name="XMLNAME" value="action"/>
 <Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<State>AxdEntityRouteOprState</State>
-<StreamLocation>^AXif.Dynam28B3.AxdEntityRoD4F3S</StreamLocation>
-<Data name="AxdEntityRouteOprState">
-<Structure>listnode</Structure>
-<Subscript/>
-<Value name="1">
-<Value>ConfigVariantId</Value>
-</Value>
-<Value name="2">
-<Value>ParentBOMLine</Value>
-</Value>
-<Value name="3">
-<Value>Formula</Value>
-</Value>
-<Value name="4">
-<Value>FormulaFactor</Value>
-</Value>
-<Value name="5">
-<Value>OprId</Value>
-</Value>
-<Value name="6">
-<Value>OprPriority</Value>
-</Value>
-<Value name="7">
-<Value>ProcessCategoryId</Value>
-</Value>
-<Value name="8">
-<Value>ProcessPerQty</Value>
-</Value>
-<Value name="9">
-<Value>ToHours</Value>
-</Value>
-<Value name="10">
-<Value>TimeQueueAfter</Value>
-</Value>
-<Value name="11">
-<Value>TimeQueueBefore</Value>
-</Value>
-<Value name="12">
-<Value>WrkCtrIdCost</Value>
-</Value>
-<Value name="13">
-<Value>class</Value>
-</Value>
-<Value name="14">
-<Value>action</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEnumboolean.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEnumboolean.cls.xml	(revision 0)
+++ AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEnumboolean.cls.xml	(revision 44751)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEnumboolean">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+
+<Parameter name="VALUELIST">
+<Default>,false,true</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/Converter/Test.cls.xml
===================================================================
diff -u -r43293 -r44751
--- vhUnitTest/WSimpl/AX/CalculatedProduct/Converter/Test.cls.xml	(.../Test.cls.xml)	(revision 43293)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/Converter/Test.cls.xml	(.../Test.cls.xml)	(revision 44751)
@@ -14,11 +14,11 @@
 	#dim DummyRequest1 As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	#dim DummyRequest2 As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	#dim DummyRequest3 As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	#dim DummyCalculatedProductIn As AXif.Dynamics.CalculatedProductIn.Envelope = ##class(AXif.Dynamics.CalculatedProductIn.Envelope).%New()
+	#dim DummyBOMBOLOutQuery As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery).%New()
 	
-	Do DummyCalculatedProductIn.Body.MessagePart.MessagePart.Request.Insert(DummyRequest1)
-	Do DummyCalculatedProductIn.Body.MessagePart.MessagePart.Request.Insert(DummyRequest2)
-	Do DummyCalculatedProductIn.Body.MessagePart.MessagePart.Request.Insert(DummyRequest3)
+	Do DummyBOMBOLOutQuery.Request.Insert(DummyRequest1)
+	Do DummyBOMBOLOutQuery.Request.Insert(DummyRequest2)
+	Do DummyBOMBOLOutQuery.Request.Insert(DummyRequest3)
 	
 	#dim RequestConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.RequestConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.RequestConverter).%New()
 	Do RequestConverterMock.VerwachtMethodCall("Convert", DummyRequest1, RandomMessageId).ExactAantalKeer(1)
@@ -27,9 +27,9 @@
 	
 	Set ..Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New(RequestConverterMock)
 	
-	#dim CalculatedProductOut As AXif.Dynamics.CalculatedProductOut.Envelope = ..Converter.Convert(DummyCalculatedProductIn, RandomMessageId)
+	#dim BOMBOLInQuery As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery = ..Converter.Convert(DummyBOMBOLOutQuery, RandomMessageId)
 	
-	Do $$$AssertTrue(CalculatedProductOut.%IsA("AXif.Dynamics.CalculatedProductOut.Envelope"))
+	Do $$$AssertTrue(BOMBOLInQuery.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery"))
 	
 	Do RequestConverterMock.Verifieer()
 ]]></Implementation>
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdADUMsgBOMBOLInQuery.cls.xml
===================================================================
diff -u -r43007 -r44751
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdADUMsgBOMBOLInQuery.cls.xml	(.../AxdADUMsgBOMBOLInQuery.cls.xml)	(revision 43007)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdADUMsgBOMBOLInQuery.cls.xml	(.../AxdADUMsgBOMBOLInQuery.cls.xml)	(revision 44751)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery">
 <ClassType>serial</ClassType>
-<CompileAfter/>
+<CompileAfter>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumXMLDocPurpose,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumboolean,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeDataAreaId</CompileAfter>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%SerialObject,%XML.Adaptor</Super>
 <Inheritance>right</Inheritance>
@@ -23,25 +23,27 @@
 <Default>1</Default>
 </Parameter>
 
+<Property name="ClearNilFieldsOnUpdate">
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumboolean</Type>
+<Parameter name="XMLNAME" value="ClearNilFieldsOnUpdate"/>
+</Property>
+
+<Property name="DocPurpose">
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumXMLDocPurpose</Type>
+<Parameter name="XMLNAME" value="DocPurpose"/>
+</Property>
+
+<Property name="SenderId">
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeDataAreaId</Type>
+<Parameter name="XMLNAME" value="SenderId"/>
+</Property>
+
 <Property name="ConfigVariant">
 <Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant</Type>
 <Collection>list</Collection>
 <Parameter name="XMLNAME" value="ConfigVariant"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<State>AxdADUMsgBOMBOLInQueryState</State>
-<StreamLocation>^AXif.Dynam28B3.AxdADUMsgBO817AS</StreamLocation>
-<Data name="AxdADUMsgBOMBOLInQueryState">
-<Structure>listnode</Structure>
-<Subscript/>
-<Value name="1">
-<Value>ConfigVariant</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEntityRequest.cls.xml
===================================================================
diff -u -r43640 -r44751
--- AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEntityRequest.cls.xml	(.../AxdEntityRequest.cls.xml)	(revision 43640)
+++ AXif/Dynamics/CalculatedProductIn/MessageParts/AxdEntityRequest.cls.xml	(.../AxdEntityRequest.cls.xml)	(revision 44751)
@@ -27,6 +27,12 @@
 <Default>AxdEntity_Request</Default>
 </Parameter>
 
+<Property name="DocumentHash">
+<Type>%String</Type>
+<Parameter name="MAXLEN"/>
+<Parameter name="XMLNAME" value="_DocumentHash"/>
+</Property>
+
 <Property name="ConfigId">
 <Type>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdExtTypeEcoResConfigurationName</Type>
 <Parameter name="XMLNAME" value="ConfigId"/>
@@ -82,46 +88,6 @@
 <Parameter name="XMLNAME" value="action"/>
 <Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<State>AxdEntityRequestState</State>
-<StreamLocation>^AXif.Dynam3664.AxdEntityRe67A3S</StreamLocation>
-<Data name="AxdEntityRequestState">
-<Structure>listnode</Structure>
-<Subscript/>
-<Value name="1">
-<Value>ConfigId</Value>
-</Value>
-<Value name="2">
-<Value>CustAccount</Value>
-</Value>
-<Value name="3">
-<Value>InventTransId</Value>
-</Value>
-<Value name="4">
-<Value>ItemId</Value>
-</Value>
-<Value name="5">
-<Value>Qty</Value>
-</Value>
-<Value name="6">
-<Value>SalesId</Value>
-</Value>
-<Value name="7">
-<Value>TransDate</Value>
-</Value>
-<Value name="8">
-<Value>Attribute</Value>
-</Value>
-<Value name="9">
-<Value>class</Value>
-</Value>
-<Value name="10">
-<Value>action</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeDataAreaId.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeDataAreaId.cls.xml	(revision 0)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeDataAreaId.cls.xml	(revision 44751)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeDataAreaId">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+<Default>4</Default>
+</Parameter>
+
+<Parameter name="MINLEN">
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEnumADUInterfaceResult.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEnumADUInterfaceResult.cls.xml	(revision 0)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEnumADUInterfaceResult.cls.xml	(revision 44751)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumADUInterfaceResult">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+
+<Parameter name="VALUELIST">
+<Default>,Success,ErrorGeneric</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXif/Dynamics/CalculatedProductIn/MessageParts.cls.xml
===================================================================
diff -u -r42941 -r44751
--- AXif/Dynamics/CalculatedProductIn/MessageParts.cls.xml	(.../MessageParts.cls.xml)	(revision 42941)
+++ AXif/Dynamics/CalculatedProductIn/MessageParts.cls.xml	(.../MessageParts.cls.xml)	(revision 44751)
@@ -17,7 +17,7 @@
 <Type>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery</Type>
 <Parameter name="REFELEMENTQUALIFIED" value="1"/>
 <Parameter name="REFNAMESPACE" value="http://schemas.microsoft.com/dynamics/2011/01/documents/Message"/>
-<Parameter name="XMLNAME" value="MessageParts"/>
+<Parameter name="XMLNAME" value="ADUMsgBOMBOLOutQuery"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityAttribute.cls.xml
===================================================================
diff -u -r43652 -r44751
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityAttribute.cls.xml	(.../AxdEntityAttribute.cls.xml)	(revision 43652)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityAttribute.cls.xml	(.../AxdEntityAttribute.cls.xml)	(revision 44751)
@@ -50,28 +50,6 @@
 <Parameter name="XMLNAME" value="action"/>
 <Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<State>AxdEntityAttributeState</State>
-<StreamLocation>^AXif.Dynam28B3.AxdEntityAt8BD7S</StreamLocation>
-<Data name="AxdEntityAttributeState">
-<Structure>listnode</Structure>
-<Subscript/>
-<Value name="1">
-<Value>Name</Value>
-</Value>
-<Value name="2">
-<Value>ValueTxt</Value>
-</Value>
-<Value name="3">
-<Value>class</Value>
-</Value>
-<Value name="4">
-<Value>action</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEnumXMLDocPurpose.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEnumXMLDocPurpose.cls.xml	(revision 0)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEnumXMLDocPurpose.cls.xml	(revision 44751)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumXMLDocPurpose">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+
+<Parameter name="VALUELIST">
+<Default>,Original,Duplicate,Proforma</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeFreeText.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeFreeText.cls.xml	(revision 0)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdExtTypeFreeText.cls.xml	(revision 44751)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeFreeText">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+<Default>255</Default>
+</Parameter>
+
+<Parameter name="MINLEN">
+<Default>0</Default>
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: AXif/Dynamics/CalculatedProductOut/MessageParts.cls.xml
===================================================================
diff -u -r42946 -r44751
--- AXif/Dynamics/CalculatedProductOut/MessageParts.cls.xml	(.../MessageParts.cls.xml)	(revision 42946)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts.cls.xml	(.../MessageParts.cls.xml)	(revision 44751)
@@ -17,7 +17,7 @@
 <Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery</Type>
 <Parameter name="REFELEMENTQUALIFIED" value="1"/>
 <Parameter name="REFNAMESPACE" value="http://schemas.microsoft.com/dynamics/2011/01/documents/Message"/>
-<Parameter name="XMLNAME" value="MessageParts"/>
+<Parameter name="XMLNAME" value="ADUMsgBOMBOLInQuery"/>
 <Parameter name="XMLPROJECTION" value="ELEMENT"/>
 </Property>
 
@@ -42,8 +42,6 @@
 <State>MessagePartsState</State>
 <StreamLocation>^AXif.DynamicsEC06.MessagePartsS</StreamLocation>
 <Data name="MessagePartsState">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>MessagePart</Value>
 </Value>
Index: AXif/Dynamics/CalculatedProductIn/Body.cls.xml
===================================================================
diff -u -r42941 -r44751
--- AXif/Dynamics/CalculatedProductIn/Body.cls.xml	(.../Body.cls.xml)	(revision 42941)
+++ AXif/Dynamics/CalculatedProductIn/Body.cls.xml	(.../Body.cls.xml)	(revision 44751)
@@ -13,7 +13,7 @@
 <Default>0</Default>
 </Parameter>
 
-<Property name="MessagePart">
+<Property name="MessageParts">
 <Type>AXif.Dynamics.CalculatedProductIn.MessageParts</Type>
 <Parameter name="REFELEMENTQUALIFIED" value="1"/>
 <Parameter name="REFNAMESPACE" value="http://schemas.microsoft.com/dynamics/2011/01/documents/Message"/>
@@ -33,7 +33,7 @@
 <Structure>listnode</Structure>
 <Subscript/>
 <Value name="1">
-<Value>MessagePart</Value>
+<Value>MessageParts</Value>
 </Value>
 </Data>
 </Storage>
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityBOMLine.cls.xml
===================================================================
diff -u -r43651 -r44751
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityBOMLine.cls.xml	(.../AxdEntityBOMLine.cls.xml)	(revision 43651)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEntityBOMLine.cls.xml	(.../AxdEntityBOMLine.cls.xml)	(revision 44751)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine">
 <ClassType>serial</ClassType>
-<CompileAfter>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumAxdEntityAction,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumBOMRoundUp,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeBOMQty,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeBOMQtySerie,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeBOMRoundUpQty,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeCompanyId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResColorName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResConfigurationName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResSizeName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResStyleName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeItemIdSmall,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeLineNum,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRetailVariantId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRouteId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeScrapConst,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeScrapVar</CompileAfter>
+<CompileAfter>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumAxdEntityAction,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumBOMRoundUp,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeBOMQty,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeBOMQtySerie,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeBOMRoundUpQty,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeCompanyId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResColorName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResConfigurationName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResSizeName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeEcoResStyleName,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeItemIdSmall,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeLineNum,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRetailVariantId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeRouteId,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeScrapConst,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeScrapVar,AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeUnitIDBase</CompileAfter>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%SerialObject,%XML.Adaptor</Super>
 <Inheritance>right</Inheritance>
@@ -113,17 +113,10 @@
 </Property>
 
 <Property name="UnitID">
-<Type>%String</Type>
+<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdExtTypeUnitIDBase</Type>
 <Parameter name="XMLNAME" value="UnitID"/>
 </Property>
 
-<Property name="Attribute">
-<Type>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityAttribute</Type>
-<Collection>list</Collection>
-<Parameter name="XMLNAME" value="Attribute"/>
-<Parameter name="XMLPROJECTION" value="ELEMENT"/>
-</Property>
-
 <Property name="class">
 <Type>%String</Type>
 <Required>1</Required>
@@ -137,79 +130,6 @@
 <Parameter name="XMLNAME" value="action"/>
 <Parameter name="XMLPROJECTION" value="ATTRIBUTE"/>
 </Property>
-
-<Storage name="Default">
-<Type>%Library.CacheSerialState</Type>
-<State>AxdEntityBOMLineState</State>
-<StreamLocation>^AXif.Dynam28B3.AxdEntityBOAAE0S</StreamLocation>
-<Data name="AxdEntityBOMLineState">
-<Structure>listnode</Structure>
-<Subscript/>
-<Value name="1">
-<Value>BOMDataAreaId</Value>
-</Value>
-<Value name="2">
-<Value>BOMLine</Value>
-</Value>
-<Value name="3">
-<Value>BOMQty</Value>
-</Value>
-<Value name="4">
-<Value>BOMQtySerie</Value>
-</Value>
-<Value name="5">
-<Value>ConfigId</Value>
-</Value>
-<Value name="6">
-<Value>ConfigVariantId</Value>
-</Value>
-<Value name="7">
-<Value>InventColorId</Value>
-</Value>
-<Value name="8">
-<Value>InventSizeId</Value>
-</Value>
-<Value name="9">
-<Value>InventStyleId</Value>
-</Value>
-<Value name="10">
-<Value>ItemId</Value>
-</Value>
-<Value name="11">
-<Value>ParentBOMLine</Value>
-</Value>
-<Value name="12">
-<Value>RoundUp</Value>
-</Value>
-<Value name="13">
-<Value>RoundUpQty</Value>
-</Value>
-<Value name="14">
-<Value>ScrapConst</Value>
-</Value>
-<Value name="15">
-<Value>ScrapVar</Value>
-</Value>
-<Value name="16">
-<Value>SourcingDataAreaId</Value>
-</Value>
-<Value name="17">
-<Value>SourcingRouteId</Value>
-</Value>
-<Value name="18">
-<Value>UnitID</Value>
-</Value>
-<Value name="19">
-<Value>Attribute</Value>
-</Value>
-<Value name="20">
-<Value>class</Value>
-</Value>
-<Value name="21">
-<Value>action</Value>
-</Value>
-</Data>
-</Storage>
 </Class>
 
 
Index: AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEnumboolean.cls.xml
===================================================================
diff -u
--- AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEnumboolean.cls.xml	(revision 0)
+++ AXif/Dynamics/CalculatedProductOut/MessageParts/AxdEnumboolean.cls.xml	(revision 44751)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEnumboolean">
+<ClassType>datatype</ClassType>
+<CompileAfter/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%String</Super>
+
+<Parameter name="ELEMENTQUALIFIED">
+<Default>1</Default>
+</Parameter>
+
+<Parameter name="MAXLEN">
+</Parameter>
+
+<Parameter name="NAMESPACE">
+<Default>http://schemas.microsoft.com/dynamics/2008/01/sharedtypes</Default>
+</Parameter>
+
+<Parameter name="VALUELIST">
+<Default>,false,true</Default>
+</Parameter>
+</Class>
+
+
+</Export>