added untested property matching support