Finished going throught the schema changes