Added more builtin token types