Expand templates

From ODRA
Expand templates