Added TemplateValues and TemplateValueGenerators