Replaced Functions by TemplateTags in templates