[WIP] Support aggregation command cursors and client options