Improved CLI manager