Scaffold for dataset, fixed source bug