CartItemState improvements