Upgrade to tagging and paging.