Paging and searching added.