Made changes to the basket structure