Expand templates

From Compute
Expand templates