Enhanced the UpgradeManager