Add support for MessageHandlers