Upgrades to CLI