Made some template changes