Managing cross-references