Improve the upgrader CLI