Changes for setupDataset