Improved CLI usage