Improve upload flow