Expand templates

From akinsinc

Expand templates