Improve upgrade decision creation