Hacked together the new schema.