Refactored ManyToMany logic a little bit :frog: