Updated to match server-side changes