Added paging and tagging.