Expand templates

From Opengenome.net
Expand templates