Objectified the client struct