Update to reflect server changes