Expand templates

From prosecco
Expand templates