Further work on Client API.