Add OneToMany support