Expanded the Pagination helpers