Expand templates

From SSOHR
Expand templates