Added support for relationship tracking