Refactored Tokens