cli enhancements for beta7