Next improvement of UploadFile module