Messages improvements

Improved way how messages are sent.