Expand templates

From IIW
Expand templates