Add support for also returning entity local cross-referencing information