Changes for vendor_spirit