Made template variables more general in default template