Add many_to_many support