Change client syntax to be more flexible on the Status