Changes to Paginator to support ListDatasets