Accommodate to API changes