Modified MessageHandler functions and interface.