Add support for unified_inventory