Expand templates

From GJ
Expand templates