Expand templates

From The BABEL Development Site
Expand templates