Small change to Client class