Token refactoring