Improve Client API