Expand templates

From FSITLC
Expand templates