added support for one-to-one relationship tracking