Added TemplateService & Controler