add tokenType and tokenText