Adding some template bits you wanted