Mock compliance to latest API changes