Index: vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r47538 -r47567
--- vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47538)
+++ vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47567)
@@ -20,6 +20,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsBeslagProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="IsGenerischAfgeleidProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="IsGenerischProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefKlasId">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ""
Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r47538 -r47567
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47538)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47567)
@@ -438,12 +438,24 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsBasisProduct">
+<Method name="IsBeslagProduct">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..Data0.GeefPiece(3)'?4.N
+<Implementation><![CDATA[	Quit $$$Not($length(..Data0.GeefPiece(3)))
 ]]></Implementation>
 </Method>
 
+<Method name="IsGenerischProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ((..Data0.GeefPiece(3)'?4.7N)&&$length(..Data0.GeefPiece(3)))
+]]></Implementation>
+</Method>
+
+<Method name="IsGenerischAfgeleidProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ((..Data0.GeefPiece(3)?4.7N)&&$length(..Data0.GeefPiece(3)))
+]]></Implementation>
+</Method>
+
 <Method name="GeefStockType">
 <ReturnType>DOM.PM.enu.StockType</ReturnType>
 <Implementation><![CDATA[
Index: vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r47538 -r47567
--- vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47538)
+++ vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47567)
@@ -382,12 +382,24 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsBasisProduct">
+<Method name="IsBeslagProduct">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsBasisProduct")
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsBeslagProduct")
 ]]></Implementation>
 </Method>
 
+<Method name="IsGenerischAfgeleidProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsGenerischAfgeleidProduct")
+]]></Implementation>
+</Method>
+
+<Method name="IsGenerischProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsGenerischProduct")
+]]></Implementation>
+</Method>
+
 <Method name="IsInUitverkoop">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("IsInUitverkoop")