Add multipart support, remove custom framing