Expand templates

From Metagenes
Expand templates