Added support for multipart content-type