Expand templates

From SME Server
Expand templates