Removed support for 'match_state'