changed to a TokenCollection for Token commands