Switch to dataset from Preprocessor