Improved UploadControl