added token columns to wave table