Refactor match logic to MatchEngine