Improved upload process