Added some template changes