Adapted API changes