Expand templates

From devsummit
Expand templates