Updated ShoppingCart and OrderItem