Expand templates

From NABA

Expand templates