Changes to reflect server changes