Expand templates

From Bondline
Expand templates