Added better support for add-ons with multiple parts (supporting multiple products).