Adjusted Match to take tokens as input, not strings