Expand templates

From Tech Wiki of Solution Point
Expand templates