Added support for multipart and file uploads