Refactoring cart, services and VC
Resolve conflicts