Expand templates

From tfpie
Expand templates