Expand templates

From NMSL
Expand templates