Changes to LinkedDataExpander