Continue CartManager development