Improved CLI command usability