Adjusting to mirror API changes.