More reliable data loading