Improved data load