Add buffering in QueueSubscription