Index: Tools/Mock/MockCreator.cls.xml
===================================================================
diff -u -r1251 -r1254
--- Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 1251)
+++ Tools/Mock/MockCreator.cls.xml	(.../MockCreator.cls.xml)	(revision 1254)
@@ -18,13 +18,19 @@
 <Private>1</Private>
 </Property>
 
+<Property name="MockCreatorBepaler">
+<Type>Tools.Mock.MockCreatorBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..svnHelper = ##class(svn.Helper).%New()
+	Set ..MockCreatorBepaler = ##class(Tools.Mock.MockCreatorBepaler).%New()
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -86,27 +92,10 @@
 <FormalSpec>ClassDefinition:%Dictionary.ClassDefinition</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim HeeftMockKlasseNodig As %Boolean = 0
-	set HeeftMockKlasseNodig = 	(ClassDefinition.Abstract) && ( ..DerivesFromCorrectInterface(ClassDefinition.Name)) && 		 					
-							( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(ClassDefinition.Name,"TECH.Template") ) ) && 
-		 					( $$$Not( ##class(TECH.ClassUtils).ClassDerivesFrom(ClassDefinition.Name,"%Library.Base") ) )
-	set:('HeeftMockKlasseNodig) HeeftMockKlasseNodig = ClassDefinition.Super [ "TECH.Mockable"		 					
-	quit HeeftMockKlasseNodig
+<Implementation><![CDATA[	quit ..MockCreatorBepaler.HeeftMockKlasseNodig(ClassDefinition)
 ]]></Implementation>
 </Method>
 
-<Method name="DerivesFromCorrectInterface">
-<FormalSpec>ClassName:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim DerivesFromCorrectInterface As %Boolean = ##class(TECH.ClassUtils).ClassDerivesFrom(ClassName,"TECH.Interface")
-	if 'DerivesFromCorrectInterface set DerivesFromCorrectInterface = ##class(TECH.ClassUtils).ClassDerivesFrom(ClassName,"TECH.InternalInterface")
-	quit DerivesFromCorrectInterface
-]]></Implementation>
-</Method>
-
 <Method name="CreatePushedInstanceMethod">
 <Private>1</Private>
 <Implementation><![CDATA[