Refactored the storage of the body to support embedded bodies in the
message it self