Updated to reflect server-side changes