Use unique_ptr to manage one to one relations (#689)

Use unique_ptr to manage one to one relations (#689) #134