Update to latest server changes