Refactored Paginator dependency