Expand templates

From openQRM
Expand templates