Index: vhTest/Fake/TECH/Query/QueryAPI.cls.xml
===================================================================
diff -u -r31963 -r31971
--- vhTest/Fake/TECH/Query/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 31963)
+++ vhTest/Fake/TECH/Query/QueryAPI.cls.xml	(.../QueryAPI.cls.xml)	(revision 31971)
@@ -1,39 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhTest.Fake.TECH.Query.QueryAPI">
-<Super>TECH.RegisteredObject,TECH.Query.impl.QueryAPI</Super>
+<Super>TECH.RegisteredObject,TECH.Query.QueryAPI</Super>
 
-<Property name="Query">
-<Type>%String</Type>
+<Property name="DataList">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
 </Property>
 
-<Property name="Params">
-<Type>%List</Type>
+<Property name="Columns">
+<Type>%ListOfDataTypes</Type>
+<Private>1</Private>
 </Property>
 
-<Property name="RuntimeMode">
-<Type>TECH.enu.ResultSetRuntimeMode</Type>
-</Property>
+<Method name="%OnNew">
+<FormalSpec>DataList:%ListOfDataTypes="",Columns:%ListOfDataTypes=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..DataList = DataList
+	set ..Columns = Columns
+	Quit $$$OK
+]]></Implementation>
+</Method>
 
 <Method name="ExecuteDynamicQuery">
 <FormalSpec>Query:%String,lbParams:%List="",RuntimeMode:TECH.enu.ResultSetRuntimeMode=""</FormalSpec>
-<Implementation><![CDATA[
-	set ..Query = Query
-	set ..Params = lbParams
-	set ..RuntimeMode = RuntimeMode
-]]></Implementation>
 </Method>
 
 <Method name="GetDynamicResultSet">
 <FormalSpec>Query:%String,lbParams:%List="",RuntimeMode:TECH.enu.ResultSetRuntimeMode=""</FormalSpec>
 <ReturnType>TECH.ResultSet</ReturnType>
-<Implementation><![CDATA[
-	set ..Query = Query
-	set ..Params = lbParams
-	set ..RuntimeMode = RuntimeMode
-	Quit ##class(TECH.ResultSet).%New()
+<Implementation><![CDATA[	Quit ##class(vhTest.Fake.TECH.ResultSet).%New(..DataList,..Columns)
 ]]></Implementation>
 </Method>
+
+<Method name="GetResultSet">
+<FormalSpec>Query:TECH.Query</FormalSpec>
+<ReturnType>TECH.ResultSet</ReturnType>
+<Implementation><![CDATA[	Quit ##class(vhTest.Fake.TECH.ResultSet).%New(..DataList,..Columns)
+]]></Implementation>
+</Method>
 </Class>