UploadService modifications