Xref format changes