changes for managing data in the message