Index: TECH/DynamicIterator.cls.xml
===================================================================
diff -u -r2301 -r2531
--- TECH/DynamicIterator.cls.xml	(.../DynamicIterator.cls.xml)	(revision 2301)
+++ TECH/DynamicIterator.cls.xml	(.../DynamicIterator.cls.xml)	(revision 2531)
@@ -8,11 +8,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="FilterStatement">
-<Type>TECH.String</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="ItemStatement">
 <Type>TECH.String</Type>
 <Private>1</Private>
@@ -29,16 +24,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Filter">
+<Type>%CacheString</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>Iterator:TECH.Iterator,ItemStatement:%String="",FilterStatement:TECH.String=""</FormalSpec>
+<FormalSpec>Iterator:TECH.Iterator,ItemStatement:%String="",Filter:%CacheString=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..Iterator = Iterator
 	set ..ItemStatement = ItemStatement
-	set ..FilterStatement = FilterStatement
+	set ..Filter = Filter
 	do ..GetNextItem()
 	quit $$$OK
 ]]></Implementation>
@@ -83,15 +83,17 @@
 </Method>
 
 <Method name="IsValid">
-<FormalSpec>Item:TECH.String</FormalSpec>
+<FormalSpec>Item:%CacheString</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	quit:$$$IsEmptyString(..FilterStatement) $$$true
+	quit:$IsObject(..Filter) ..Filter.IsValid(Item)
 	
+	quit:$$$IsEmptyString(..Filter) $$$true
+	
 	new result,Code 
-	set Code = "set result = ("_..FilterStatement_")"
+	set Code = "set result = ("_..Filter_")"
 	xecute Code
 	quit result
 ]]></Implementation>