Improved the way data are loaded