Add adapter classes for MessageHandler