Added Template discovery to TemplateResolver