Add support for paginated datastores