added paginator support