Composite Wizard Upgrade