Reworked xref functions.