Index: WSimpl/AX/CalculatedProduct/Converter.cls.xml
===================================================================
diff -u -r43021 -r43033
--- WSimpl/AX/CalculatedProduct/Converter.cls.xml	(.../Converter.cls.xml)	(revision 43021)
+++ WSimpl/AX/CalculatedProduct/Converter.cls.xml	(.../Converter.cls.xml)	(revision 43033)
@@ -3,6 +3,23 @@
 <Class name="WSimpl.AX.CalculatedProduct.Converter">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="RequestConverter">
+<Type>WSimpl.AX.CalculatedProduct.RequestConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Convert">
 <FormalSpec>CalculatedProductIn:AXif.Dynamics.CalculatedProductIn.Envelope,MessageId:%String=""</FormalSpec>
 <ReturnType>AXif.Dynamics.CalculatedProductOut.Envelope</ReturnType>
@@ -16,31 +33,14 @@
 	
 	While (RequestIterator.HasNext()) {
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = RequestIterator.Next()
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..ConvertRequest(Request)
+		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(Request, MessageId)
 		
-		Set ConfigVariant.MessageId = MessageId
-		
 		Do CalculatedProductOut.Body.MessagePart.MessagePart.ConfigVariant.Insert(ConfigVariant)
 	}
 	
 	Quit CalculatedProductOut
 ]]></Implementation>
 </Method>
-
-<Method name="ConvertRequest">
-<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
-<Private>1</Private>
-<ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant</ReturnType>
-<Implementation><![CDATA[
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant).%New()
-	
-	Set ConfigVariant.ItemId = Request.ItemId
-	Set ConfigVariant.ConfigId = Request.ConfigId
-	Set ConfigVariant.SalesId = Request.SalesId
-	
-	Quit ConfigVariant
-]]></Implementation>
-</Method>
 </Class>