Expand templates

From site test 4
Expand templates