Accounting for API changes