Adjustment for API changes