Expand templates

From HI Plan

Expand templates