Expand templates

From farlabprotocols
Expand templates