More work to the inventory util.