TokenStream API changed