Expand templates

From GURaaS Developer Community
Expand templates