Added more smart paging