Added paging to data provider