Expand templates

From Vinland Project

Expand templates