Various enhancements to the Client class