Expand templates

From Shapika

Expand templates