Added functionality to GenericDataset