Improved loading of files