Expand templates

From UFAL AIC
Expand templates