Added token type for parser