refactored token map