Expanded the system to use multipart items