Modify MessageHandler