Update to message system

Update to message system