Expand templates

From WillingdonHS

Expand templates