Introduce token polymorphism