Changes related to file upload