Made Inventory Override system more flexible