Index: vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml
===================================================================
diff -u -r60333 -r60343
--- vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(.../CrossFactory.cls.xml)	(revision 60333)
+++ vhTest/Fake/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(.../CrossFactory.cls.xml)	(revision 60343)
@@ -9,20 +9,20 @@
 
 <Method name="MaakCrossDiag">
 <FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="MaakCrossVH">
 <FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="MaakTCross">
 <FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml
===================================================================
diff -u -r60333 -r60343
--- vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(.../CrossFactory.cls.xml)	(revision 60333)
+++ vhTest/Mock/APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(.../CrossFactory.cls.xml)	(revision 60343)
@@ -17,19 +17,22 @@
 
 <Method name="MaakCrossDiag">
 <FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakCrossDiag",Width,Height,kleur)
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakCrossDiag",Width,Height,kleur)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakCrossVH">
 <FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakCrossVH",Width,Height,kleur)
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakCrossVH",Width,Height,kleur)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakTCross">
 <FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("MaakTCross",Width,Height,kleur)
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakTCross",Width,Height,kleur)
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml
===================================================================
diff -u -r60333 -r60343
--- APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(.../CrossFactory.cls.xml)	(revision 60333)
+++ APPS/Halux/PPS/ALUFrees/Svg/BasisElement/CrossFactory.cls.xml	(.../CrossFactory.cls.xml)	(revision 60343)
@@ -21,6 +21,7 @@
 
 <Method name="MaakCrossDiag">
 <FormalSpec>Width:%Integer,Height:%Integer=1,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag</ReturnType>
 <Implementation><![CDATA[
 	Set CrossDiag =  ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New()
 	Set CrossDiag.TopLine = ..BasisElementFactory.MaakLijn(0,0,Width,Height)
@@ -33,6 +34,7 @@
 
 <Method name="MaakCrossVH">
 <FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH</ReturnType>
 <Implementation><![CDATA[
 	Set CrossVH = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossVH).%New()
 	Set CrossVH.HorizontalLine = ..BasisElementFactory.MaakLijn(0,Height/2,Width,Height/2)
@@ -45,6 +47,7 @@
 
 <Method name="MaakTCross">
 <FormalSpec>Width:%Integer,Height:%Integer,kleur:TECH.Svg.enu.Kleur=##class(TECH.Svg.enu.Kleur).Zwart()</FormalSpec>
+<ReturnType>APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross</ReturnType>
 <Implementation><![CDATA[
 	Set TCross = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.TCross).%New()
 	Set TCross.HorizontalLine = ..BasisElementFactory.MaakLijn(0,0, Width, 0)