Refactor EchoClient