Add support for custom matchers