Added message support for ClientHandler