New cli changes