changes for xref features