Full unified_inventory and inventory_plus support!