Second round of schema changes. Convert core finished.