Paginator refactoring