Expand templates

From Ease Gill

Expand templates