Added support for Matcher with functional test