I got frustrated and changed the schema