Adding TemplateGroup class - was not tracked previously.