ClientMessageHandler and SearchMessageHandler now extend MessageHandler