Changes to support Linked Data Entity Uri collection on SFI and SFV