Improve Client class