update list to handle token object