Index: vhTest/Mock/TECH/Query/QueryAPI.cls.xml
===================================================================
diff -u -r2401 -r2510
--- vhTest/Mock/TECH/Query/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 2401)
+++ vhTest/Mock/TECH/Query/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 2510)
@@ -18,6 +18,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Execute">
+<FormalSpec>Query:TECH.Query</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Execute",Query)
+]]></Implementation>
+</Method>
+
 <Method name="ExecuteDynamicQuery">
 <FormalSpec>Query:%String,lbParams:%List="",RuntimeMode:TECH.enu.ResultSetRuntimeMode=""</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ExecuteDynamicQuery",Query,lbParams,RuntimeMode)
Index: vhTest/Mock/TECH/Query/impl/QueryAPI.cls.xml
===================================================================
diff -u -r2401 -r2510
--- vhTest/Mock/TECH/Query/impl/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 2401)
+++ vhTest/Mock/TECH/Query/impl/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 2510)
@@ -18,6 +18,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Execute">
+<FormalSpec>Query:TECH.Query</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Execute",Query)
+]]></Implementation>
+</Method>
+
 <Method name="ExecuteDynamicQuery">
 <FormalSpec>Query:%String,lbParams:%List="",RuntimeMode:TECH.enu.ResultSetRuntimeMode=""</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ExecuteDynamicQuery",Query,lbParams,RuntimeMode)
Index: vhTest/Fake/TECH/Query/impl/QueryAPI.cls.xml
===================================================================
diff -u -r2401 -r2510
--- vhTest/Fake/TECH/Query/impl/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 2401)
+++ vhTest/Fake/TECH/Query/impl/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 2510)
@@ -9,6 +9,11 @@
 
 <Method name="ExecuteDynamicQuery">
 <FormalSpec>Query:%String,lbParams:%List="",RuntimeMode:TECH.enu.ResultSetRuntimeMode=""</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="Execute">
+<FormalSpec>Query:TECH.Query</FormalSpec>
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
Index: TECH/Query/QueryAPI.cls.xml
===================================================================
diff -u -r1864 -r2510
--- TECH/Query/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 1864)
+++ TECH/Query/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 2510)
@@ -21,6 +21,11 @@
 <ReturnType>TECH.ResultSet</ReturnType>
 </Method>
 
+<Method name="Execute">
+<Abstract>1</Abstract>
+<FormalSpec>Query:TECH.Query</FormalSpec>
+</Method>
+
 <Method name="HasResultsDynamicQuery">
 <Abstract>1</Abstract>
 <FormalSpec>Query:%String,lbParams:%List="",RuntimeMode:TECH.enu.ResultSetRuntimeMode=""</FormalSpec>
Index: TECH/Query/impl/QueryAPI.cls.xml
===================================================================
diff -u -r2328 -r2510
--- TECH/Query/impl/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 2328)
+++ TECH/Query/impl/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 2510)
@@ -12,6 +12,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Execute">
+<FormalSpec>Query:TECH.Query</FormalSpec>
+<Implementation><![CDATA[
+	if Query.%Extends("TECH.ClassQuery") {
+		do ..GetResultSetFromClassQuery(Query)
+	} else {
+		do ..ExecuteDynamicQuery(Query.Statement,Query.Parameters,Query.RuntimeMode)
+	}
+]]></Implementation>
+</Method>
+
 <Method name="GetResultSet">
 <FormalSpec>Query:TECH.Query</FormalSpec>
 <ReturnType>TECH.ResultSet</ReturnType>