Added ability for matchers to be just about anything