Expand templates

From GATE
Expand templates