Expand templates

From ENGL7102a
Expand templates