Expand templates

From CLIO

Expand templates