Update listeners to use MessageHandler
Update README