New cli compatible