Renamed to ContentQuery and DataProvider