adding dataset support, wip