Refactored tokens