Properly added OneToOne support