Changes for the TemplateTagLib