Index: vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml
===================================================================
diff -u -r43373 -r44037
--- vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43373)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 44037)
@@ -19,9 +19,12 @@
 	Do BouwsteenConverterMock.VerwachtMethodCall("Convert", HalffabricaatBouwsteenDummy2).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
 	Do BouwsteenConverterMock.VerwachtMethodCall("Convert", HalffabricaatBouwsteenDummy3).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
 	
+	#dim BouwstenenIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(HalffabricaatBouwstenen)
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Do ProductStub.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(BouwstenenIterator)
+	
 	#dim BouwstenenConverter As WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New(BouwsteenConverterMock)
-	#dim BouwstenenIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(HalffabricaatBouwstenen)
-	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(BouwstenenIterator)
+	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(ProductStub)
 	
 	Do $$$AssertEquals(BomLines.Count(), HalffabricaatBouwstenen.Count())
 	Do $$$AssertTrue(BomLines.GetAt(1).%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine"))
@@ -46,9 +49,12 @@
 	Do BouwsteenConverterStub.IndienMethodCall("Convert", HalffabricaatBouwsteenDummy2).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
 	Do BouwsteenConverterStub.IndienMethodCall("Convert", HalffabricaatBouwsteenDummy3).DanReturn(##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine).%New())
 	
+	#dim BouwstenenIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(HalffabricaatBouwstenen)
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Do ProductStub.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(BouwstenenIterator)
+	
 	#dim BouwstenenConverter As WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New(BouwsteenConverterStub)
-	#dim BouwstenenIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(HalffabricaatBouwstenen)
-	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(BouwstenenIterator)
+	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(ProductStub)
 	
 	Do $$$AssertEquals(BomLines.GetAt(1).BOMLine, 1)
 	Do $$$AssertEquals(BomLines.GetAt(2).BOMLine, 2)
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml
===================================================================
diff -u -r43368 -r44037
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml	(.../BouwstenenConverter.cls.xml)	(revision 43368)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml	(.../BouwstenenConverter.cls.xml)	(revision 44037)
@@ -9,9 +9,9 @@
 <Inheritance>right</Inheritance>
 
 <Method name="Convert">
-<FormalSpec>BouwstenenIterator:TECH.ListIterator</FormalSpec>
+<FormalSpec>Product:DOM.PM.Product</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("Convert",BouwstenenIterator)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Convert",Product)
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml
===================================================================
diff -u -r43367 -r44037
--- WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml	(.../BouwstenenConverter.cls.xml)	(revision 43367)
+++ WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml	(.../BouwstenenConverter.cls.xml)	(revision 44037)
@@ -22,11 +22,12 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>BouwstenenIterator:TECH.ListIterator</FormalSpec>
+<FormalSpec>Product:DOM.PM.Product</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine"</ReturnTypeParams>
 <Implementation><![CDATA[
-	#dim BomLines As %ListOfObjects = ##class(%ListOfObjects).%New()	
+	#dim BomLines As %ListOfObjects = ##class(%ListOfObjects).%New()
+	#dim BouwstenenIterator As TECH.ListIterator = Product.GeefHFBouwstenenIterator()	
 	
 	While (BouwstenenIterator.HasNext()) {
 		#dim HalffabricaatBouwsteen As DOM.PM.Bouwstenen.BouwsteenHalfFabr = BouwstenenIterator.Next()
Index: vhTest/Fake/WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml
===================================================================
diff -u -r43368 -r44037
--- vhTest/Fake/WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml	(.../BouwstenenConverter.cls.xml)	(revision 43368)
+++ vhTest/Fake/WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml	(.../BouwstenenConverter.cls.xml)	(revision 44037)
@@ -8,7 +8,7 @@
 <Super>WSimpl.AX.CalculatedProduct.BouwstenenConverter</Super>
 
 <Method name="Convert">
-<FormalSpec>BouwstenenIterator:TECH.ListIterator</FormalSpec>
+<FormalSpec>Product:DOM.PM.Product</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r43682 -r44037
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 43682)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 44037)
@@ -54,7 +54,7 @@
 		Set ConfigVariant.ProductName = Product.GeefKorttekst()
 		Set ConfigVariant.CostPrice = Product.GeefNettoAankoopPrijsInclCif()
 		Set ConfigVariant.VariantDescription = ..VariantDescriptionBepaler.Bepaal(Product, ConfigVariant.ConfigVariantId)
-		Set ConfigVariant.BOMLine = ..BouwstenenConverter.Convert(Product.GeefHFBouwstenenIterator())
+		Set ConfigVariant.BOMLine = ..BouwstenenConverter.Convert(Product)		
 	} Else {
 		Set ConfigVariant.ErrorText = ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound()	
 	}
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r43679 -r44037
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 43679)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 44037)
@@ -23,13 +23,11 @@
 	
 	Set ..DummyRequest.ItemId = RandomItemId
 	
-	#dim BouwstenenIteratorDummy As TECH.Iterator = ##class(TECH.ListIterator).%New(##class(%ListOfObjects).%New())
 	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
 	Do ProductStub.IndienMethodCall("GeefEANCode")
 	Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(RandomItemId)
 	Do ProductStub.IndienMethodCall("GeefKorttekst")
 	Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif")
-	Do ProductStub.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(BouwstenenIteratorDummy)
 	
 	#dim ProductApiMock As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	Do ProductApiMock.VerwachtMethodCall("BestaatProduct", RandomItemId).DanReturn($$$True)
@@ -39,7 +37,7 @@
 	Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, RandomItemId).DanReturn(##class(%ListOfObjects).%New())
 	
 	#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-	Do BouwstenenConverterMock.VerwachtMethodCall("Convert", BouwstenenIteratorDummy).DanReturn(##class(%ListOfObjects).%New())
+	Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub).DanReturn(##class(%ListOfObjects).%New())
 	
 	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductApiMock, VariantDescriptionBepalerMock, BouwstenenConverterMock)
 	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(..DummyRequest, "RandomMessageId")