Updated some item functions to use new inventory