Expand templates

From Abernon
Expand templates