Add proper support for InventoryHolders