Expand templates

From HPC
Expand templates