Updated FileUploader