Added Paginator support