Add support for readMessage and addDelivery