Expand templates

From Expressome.org
Expand templates