Reworked some of the bindings in client.