Feature/cfy 796 relationship type hierarchy