Modify client syntax