Upload dataset flow re-work