Updated lib to use Multipart