performance improvements on file load