Improved data loading