Add rudimentary many-to-many support