Performance improvement, support large files #4