Rewrite command structure