Introduce token polymorphism
Cosmetic fixes