Updated schema to reflect new tables and relationships