Update client and parser to handle more cases.