Added more token types