FIXs and add Iterator support to UploadFiles.php