Refactored CLI handling and composites