Index: AXimpl/common/AxProductValidator.cls.xml
===================================================================
diff -u -r50107 -r55397
--- AXimpl/common/AxProductValidator.cls.xml	(.../AxProductValidator.cls.xml)	(revision 50107)
+++ AXimpl/common/AxProductValidator.cls.xml	(.../AxProductValidator.cls.xml)	(revision 55397)
@@ -13,14 +13,28 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProductTypeApi">
+<Type>DOM.PM.ProductTypeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="AxProductFactory">
+<Type>AXimpl.common.AxProductFactory</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
+<FormalSpec>IsOngewenstProductInMigratieFilter:AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter="",SoprIteratorFilter:AX.Uitgaand.PM.impl.SoprIteratorFilter="",ProductTypeApi:DOM.PM.ProductTypeAPI="",AxProductFactory:AXimpl.common.AxProductFactory=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..IsOngewenstProductInMigratieFilter = ##class(AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New()
-	Set ..SoprIteratorFilter = ##class(AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
+	Set ..IsOngewenstProductInMigratieFilter = $$$Inject(IsOngewenstProductInMigratieFilter, ##class(AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New())
+	Set ..SoprIteratorFilter = $$$Inject(SoprIteratorFilter, ##class(AX.Uitgaand.PM.impl.SoprIteratorFilter).%New())
+	Set ..ProductTypeApi = $$$Inject(ProductTypeApi, ##class(DOM.PM.impl.ProductTypeAPIimpl).%New())
+	Set ..AxProductFactory = $$$Inject(AxProductFactory, ##class(AXimpl.common.AxProductFactory).%New())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -30,11 +44,11 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim IsValid As %Boolean = $$$True
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(ProductNummer)
+	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ..AxProductFactory.Maak(ProductNummer)
 	
 	If $$$Not(..SoprIteratorFilter.IsValid(Product)) {
 		Set IsValid = $$$False
-	} ElseIf (Product.Basis.LinkType = "S") {
+	} ElseIf ((Product.Basis.LinkType = "S") && ($$$Not(..ProductTypeApi.IsSpaceTowerProduct(ProductNummer)))) {
 		Set IsValid = $$$False
 	} ElseIf (..IsOngewenstProductInMigratieFilter.IsValid(Product)) {
 		Set IsValid = $$$False
@@ -51,7 +65,7 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim IsValid As %Boolean = $$$True
-	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(ProductNummer)
+	#dim Product As AX.Uitgaand.PM.Product.impl.Product = ..AxProductFactory.Maak(ProductNummer)
 	
 	If $$$Not(..SoprIteratorFilter.IsValid(Product)) {
 		Set IsValid = $$$False