CLI Improvements