Changing the message contract to a collection of key value pairs.