Adjustments to template token mechanic.