Refactor, improve Multipart model

refs #15674