Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57281 -r57289
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57281)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57289)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository=""</FormalSpec>
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductUpdater:WSimpl.AX.CalculatedProduct.ProductUpdater="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r57281 -r57289
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57281)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 57289)
@@ -33,8 +33,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductDataFactory">
-<Type>DOM.PM.dto.ProductDataFactory</Type>
+<Property name="ProductUpdater">
+<Type>WSimpl.AX.CalculatedProduct.ProductUpdater</Type>
 <Private>1</Private>
 </Property>
 
@@ -49,7 +49,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository=""</FormalSpec>
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",VariantDescriptionBepaler:WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler="",BouwstenenConverter:WSimpl.AX.CalculatedProduct.BouwstenenConverter="",SourcingDataAreaIdBepaler:WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler="",Formatter:AXimpl.Formatter="",AfbeeldingService:WSimpl.AX.CalculatedProduct.AfbeeldingService="",ProductUpdater:WSimpl.AX.CalculatedProduct.ProductUpdater="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -61,7 +61,7 @@
 	Set ..SourcingDataAreaIdBepaler = $$$Inject(SourcingDataAreaIdBepaler, ##class(WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New())
 	Set ..Formatter = $$$Inject(Formatter, ##class(AXimpl.Formatter).%New())
 	Set ..AfbeeldingService = $$$Inject(AfbeeldingService, ##class(WSimpl.AX.CalculatedProduct.AfbeeldingService).%New())
-	Set ..ProductDataFactory = $$$Inject(ProductDataFactory, ##class(DOM.PM.dto.ProductDataFactory).%New())
+	Set ..ProductUpdater = $$$Inject(ProductUpdater, ##class(WSimpl.AX.CalculatedProduct.ProductUpdater).%New())
 	Set ..LadeVariantBepaler = $$$Inject(LadeVariantBepaler, ##class(WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New())
 	Set ..DataMProductRepository = $$$Inject(DataMProductRepository, ##class(DOM.PM.impl.DataM.DataMProductRepository).%New())
 	
@@ -155,15 +155,7 @@
 	#dim Product As DOM.PM.Product = ""
 	
 	If (($$$HasLength(ProductId)) && ($$$Not(..ProductService.HeeftBezwaarVoorProductDelete(ProductId)))) {
-		Set Product = ..ProductService.GeefProduct(ProductId, Request.ItemId)
-		If ($$$Not($IsObject(Product))) {
-			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Voor het in BOMBOL door AX aangeleverde AdminProductNummer '"_ProductId_"' is in Cache geen product gevonden."))
-		} ElseIf (Product.IsGenerischProduct()) {
-			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Voor het in BOMBOL door AX aangeleverde AdminProductNummer '"_ProductId_"' is in Cache een generisch product gevonden, dat daarom niet geüpdatet wordt."))
-		} Else {
-			// PRODUCT EERST NOG DELETEN !!!!! Do ..DataMProductRepository.VerwijderViaID(ProductId, 0)
-			Set Product = ..ProductService.GeefProductGemaaktVolgensAxKenmerken(Request, ..ProductDataFactory.MaakProductData(ProductId, Product.GeefDossierNr()))
-		}
+		Set Product = ..ProductUpdater.GeefGeupdatetProduct(Request, ProductId)
 	} Else {
 		Set Product = ..ProductService.GeefProductGemaaktVolgensAxKenmerken(Request)
 	}
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r57284 -r57289
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57284)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57289)
@@ -62,16 +62,11 @@
 <Type>WSimpl.AX.CalculatedProduct.AfbeeldingService</Type>
 </Property>
 
-<Property name="ProductDataFactory">
-<Type>DOM.PM.dto.ProductDataFactory</Type>
+<Property name="ProductUpdater">
+<Type>WSimpl.AX.CalculatedProduct.ProductUpdater</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="ProductData">
-<Type>DOM.PM.dto.ProductData</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="LadeVariantBepaler">
 <Type>WSimpl.AX.CalculatedProduct.LadeVariantBepaler</Type>
 <Private>1</Private>
@@ -153,6 +148,31 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: RequestConverter vult ErrorText in indien een exceptie geraised wordt bij het updaten van het Product">
+<Implementation><![CDATA[
+	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
+		#dim RandomExceptionMessage As %String = "RandomExceptionMessage"
+		
+		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
+		Set Request.AttrVsAdminProdNr = "Customizable"
+		
+		#dim LadeVariantBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+		Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+		
+		#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+		Do ProductServiceStub.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
+		
+		#dim ProductUpdaterStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater).%New()
+		Do ProductUpdaterStub.IndienMethodCall("GeefGeupdatetProduct", Request, ..#RandomProductId).DanException(##class(TECH.Exceptions.GeneralErrorException).%New(RandomExceptionMessage))
+		
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub,,,,,,ProductUpdaterStub, LadeVariantBepalerStub)
+		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
+		
+		Do $$$AssertEquals(ConfigVariant.ErrorText, RandomExceptionMessage)
+	}
+]]></Implementation>
+</Method>
+
 <Method name="Test: RequestConverter vult velden altijd in">
 <Implementation><![CDATA[
 	#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
@@ -258,39 +278,15 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is ChangeRequest en GeefProduct geeft leeg">
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is ChangeRequest">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
 		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "ChangeRequest"
-				
-		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn("")
-		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
-		Set ..ProductService = ProductServiceMock
 		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do ..Verifieer()
-	}
-]]></Implementation>
-</Method>
-
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is ChangeRequest en GeefProduct geeft GenerischProduct">
-<Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$True)
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		Set Request.AttrVsAdminProdNr = "ChangeRequest"
-		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
 		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
 		Set ..ProductService = ProductServiceMock
 		
@@ -303,7 +299,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is niet meegegeven =&gt; Nieuw product volgens kenmerken">
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr = Customizable en AdminProductNummer = niet meegegeven =&gt; Nieuw product volgens kenmerken">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
 		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
@@ -324,80 +320,34 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is meegegeven maar GeefProduct geeft leeg">
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr = Customizable en AdminProductNummer = meegegeven =&gt; GeefGeupdatetProduct van ProductUpdater">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		Set Request.AttrVsAdminProdNr = "Customizable"
-		
-		#dim LadeVariantBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
-		
-		#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceStub.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
-		Do ProductServiceStub.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn("")
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub,,,,,,, LadeVariantBepalerStub)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do $$$AssertEquals(ConfigVariant.ErrorText, "Voor het in BOMBOL door AX aangeleverde AdminProductNummer 'RandomProductId' is in Cache geen product gevonden.")
-	}
-]]></Implementation>
-</Method>
-
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is meegegeven maar GeefProduct geeft GenerischProduct">
-<Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
 		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$True)
