Improved upload flow