Major updates for generalized approach that includes relation direction