Thanks for the reminder, we do have more detail information in message.deliveryStatus. I will check if this attribute will satisfy all the scenario and refine this part.