Expand templates

From EGTRE
Expand templates