Improve Message handling.