Fixed shortcuts with new command structure