More work on Multipart support