Updated dataset loading