Fix - Fast Enrich with relationships