Finalized the support for file uploads