Refactored GNGDataset