Add support for toMatch