Align to API changes