Adding TemplateTags argument and tag creation