Change back to mapping.
Update the message example for the new structure of the message example.