Initial support for custom matchers