Add retrying to paging