Another change to client syntax