Refactored CLI callables again