Improved speed to load files