Added more xref exceptions