Changed command structure and initialization.