Improve file load