Added MessageHandler and MessageListener