improved multipart support