Added echo client and Server