Support for cross-references