Performance improvement, support large files