Switch to standard many-to-many relationships