Expand templates

From virtonomics
Expand templates