Part 2 of fixing the schema