Redesign command structure.