CLI Optimization