Minor changes: FileIterface