Add support to automatically run distinct dataset