Added message handler to Client