Added support for 1:1 relationships.