Expand templates

From Xen
Expand templates