Minor changes to implement M-N relationships