Continue cart refactoring