Preliminary changes for ForgeMultiPart...