Expand templates

From phenoscape
Expand templates