Could the upload logic be simplified by using the datasetId directly in place of the uploadId? I think it’s a 1:1 relation already.