Index: WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml
===================================================================
diff -u -r44039 -r44041
--- WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml	(.../BouwstenenConverter.cls.xml)	(revision 44039)
+++ WSimpl/AX/CalculatedProduct/BouwstenenConverter.cls.xml	(.../BouwstenenConverter.cls.xml)	(revision 44041)
@@ -36,17 +36,22 @@
 <ReturnTypeParams>ELEMENTTYPE="AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine"</ReturnTypeParams>
 <Implementation><![CDATA[
 	#dim BomLines As %ListOfObjects = ##class(%ListOfObjects).%New()
-	#dim BouwstenenIterator As TECH.ListIterator = Product.GeefHFBouwstenenIterator()	
+	#dim HalffabricaatBouwstenenIterator As TECH.ListIterator = Product.GeefHFBouwstenenIterator()
+	#dim KindBouwstenenIterator As TECH.ListIterator = Product.GeefKindBouwstenenIterator()
 	
-	While (BouwstenenIterator.HasNext()) {
-		#dim HalffabricaatBouwsteen As DOM.PM.Bouwstenen.BouwsteenHalfFabr = BouwstenenIterator.Next()
+	While (HalffabricaatBouwstenenIterator.HasNext()) {
+		#dim HalffabricaatBouwsteen As DOM.PM.Bouwstenen.BouwsteenHalfFabr = HalffabricaatBouwstenenIterator.Next()
 		#dim BomLine As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityBOMLine = ..BouwsteenConverter.Convert(HalffabricaatBouwsteen)
 
-		Set BomLine.BOMLine = BouwstenenIterator.Key()
+		Set BomLine.BOMLine = HalffabricaatBouwstenenIterator.Key()
 		
 		Do BomLines.Insert(BomLine)
 	}
 	
+	While (KindBouwstenenIterator.HasNext()) {
+		#dim KindBouwsteen As DOM.PM.Bouwstenen.BouwsteenKind = KindBouwstenenIterator.Next()
+	}
+	
 	Quit BomLines
 ]]></Implementation>
 </Method>
Index: vhTest/Dummy/DOM/PM/Product.cls.xml
===================================================================
diff -u -r43357 -r44041
--- vhTest/Dummy/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 43357)
+++ vhTest/Dummy/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 44041)
@@ -143,7 +143,7 @@
 
 <Method name="GeefKindBouwstenenIterator">
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ""
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(##class(%ListOfObjects).%New())
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/ProductData.cls.xml
===================================================================
diff -u -r43679 -r44041
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/ProductData.cls.xml	(.../ProductData.cls.xml)	(revision 43679)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test/ProductData.cls.xml	(.../ProductData.cls.xml)	(revision 44041)
@@ -37,6 +37,7 @@
 	Do ..ProductStub.IndienMethodCall("GeefKorttekst")
 	Do ..ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif")	
 	Do ..ProductStub.IndienMethodCall("GeefHFBouwstenenIterator").DanReturn(BouwstenenIteratorDummy)
+	Do ..ProductStub.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(BouwstenenIteratorDummy)
 	
 	Set ..DummyRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
 	Set ..DummyRequest.ItemId = ..RandomItemId
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml
===================================================================
diff -u -r44037 -r44041
--- vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 44037)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/BouwstenenConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 44041)
@@ -22,6 +22,7 @@
 	#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)
+	Do ProductStub.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(##class(TECH.ListIterator).%New(##class(%ListOfDataTypes).%New()))
 	
 	#dim BouwstenenConverter As WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New(BouwsteenConverterMock)
 	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(ProductStub)
@@ -52,6 +53,7 @@
 	#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)
+	Do ProductStub.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(##class(TECH.ListIterator).%New(##class(%ListOfDataTypes).%New()))
 	
 	#dim BouwstenenConverter As WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New(BouwsteenConverterStub)
 	#dim BomLines As %ListOfObjects = BouwstenenConverter.Convert(ProductStub)