adding support for template tags