Improved inventory handling