Updated to work with the changes to Cor.