Ids are now stored as part of message instances