Expand templates

From Norcpm
Expand templates