MessageHandler expanded