Added state based matchers
Fast port to state machine matchers