Improved inventory functionality