Inventory class enhanced