Adapted API changes.