Cart refactoring goes on