Adapting to changes in Data API