Expand templates

From RTM
Expand templates