Added xref exception