Update client code to handle stuff