Expand templates

From TESS-GEN
Expand templates