Further Message class integration.