Support new file upload system