Updated Inventory classes