Expand templates

From Spintend service and support
Expand templates