Improve file loading