Add support for cross-references.