Expand templates

From AskBoon

Expand templates