Revise UpgradeTree structure. Add new upgrade types