Upgraded CartController functionality