Use new UpgradeConfig