Expand templates

From Pathogenome.org
Expand templates