Improve command structure