Added support for remembering delivery requests