Expand templates

From Accelerator
Expand templates