added current cart concern and updated schema