Upgrade guide enhancements