Improved new MessageHandler integration.
Continued integrating new-style message handlers.