Update to match API streamlining on server