Added new schema. There is still a test failing