Redid many-to-many relationships