Improve inventory manager