Updated the client side API.
Merge conflict, or something