add paginator support