Update to use new feature/pagination class