Structural changes to InventoryMonitor