Improvements for the messenger