Add back the modifiers on the tokens