schema and migration updated, models reflect new associations