Message class improvement