Refining the Basket functionality