-		
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
-		Set Request.AttrVsAdminProdNr = "Customizable"
-		
-		#dim LadeVariantBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
-		
-		#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceStub.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
-		Do ProductServiceStub.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceStub,,,,,,, LadeVariantBepalerStub)
-		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
-		
-		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		Do $$$AssertEquals(ConfigVariant.ErrorText, "Voor het in BOMBOL door AX aangeleverde AdminProductNummer 'RandomProductId' is in Cache een generisch product gevonden, dat daarom niet geüpdatet wordt.")
-	}
-]]></Implementation>
-</Method>
-
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is meegegeven =&gt; Product update">
-<Implementation><![CDATA[
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		Do ProductStub.IndienMethodCall("GeefDossierNr").DanReturn(..#RandomDossierNr)
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Customizable"
 		
-		Set ..ProductData = ..GeefProductData()
-		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-		Do ProductServiceMock.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
-		Do ProductServiceMock.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
-		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request, ..ProductData).DanReturn(ProductStub)
+		Do ProductServiceMock.VerwachtMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
 		Set ..ProductService = ProductServiceMock
 		
+		#dim ProductUpdaterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater).%New()
+		Do ProductUpdaterMock.VerwachtMethodCall("GeefGeupdatetProduct", Request, ..#RandomProductId).DanReturn(ProductStub)
+		Set ..ProductUpdater = ProductUpdaterMock
+		
 		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
 		Do ..Verifieer()
+		Do ..ProductUpdater.Verifieer()
 	}
 ]]></Implementation>
 </Method>
 
-<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is meegegeven maar HeeftBezwaarVoorProductDelete is True">
+<Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr = Customizable en AdminProductNummer = meegegeven =&gt; HeeftBezwaarVoorProductDelete =&gt; Nieuw product volgens kenmerken">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
 		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
@@ -440,9 +390,6 @@
 	#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
 	Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
 	
-	#dim ProductDataFactoryStub As vhTest.Mock.DOM.PM.dto.ProductDataFactory = ##class(vhTest.Mock.DOM.PM.dto.ProductDataFactory).%New()
-	Do ProductDataFactoryStub.IndienMethodCall("MaakProductData", ..#RandomProductId, ..#RandomDossierNr).DanReturn(..ProductData)
-	
 	#dim LadeVariantBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
 	Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(LadeVariant)
 	Do LadeVariantBepalerStub.IndienMethodCall("Bepaal", "", Request.Attribute).DanReturn(LadeVariant)
@@ -452,10 +399,9 @@
 	Set ..SourcingDataAreaIdBepaler = SourcingDataAreaIdBepalerMock
 	Set ..Formatter = FormatterMock
 	Set ..AfbeeldingService = AfbeeldingServiceMock
-	Set ..ProductDataFactory = ProductDataFactoryStub
 	Set ..LadeVariantBepaler = LadeVariantBepalerStub
 	
-	Quit ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(..ProductService, ..VariantDescriptionBepaler, ..BouwstenenConverter, ..SourcingDataAreaIdBepaler, ..Formatter, ..AfbeeldingService, ..ProductDataFactory, ..LadeVariantBepaler)
+	Quit ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(..ProductService, ..VariantDescriptionBepaler, ..BouwstenenConverter, ..SourcingDataAreaIdBepaler, ..Formatter, ..AfbeeldingService, ..ProductUpdater, ..LadeVariantBepaler)
 ]]></Implementation>
 </Method>
 
@@ -506,18 +452,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefProductData">
-<Private>1</Private>
-<ReturnType>DOM.PM.dto.ProductData</ReturnType>
-<Implementation><![CDATA[
-	Set ProductData = ##class(DOM.PM.dto.ProductData).%New()
-	Set ProductData.PRNr = ..#RandomProductId
-	Set ProductData.DossierNummer = ..#RandomDossierNr
-	
-	Quit ProductData
-]]></Implementation>
-</Method>
-
 <Method name="Verifieer">
 <Private>1</Private>
 <Implementation><![CDATA[