Expand templates

From Goodness Community

Expand templates