cli enhancements