CFY-649 add support for relationships