Changed Cart and Shelf schema