add redelivery support