Expanded RunsafeInventory