Added additional template changes