Expand templates

From Medusa
Expand templates