Adding context to MessageHandler