Added TemplateGroup