Improve Client spec