Improved the basket management