Moved links into Metadata, removed from Provider.