Updates to support SimpleFileUpload re-write