New changes for file uploads