Add pagination support back in
Removed unnecessary PaginationHelper