GetCartHandler changes - WIP