Added paging for Samples