Update to match changes in bundle server