Added TemplateManager