Add support for template variables