Added more code to Client.