Template refactoring moved more functionality to the token list