Changed tokens to use templates.