Expand templates

From Biomed
Expand templates