Modification on API changes