SCOUT-67 fixing classcast exception, adding ExternalLinks, instead of ExternalIdentifier. Adding more generics types to some Collections to prevent these types of bugs.