Improved command structure