Expand templates

From KVM
Expand templates