Added support for a single level of an o2m + m2o pair