Updated migration; now matches master branch