Inventory Rework and New Classes