Zorigt's branch from master
Zorigt added Cart with migration