Change streaming to use DeferredQueue