Expand templates

From Chill

Expand templates