Use dataset-connectors 2.0 api (wip)