Improved multipart support