API changes to support Android