Start rework of MultipartMessageManager