Allow Claim ID to be retrieved from Message
Allow Message ID to be retrieved