Added support for EventMatcher