Improvements to the upload and new helpers