Renamed and moved data provider