update OneToOne implementation