Adding entity mapping plus beginning to link customer accounts with carts