Updates for message structure

Changed message structure to contain a Map instead of directly placing
items in the body.