Changes to ManyToOne, need to review tests