Yet Another Schema change

Thanks to Francisco helping us through realizing out embedding issues.