Expand templates

From SAP Enable Now Wiki
Expand templates