Added the ClientHandler