Add TemplateExtensions
Merge