Changes to match new unmodifiable server api Location