Index: vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Object.cls.xml
===================================================================
diff -u -r2580 -r2584
--- vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Object.cls.xml	(.../Object.cls.xml)	(revision 2580)
+++ vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Object.cls.xml	(.../Object.cls.xml)	(revision 2584)
@@ -10,6 +10,10 @@
 <Property name="Property2">
 <Type>%String</Type>
 </Property>
+
+<Property name="Embedded">
+<Type>vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object</Type>
+</Property>
 </Class>
 
 
Index: vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Test.cls.xml
===================================================================
diff -u -r2582 -r2584
--- vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Test.cls.xml	(.../Test.cls.xml)	(revision 2582)
+++ vhUnitTest/TECH/Filter/PropertyBasedFilter/IsValid/Test.cls.xml	(.../Test.cls.xml)	(revision 2584)
@@ -20,6 +20,42 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: 1 embedded property 1 waarde -&gt; valid indien property waarde gelijk aan opgegeven waarde">
+<Implementation><![CDATA[
+	set ValueList = ##class(TECH.KeyValue.List).%New()
+	do ValueList.InsertKeyValue("Embedded.Property1","ValidValue")
+	
+	set Filter = ##class(TECH.Filter.PropertyBasedFilter).%New(ValueList)
+	
+	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+	set Object.Embedded = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+
+	set Object.Embedded.Property1 = "ValidValue"
+	do $$$AssertTrue(Filter.IsValid(Object))
+	
+	set Object.Embedded.Property1 = "InvalidValue"
+	do $$$AssertFalse(Filter.IsValid(Object))
+]]></Implementation>
+</Method>
+
+<Method name="Test: onbestaande properties -&gt; raised een property does not exist exception">
+<Implementation><![CDATA[
+	set ValueList = ##class(TECH.KeyValue.List).%New()
+	do ValueList.InsertKeyValue("UnExistingProperty1","ValidValue")
+	do ValueList.InsertKeyValue("Embedded.UnExistingProperty1","ValidValue")
+	
+	set Filter = ##class(TECH.Filter.PropertyBasedFilter).%New(ValueList)
+	
+	set Object = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+	set Object.Embedded = ##class(vhUnitTest.TECH.Filter.PropertyBasedFilter.IsValid.Object).%New()
+
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("<PROPERTY DOES NOT EXIST>")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.RuntimeException).%ClassName(1),Substrings))
+
+	#dim DummyResult As %Booelan = Filter.IsValid(Object)
+]]></Implementation>
+</Method>
+
 <Method name="Test: 2 properties elk 1 waarde -&gt; valid indien property waarden gelijk aan opgegeven waarden">
 <Implementation><![CDATA[
 	set ValueList = ##class(TECH.KeyValue.List).%New()
Index: TECH/Filter/PropertyBasedFilter.cls.xml
===================================================================
diff -u -r2581 -r2584
--- TECH/Filter/PropertyBasedFilter.cls.xml	(.../PropertyBasedFilter.cls.xml)	(revision 2581)
+++ TECH/Filter/PropertyBasedFilter.cls.xml	(.../PropertyBasedFilter.cls.xml)	(revision 2584)
@@ -33,12 +33,25 @@
 	#dim IsValid As %Boolean = 1
 	while ( ..KeyValuePairIterator.HasNext() ) && ( IsValid ) {
 		#dim KeyValuePair As TECH.KeyValuePair = ..KeyValuePairIterator.Next()
-		set IsValid = ..KeyValuePairList.ValueExistsForKey(KeyValuePair.Key, $property(Object,KeyValuePair.Key))
+		set IsValid = ..KeyValuePairList.ValueExistsForKey(KeyValuePair.Key, ..GetValue(Object,KeyValuePair.Key))
 	}
 	Do ..KeyValuePairIterator.Reset()
 	quit IsValid
 ]]></Implementation>
 </Method>
+
+<Method name="GetValue">
+<FormalSpec>Object:%CacheString,Property:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	new Value
+	set Code = "set Value = Object."_Property
+	xecute Code
+	quit Value
+]]></Implementation>
+</Method>
 </Class>