Changed Multipart class a bit