Refactored command structure.