Integrating with latest API changes.