Refactored CLI feature