Improve the upgrade tree design