* Update to message structure.
* Minor code refactor