Add Support for CupCakeMuffinPart/CupCakeServicePart