updated MessageHandler with source description