Updating Server spec to match latest changes