improve container of token list