Expand templates

From radlabs
Expand templates