From a8ec997cff38636568f3437b7c7ffc60bef35462 Mon Sep 17 00:00:00 2001
From: edlu77 <eddd.lu@gmail.com>
Date: Thu, 7 Dec 2023 19:38:36 -0500
Subject: [PATCH 1/6] Improvements to href

---
 apps/ftu-ui-small-wc/src/app/app.component.ts | 17 +++---
 apps/ftu-ui/src/app/app.component.ts          | 33 +++++-----
 apps/ftu-ui/src/app/app.init.ts               |  4 --
 apps/ftu-ui/src/app/app.module.ts             | 14 +++--
 apps/ftu-ui/src/index.html                    |  5 +-
 .../webcomponent-example.html                 |  3 +-
 ...ponent-multiple-illustrations-example.html |  3 +-
 .../state/src/base-href/base-href.actions.ts  | 15 +++++
 .../src/base-href/base-href.selectors.spec.ts | 10 ++++
 .../src/base-href/base-href.selectors.ts      | 10 ++++
 .../state/src/base-href/base-href.state.ts    | 22 +++++++
 libs/cdk/state/src/base-href/index.ts         |  3 +
 libs/cdk/state/src/index.ts                   |  1 +
 .../resource-registry.selectors.ts            |  3 +-
 libs/cdk/state/src/state.module.ts            |  3 +-
 libs/cdk/state/src/storage/storage.state.ts   |  4 +-
 .../footer-behavior.component.html            |  2 +-
 .../footer-behavior.component.ts              |  4 --
 .../header-behavior.component.html            |  2 +-
 .../header-behavior.component.ts              |  8 +--
 .../landing-page-content.component.html       |  6 +-
 .../landing-page-content.component.ts         | 10 ++--
 .../src/lib/metrics/metrics.component.html    |  2 +-
 .../src/lib/ftu-data/ftu-data.impl.ts         | 60 ++++++++++++-------
 libs/services/src/lib/service.module.ts       |  5 +-
 .../src/lib/illustrator/illustrator.state.ts  |  8 +--
 26 files changed, 162 insertions(+), 95 deletions(-)
 create mode 100644 libs/cdk/state/src/base-href/base-href.actions.ts
 create mode 100644 libs/cdk/state/src/base-href/base-href.selectors.spec.ts
 create mode 100644 libs/cdk/state/src/base-href/base-href.selectors.ts
 create mode 100644 libs/cdk/state/src/base-href/base-href.state.ts
 create mode 100644 libs/cdk/state/src/base-href/index.ts

diff --git a/apps/ftu-ui-small-wc/src/app/app.component.ts b/apps/ftu-ui-small-wc/src/app/app.component.ts
index 57265f501..139314bf5 100644
--- a/apps/ftu-ui-small-wc/src/app/app.component.ts
+++ b/apps/ftu-ui-small-wc/src/app/app.component.ts
@@ -1,6 +1,7 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  EventEmitter,
   inject,
   Injector,
   Input,
@@ -11,7 +12,7 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import { dispatch, dispatch$, select$, selectSnapshot } from '@hra-ui/cdk/injectors';
-import { createLinkId, LinkRegistryActions, ResourceRegistryActions } from '@hra-ui/cdk/state';
+import { BaseHrefActions, createLinkId, LinkRegistryActions, ResourceRegistryActions } from '@hra-ui/cdk/state';
 import {
   BiomarkerDetailsWcComponent,
   FooterBehaviorComponent,
@@ -77,6 +78,7 @@ export class AppComponent implements OnInit, OnChanges {
 
   @Output() readonly nodeClicked = select$(IllustratorSelectors.selectedOnClicked);
 
+  private readonly setBaseHref = dispatch(BaseHrefActions.Set);
   private readonly loadLinks = dispatch(LinkRegistryActions.LoadFromYaml);
   private readonly loadResources = dispatch(ResourceRegistryActions.LoadFromYaml);
   private readonly navigateToOrgan = dispatch(LinkRegistryActions.Navigate);
@@ -87,16 +89,17 @@ export class AppComponent implements OnInit, OnChanges {
   private readonly reset = dispatch$(ActiveFtuActions.Reset);
 
   private readonly injector = inject(Injector);
-  private endpoints?: FtuDataImplEndpoints;
+  private readonly endpoints = inject(FTU_DATA_IMPL_ENDPOINTS) as EventEmitter<FtuDataImplEndpoints>;
 
   ngOnInit() {
-    this.endpoints = this.injector.get(FTU_DATA_IMPL_ENDPOINTS);
+    this.setBaseHref(this.baseHref);
     this.loadLinks(this.setUrl(this.linksYamlUrl));
     this.loadResources(this.setUrl(this.resourcesYamlUrl));
-    this.endpoints.illustrations = this.setUrl(this.illustrationsUrl);
-    this.endpoints.datasets = this.setUrl(this.datasetUrl);
-    this.endpoints.summaries = this.setUrl(this.summariesUrl);
-    this.endpoints.baseHref = this.baseHref as Iri;
+    this.endpoints.emit({
+      illustrations: this.setUrl(this.illustrationsUrl),
+      datasets: this.setUrl(this.datasetUrl),
+      summaries: this.setUrl(this.summariesUrl),
+    });
   }
 
   ngOnChanges(changes: SimpleChanges) {
diff --git a/apps/ftu-ui/src/app/app.component.ts b/apps/ftu-ui/src/app/app.component.ts
index 667751e87..62d79c6d3 100644
--- a/apps/ftu-ui/src/app/app.component.ts
+++ b/apps/ftu-ui/src/app/app.component.ts
@@ -1,10 +1,10 @@
 import {
   AfterContentInit,
   Component,
+  EventEmitter,
   HostBinding,
   HostListener,
   inject,
-  Injector,
   Input,
   OnChanges,
   OnInit,
@@ -15,6 +15,7 @@ import { MatDialog, MatDialogConfig, MatDialogModule, MatDialogRef } from '@angu
 import { Router } from '@angular/router';
 import { dispatch, dispatch$, select$, selectQuerySnapshot } from '@hra-ui/cdk/injectors';
 import {
+  BaseHrefActions,
   createLinkId,
   LinkRegistryActions,
   ResourceRegistryActions,
@@ -22,7 +23,7 @@ import {
   StorageSelectors,
 } from '@hra-ui/cdk/state';
 import { ScreenNoticeBehaviorComponent } from '@hra-ui/components/behavioral';
-import { FTU_DATA_IMPL_ENDPOINTS, FtuDataImplEndpoints, Iri } from '@hra-ui/services';
+import { FTU_DATA_IMPL_ENDPOINTS, FtuDataImplEndpoints, Url } from '@hra-ui/services';
 import {
   ActiveFtuActions,
   ActiveFtuSelectors,
@@ -65,9 +66,6 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
 
   @Output() readonly nodeClicked = select$(IllustratorSelectors.selectedOnClicked);
 
-  private readonly injector = inject(Injector);
-  private endpoints?: FtuDataImplEndpoints;
-
   screenSizeNoticeOpen = false;
 
   private readonly hasShownSmallViewportNotice = selectQuerySnapshot(
@@ -76,6 +74,7 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
     'screen-size-notice'
   );
 
+  private readonly setBaseHref = dispatch(BaseHrefActions.Set);
   private readonly loadLinks = dispatch(LinkRegistryActions.LoadFromYaml);
   private readonly loadResources = dispatch(ResourceRegistryActions.LoadFromYaml);
   private readonly navigateToOrgan = dispatch(LinkRegistryActions.Navigate);
@@ -88,6 +87,7 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
   private readonly dialog = inject(MatDialog);
 
   private ref = inject(MatDialogRef<ScreenNoticeBehaviorComponent>);
+  private readonly endpoints = inject(FTU_DATA_IMPL_ENDPOINTS) as EventEmitter<FtuDataImplEndpoints>;
 
   constructor() {
     inject(Router).initialNavigation();
@@ -127,13 +127,15 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
   }
 
   ngOnInit() {
-    this.endpoints = this.injector.get(FTU_DATA_IMPL_ENDPOINTS);
+    this.setBaseHref(this.baseHref);
     this.loadLinks(this.setUrl(this.linksYamlUrl));
     this.loadResources(this.setUrl(this.resourcesYamlUrl));
-    this.endpoints.illustrations = this.setUrl(this.illustrationsUrl);
-    this.endpoints.datasets = this.setUrl(this.datasetUrl);
-    this.endpoints.summaries = this.setUrl(this.summariesUrl);
-    this.endpoints.baseHref = this.baseHref as Iri;
+    this.endpoints.emit({
+      illustrations: this.setUrl(this.illustrationsUrl),
+      datasets: this.setUrl(this.datasetUrl),
+      summaries: this.setUrl(this.summariesUrl),
+      baseHref: this.baseHref as Url,
+    });
   }
 
   ngOnChanges(changes: SimpleChanges) {
@@ -147,11 +149,14 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
       .subscribe();
   }
 
-  private setUrl(url: string): Iri {
-    if (url.slice(0, 4) === 'http') {
-      return url as Iri;
+  private setUrl(url: string): Url {
+    const { baseHref } = this;
+    if (url.startsWith('http')) {
+      return url as Url;
+    } else if (baseHref !== '' && !baseHref.endsWith('/')) {
+      return `${baseHref}/${url}` as Url;
     } else {
-      return (this.baseHref + url) as Iri;
+      return `${baseHref}${url}` as Url;
     }
   }
 
diff --git a/apps/ftu-ui/src/app/app.init.ts b/apps/ftu-ui/src/app/app.init.ts
index 33fbd261d..2804a82e8 100644
--- a/apps/ftu-ui/src/app/app.init.ts
+++ b/apps/ftu-ui/src/app/app.init.ts
@@ -17,9 +17,5 @@ export function initFactory(): () => Observable<unknown> {
           commands: ['/'],
         },
       }),
-
-      new LinkRegistryActions.LoadFromYaml('assets/links.yml'),
-      new ResourceRegistryActions.LoadFromYaml('assets/resources.yml'),
-      new TissueLibraryActions.Load(),
     ]);
 }
diff --git a/apps/ftu-ui/src/app/app.module.ts b/apps/ftu-ui/src/app/app.module.ts
index 4080e2aa9..e4dce4421 100644
--- a/apps/ftu-ui/src/app/app.module.ts
+++ b/apps/ftu-ui/src/app/app.module.ts
@@ -1,21 +1,21 @@
 import { HttpClient, HttpClientModule } from '@angular/common/http';
-import { APP_INITIALIZER, DoBootstrap, Injector, NgModule } from '@angular/core';
+import { APP_INITIALIZER, DoBootstrap, EventEmitter, Injector, NgModule } from '@angular/core';
+import { createCustomElement } from '@angular/elements';
+import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { CdkStateModule } from '@hra-ui/cdk/state';
-import { createCustomElement } from '@angular/elements';
 import { HeaderBehaviorComponent, TissueLibraryBehaviorComponent } from '@hra-ui/components/behavioral';
-import { HraServiceModule } from '@hra-ui/services';
+import { FTU_DATA_IMPL_ENDPOINTS, HraServiceModule } from '@hra-ui/services';
 import { HraStateModule } from '@hra-ui/state';
 import { ThemingModule } from '@hra-ui/theming';
 import { NgxsModule } from '@ngxs/store';
 import { InlineSVGModule } from 'ng-inline-svg-2';
 import { MarkdownModule } from 'ngx-markdown';
+import { environment } from '../environments/environment';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { initFactory } from './app.init';
-import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { environment } from '../environments/environment';
 
 @NgModule({
   declarations: [AppComponent],
@@ -53,6 +53,10 @@ import { environment } from '../environments/environment';
       provide: MatDialogRef,
       useValue: {},
     },
+    {
+      provide: FTU_DATA_IMPL_ENDPOINTS,
+      useValue: new EventEmitter(),
+    },
   ],
 })
 export class AppModule implements DoBootstrap {
diff --git a/apps/ftu-ui/src/index.html b/apps/ftu-ui/src/index.html
index dae7b6372..5ecfb6619 100644
--- a/apps/ftu-ui/src/index.html
+++ b/apps/ftu-ui/src/index.html
@@ -30,11 +30,12 @@
   <body>
     <hra-ftu-wc
       id="ftu"
+      base-href="https://cdn.jsdelivr.net/gh/hubmapconsortium/hra-ui@staging/apps/ftu-ui/"
       links-yaml-url="assets/links.yml"
       resources-yaml-url="assets/resources.yml"
-      dataset-url="assets/TEMP/ftu-datasets.jsonld"
+      dataset-url="https://cdn.jsdelivr.net/gh/cns-iu/hra-vccf-ftu-supporting-information/exploration/ftu-datasets.jsonld"
       illustrations-url="assets/TEMP/2d-ftu-illustrations.jsonld"
-      summaries-url="assets/TEMP/ftu-cell-summaries.jsonld"
+      summaries-url="https://cdn.jsdelivr.net/gh/cns-iu/hra-vccf-ftu-supporting-information/exploration/ftu-cell-summaries.jsonld"
     ></hra-ftu-wc>
   </body>
 </html>
diff --git a/apps/medical-illustration/webcomponent-example.html b/apps/medical-illustration/webcomponent-example.html
index 36a821c51..0d54c559e 100644
--- a/apps/medical-illustration/webcomponent-example.html
+++ b/apps/medical-illustration/webcomponent-example.html
@@ -7,8 +7,7 @@
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <script>
       window.addEventListener('DOMContentLoaded', () => {
-        const illustrationsUrl =
-          'https://hubmapconsortium.github.io/hra-ui/apps/medical-illustration/assets/TEMP/2d-ftu-illustrations.jsonld';
+        const illustrationsUrl = 'assets/TEMP/2d-ftu-illustrations.jsonld';
         let focusId = '';
 
         function updateHighlight(node) {
diff --git a/apps/medical-illustration/webcomponent-multiple-illustrations-example.html b/apps/medical-illustration/webcomponent-multiple-illustrations-example.html
index 43d4bbe80..5d0719a93 100644
--- a/apps/medical-illustration/webcomponent-multiple-illustrations-example.html
+++ b/apps/medical-illustration/webcomponent-multiple-illustrations-example.html
@@ -7,8 +7,7 @@
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <script>
       window.addEventListener('DOMContentLoaded', () => {
-        const illustrationsUrl =
-          'https://hubmapconsortium.github.io/hra-ui/apps/medical-illustration/assets/TEMP/2d-ftu-illustrations.jsonld';
+        const illustrationsUrl = 'assets/TEMP/2d-ftu-illustrations.jsonld';
         let focusId = '';
 
         function updateHighlight(node) {
diff --git a/libs/cdk/state/src/base-href/base-href.actions.ts b/libs/cdk/state/src/base-href/base-href.actions.ts
new file mode 100644
index 000000000..00d9efb1d
--- /dev/null
+++ b/libs/cdk/state/src/base-href/base-href.actions.ts
@@ -0,0 +1,15 @@
+import { ActionGroup } from '../actions/actions';
+
+/** Base action factory */
+const Action = ActionGroup('BaseHref');
+
+/** Sets the base href */
+export class Set extends Action('Set') {
+  /**
+   * Sets the base href
+   * @param baseHref New href
+   */
+  constructor(readonly baseHref: string) {
+    super();
+  }
+}
diff --git a/libs/cdk/state/src/base-href/base-href.selectors.spec.ts b/libs/cdk/state/src/base-href/base-href.selectors.spec.ts
new file mode 100644
index 000000000..638ae48d5
--- /dev/null
+++ b/libs/cdk/state/src/base-href/base-href.selectors.spec.ts
@@ -0,0 +1,10 @@
+import { BaseHrefSelectors } from './base-href.selectors';
+
+describe('BaseHrefSelectors', () => {
+  describe('baseHref()', () => {
+    it('should return the state value for the href', () => {
+      const href = 'test';
+      expect(BaseHrefSelectors.baseHref(href)).toEqual(href);
+    });
+  });
+});
diff --git a/libs/cdk/state/src/base-href/base-href.selectors.ts b/libs/cdk/state/src/base-href/base-href.selectors.ts
new file mode 100644
index 000000000..b35c44fe5
--- /dev/null
+++ b/libs/cdk/state/src/base-href/base-href.selectors.ts
@@ -0,0 +1,10 @@
+import { Selector } from '@ngxs/store';
+import { BaseHrefState } from './base-href.state';
+
+/** Selectors for BaseHrefState */
+export class BaseHrefSelectors {
+  @Selector([BaseHrefState])
+  static baseHref(value: string): string {
+    return value;
+  }
+}
diff --git a/libs/cdk/state/src/base-href/base-href.state.ts b/libs/cdk/state/src/base-href/base-href.state.ts
new file mode 100644
index 000000000..dbfb4d2d6
--- /dev/null
+++ b/libs/cdk/state/src/base-href/base-href.state.ts
@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { Action, State, StateContext } from '@ngxs/store';
+import { Set } from './base-href.actions';
+
+/**
+ * State holding the base href
+ */
+@State<string>({
+  name: 'baseHref',
+  defaults: '',
+})
+@Injectable()
+export class BaseHrefState {
+  @Action(Set)
+  setBaseHref(ctx: StateContext<string>, { baseHref }: Set) {
+    if (baseHref !== '' && !baseHref.endsWith('/')) {
+      baseHref = baseHref + '/';
+    }
+
+    ctx.setState(baseHref);
+  }
+}
diff --git a/libs/cdk/state/src/base-href/index.ts b/libs/cdk/state/src/base-href/index.ts
new file mode 100644
index 000000000..54cc49d6f
--- /dev/null
+++ b/libs/cdk/state/src/base-href/index.ts
@@ -0,0 +1,3 @@
+export * as BaseHrefActions from './base-href.actions';
+export { BaseHrefSelectors } from './base-href.selectors';
+export { BaseHrefState } from './base-href.state';
diff --git a/libs/cdk/state/src/index.ts b/libs/cdk/state/src/index.ts
index b866e6361..acf742312 100644
--- a/libs/cdk/state/src/index.ts
+++ b/libs/cdk/state/src/index.ts
@@ -1,5 +1,6 @@
 export { assertUniqueActionType, registerActionType } from './actions/action-type-registry';
 export { Action, ActionGroup } from './actions/actions';
+export * from './base-href';
 export * from './link-registry';
 export * from './resource-registry';
 export * from './state.module';
diff --git a/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts b/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts
index 2b3ec2ca6..5a069d75a 100644
--- a/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts
+++ b/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts
@@ -8,6 +8,7 @@ import {
   ResourceType,
 } from './resource-registry.model';
 import { ResourceRegistryState } from './resource-registry.state';
+import { BaseHrefSelectors } from '../base-href';
 
 /** Query function returned by {@link ResourceRegistrySelectors.entry} */
 export type EntryQuery = <T extends ResourceEntry>(id: ResourceId, type: ResourceType<T>) => T | undefined;
@@ -108,7 +109,7 @@ export class ResourceRegistrySelectors {
    * @param state Current state
    * @returns Url query function
    */
-  @Selector([ResourceRegistrySelectors.field])
+  @Selector([ResourceRegistrySelectors.field, BaseHrefSelectors.baseHref])
   static url(getField: FieldQuery): DataQuery<string> {
     return (id) => getField(id, BuiltinResourceType.Url, 'url', '');
   }
diff --git a/libs/cdk/state/src/state.module.ts b/libs/cdk/state/src/state.module.ts
index d3cd50ff6..44ad9bc6a 100644
--- a/libs/cdk/state/src/state.module.ts
+++ b/libs/cdk/state/src/state.module.ts
@@ -1,10 +1,11 @@
 import { NgModule } from '@angular/core';
 import { NgxsModule } from '@ngxs/store';
+import { BaseHrefState } from './base-href';
 import { LinkRegistryState } from './link-registry';
 import { ResourceRegistryState } from './resource-registry';
 import { StorageState } from './storage';
 
 @NgModule({
-  imports: [NgxsModule.forFeature([LinkRegistryState, ResourceRegistryState, StorageState])],
+  imports: [NgxsModule.forFeature([BaseHrefState, LinkRegistryState, ResourceRegistryState, StorageState])],
 })
 export class CdkStateModule {}
diff --git a/libs/cdk/state/src/storage/storage.state.ts b/libs/cdk/state/src/storage/storage.state.ts
index 6f1b5a3fa..f183a0c01 100644
--- a/libs/cdk/state/src/storage/storage.state.ts
+++ b/libs/cdk/state/src/storage/storage.state.ts
@@ -4,6 +4,7 @@ import { Injectable } from '@angular/core';
 import { Action, State } from '@ngxs/store';
 import { StorageId, StorageModel } from './storage.model';
 import { Set, Delete, Clear } from './storage.actions';
+
 /**
  * State holding Storage types
  */
@@ -15,9 +16,6 @@ import { Set, Delete, Clear } from './storage.actions';
   },
 })
 @Injectable()
-/**
- *  class for managing storage state
- */
 export class StorageState {
   /**
    * StorageState class to manage storage objects
diff --git a/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.html b/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.html
index feec1474b..839169cf5 100644
--- a/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.html
+++ b/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.html
@@ -1,5 +1,5 @@
 <hra-footer
-  [productLogoUrl]="endpoints.baseHref + productLogoUrl()"
+  [productLogoUrl]="productLogoUrl()"
   [productTitle]="productTitle()"
   [hraPortal]="hraPortal"
   [illustrationMetadata]="illustrationMetadata"
diff --git a/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.ts b/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.ts
index 1ea091b47..c4ddacb75 100644
--- a/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.ts
+++ b/libs/components/behavioral/src/lib/footer-behavior/footer-behavior.component.ts
@@ -6,7 +6,6 @@ import { ResourceRegistrySelectors as RR } from '@hra-ui/cdk/state';
 import { FooterComponent } from '@hra-ui/components/molecules';
 import { DownloadActions, DownloadSelectors, ResourceIds as Ids, LinkIds, ScreenModeSelectors } from '@hra-ui/state';
 import { ContactBehaviorComponent } from '../contact-behavior/contact-behavior.component';
-import { FTU_DATA_IMPL_ENDPOINTS } from '@hra-ui/services';
 
 /** A component for footer behavior which provides functionality for various buttons in footer */
 @Component({
@@ -18,9 +17,6 @@ import { FTU_DATA_IMPL_ENDPOINTS } from '@hra-ui/services';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FooterBehaviorComponent {
-  /** Endpoints injector */
-  readonly endpoints = inject(FTU_DATA_IMPL_ENDPOINTS);
-
   /** Input for product logo URL to displayed on the left side. */
   readonly productLogoUrl = selectQuerySnapshot(RR.url, Ids.ProductLogoUrl);
 
diff --git a/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.html b/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.html
index 94630e9ea..04f786e92 100644
--- a/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.html
+++ b/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.html
@@ -1,5 +1,5 @@
 <hra-header
-  [productLogoUrl]="endpoints.baseHref + productLogoUrl()"
+  [productLogoUrl]="productLogoUrl()"
   [productTitle]="productTitle()"
   [appTitle]="appTitle()"
   [productTitleLink]="productTitleLink"
diff --git a/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.ts b/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.ts
index 01c6e21f0..f2093c998 100644
--- a/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.ts
+++ b/libs/components/behavioral/src/lib/header-behavior/header-behavior.component.ts
@@ -1,9 +1,8 @@
 import { CommonModule } from '@angular/common';
-import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { selectQuerySnapshot } from '@hra-ui/cdk/injectors';
 import { ResourceRegistrySelectors as RR } from '@hra-ui/cdk/state';
 import { HeaderComponent } from '@hra-ui/components/molecules';
-import { FTU_DATA_IMPL_ENDPOINTS } from '@hra-ui/services';
 import { ResourceIds as Ids, LinkIds } from '@hra-ui/state';
 
 /** Component for Header Behavior */
@@ -16,11 +15,6 @@ import { ResourceIds as Ids, LinkIds } from '@hra-ui/state';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class HeaderBehaviorComponent {
-  /**
-   * Endpoints injector
-   */
-  readonly endpoints = inject(FTU_DATA_IMPL_ENDPOINTS);
-
   /**
    * Input for product logo URL to displayed on the left side.
    */
diff --git a/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.html b/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.html
index 99193f723..e036b799d 100644
--- a/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.html
+++ b/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.html
@@ -1,7 +1,7 @@
 <hra-landing-page-intro
   class="intro"
   [title]="landingPageIntroTitle()"
-  [img]="endpoints.baseHref + landingPageIntroImg()"
+  [img]="landingPageIntroImg()"
   [partners]="landingPageIntroPartners()"
   [description]="landingPageIntroDescription()"
   [moreText]="landingPageIntroMoreText()"
@@ -13,7 +13,7 @@
   [title]="metricsTitle()"
   [metrics]="metrics()"
   [logo]="metricsLogo()"
-  [baseHref]="endpoints.baseHref"
+  [baseHref]="baseHref()"
   #intersectable
 >
 </hra-metrics>
@@ -22,7 +22,7 @@
   [title]="landingPageDepthTitle()"
   [description]="landingPageDepthDescription()"
   [moreText]="landingPageDepthMoreText()"
-  [img]="endpoints.baseHref + landingPageDepthImg()"
+  [img]="landingPageDepthImg()"
   [moreLink]="LinkIds.LandingPageReadMore"
   #intersectable
 >
diff --git a/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.ts b/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.ts
index 308f7793d..ad7dbff58 100644
--- a/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.ts
+++ b/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.ts
@@ -9,15 +9,14 @@ import {
   Renderer2,
   ViewChildren,
 } from '@angular/core';
-import { injectDestroy$, selectQuerySnapshot } from '@hra-ui/cdk/injectors';
-import { ResourceRegistrySelectors as RRS } from '@hra-ui/cdk/state';
+import { injectDestroy$, selectQuerySnapshot, selectSnapshot } from '@hra-ui/cdk/injectors';
+import { BaseHrefSelectors, ResourceRegistrySelectors as RRS } from '@hra-ui/cdk/state';
 import {
   LandingPageInDepthComponent,
   LandingPageIntroComponent,
   MetricItem,
   MetricsComponent,
 } from '@hra-ui/components/molecules';
-import { FTU_DATA_IMPL_ENDPOINTS } from '@hra-ui/services';
 import { LinkIds, ResourceIds as RIds, ResourceTypes as RTypes } from '@hra-ui/state';
 
 /** Component for LandingPageContent Behavior */
@@ -30,13 +29,12 @@ import { LinkIds, ResourceIds as RIds, ResourceTypes as RTypes } from '@hra-ui/s
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class LandingPageContentComponent implements AfterViewInit {
-  /** Endpoints injector */
-  readonly endpoints = inject(FTU_DATA_IMPL_ENDPOINTS);
-
   /** array of element refs for intersectables */
   @ViewChildren('intersectable', { read: ElementRef })
   readonly intersectableEls!: QueryList<ElementRef>;
 
+  /** Base href */
+  readonly baseHref = selectSnapshot(BaseHrefSelectors.baseHref);
   /** select snapshot for Landing Page title */
   readonly landingPageIntroTitle = selectQuerySnapshot(RRS.anyText, RIds.LandingPageTitle);
   /** select snapshot for landing page intro description */
diff --git a/libs/components/molecules/src/lib/metrics/metrics.component.html b/libs/components/molecules/src/lib/metrics/metrics.component.html
index f70ae935d..99b2165ad 100644
--- a/libs/components/molecules/src/lib/metrics/metrics.component.html
+++ b/libs/components/molecules/src/lib/metrics/metrics.component.html
@@ -1,4 +1,4 @@
-<img class="logo" [src]="baseHref + logo" alt="" />
+<img class="logo" [src]="logo" alt="" />
 <span class="header-title">{{ title }}</span>
 
 <div class="metrics">
diff --git a/libs/services/src/lib/ftu-data/ftu-data.impl.ts b/libs/services/src/lib/ftu-data/ftu-data.impl.ts
index 0ac5cae2b..8c139dfa4 100644
--- a/libs/services/src/lib/ftu-data/ftu-data.impl.ts
+++ b/libs/services/src/lib/ftu-data/ftu-data.impl.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { inject, Injectable, InjectionToken } from '@angular/core';
 import { createLinkId } from '@hra-ui/cdk/state';
-import { firstValueFrom, from, map, Observable } from 'rxjs';
+import { firstValueFrom, from, map, Observable, switchMap, take, withLatestFrom } from 'rxjs';
 import { z } from 'zod';
 
 import { IRI, Iri, Url } from '../shared/common.model';
@@ -26,7 +26,7 @@ export interface FtuDataImplEndpoints {
   baseHref: Url;
 }
 /** Constant  to read the endpoints */
-export const FTU_DATA_IMPL_ENDPOINTS = new InjectionToken<FtuDataImplEndpoints>('Endpoints');
+export const FTU_DATA_IMPL_ENDPOINTS = new InjectionToken<Observable<FtuDataImplEndpoints>>('Endpoints');
 
 /** Input to different file formats supported */
 export const FTU_DATA_IMPL_FILE_FORMAT_MAPPING = new InjectionToken<Record<string, string>>('Mapping of file formats', {
@@ -164,7 +164,7 @@ export class FtuDataImplService extends FtuDataService {
   @returns An Observable that emits the tissue Tree data.
   */
   override getTissueLibrary(): Observable<TissueLibrary> {
-    return this.fetchData(undefined, this.endpoints.illustrations, ILLUSTRATIONS).pipe(
+    return this.fetchData(undefined, 'illustrations', ILLUSTRATIONS).pipe(
       map((data) => this.constructTissueLibrary(data['@graph']))
     );
   }
@@ -175,7 +175,12 @@ export class FtuDataImplService extends FtuDataService {
   @returns An Observable that emits the mock URL.
   */
   override getIllustrationUrl(iri: Iri): Observable<Url | string> {
-    return this.getDataFileReferences(iri).pipe(map((data) => this.findIllustrationUrl(data)));
+    return this.getDataFileReferences(iri)
+      .pipe(map((data) => this.findIllustrationUrl(data)))
+      .pipe(
+        withLatestFrom(this.endpoints),
+        map(([url, { baseHref }]) => baseHref + url)
+      );
   }
 
   /**
@@ -184,7 +189,7 @@ export class FtuDataImplService extends FtuDataService {
   @returns An Observable that emits an IllustrationMappingItem array.
   */
   override getIllustrationMapping(iri: Iri): Observable<IllustrationMappingItem[]> {
-    return this.fetchData(iri, this.endpoints.illustrations, ILLUSTRATIONS).pipe(
+    return this.fetchData(iri, 'illustrations', ILLUSTRATIONS).pipe(
       map((data) => this.findGraphItem(data, iri).mapping),
       map((data) => (data ? this.toIllustrationMapping(data) : []))
     );
@@ -196,7 +201,7 @@ export class FtuDataImplService extends FtuDataService {
   @returns An Observable that emits an CellSummary array.
   */
   override getCellSummaries(iri: Iri): Observable<CellSummary[]> {
-    return this.fetchData(iri, this.endpoints.summaries, CELL_SUMMARIES).pipe(
+    return this.fetchData(iri, 'summaries', CELL_SUMMARIES).pipe(
       map((data) => this.findCellSummaries(data, iri)),
       map((data) => (data ? this.constructCellSummaries(data) : []))
     );
@@ -208,7 +213,7 @@ export class FtuDataImplService extends FtuDataService {
   @returns An Observable that emits an DataFileReference array.
   */
   override getDataFileReferences(iri: Iri): Observable<DataFileReference[]> {
-    return this.fetchData(iri, this.endpoints.illustrations, ILLUSTRATIONS).pipe(
+    return this.fetchData(iri, 'illustrations', ILLUSTRATIONS).pipe(
       map((data) => this.findGraphItem(data, iri).illustration_files),
       map((data) => (data ? this.toDataFileReferences(data) : []))
     );
@@ -220,7 +225,7 @@ export class FtuDataImplService extends FtuDataService {
   @returns An Observable that emits an empty array.
   */
   override getSourceReferences(iri: Iri): Observable<SourceReference[]> {
-    return this.fetchData(iri, this.endpoints.datasets, DATASETS).pipe(
+    return this.fetchData(iri, 'datasets', DATASETS).pipe(
       map((data) => this.findGraphItem(data, iri).data_sources),
       map((data) => (data ? this.toSourceReferences(data) : []))
     );
@@ -230,22 +235,34 @@ export class FtuDataImplService extends FtuDataService {
    * Fetchs data after reading the file and parses with the requested schema
    * @template T : Schema to be formated
    * @param iri : Tissue iri
-   * @param url : File Url
+   * @param endpoint : Endpoint name
    * @param schema :  Format needed to be extracted
    * @returns data
    */
-  private fetchData<T extends z.ZodTypeAny>(iri: Iri | undefined, url: Url, schema: T): Observable<z.infer<T>> {
-    const { http, cachedIri, cache } = this;
-    if (iri !== undefined && iri !== cachedIri) {
-      this.cachedIri = iri;
-      this.cache = new Map();
-    }
-    if (!cache.has(url)) {
-      const opts = { params: { id: iri ?? '' }, responseType: 'json' as const };
-      const resp = http.get(url, opts).pipe(map((data) => schema.parse(data)));
-      cache.set(url, firstValueFrom(resp));
-    }
-    return from(cache.get(url) as Promise<z.infer<T>>);
+  private fetchData<T extends z.ZodTypeAny>(
+    iri: Iri | undefined,
+    endpoint: keyof FtuDataImplEndpoints,
+    schema: T
+  ): Observable<z.infer<T>> {
+    return this.endpoints.pipe(
+      map((endpoints) => endpoints[endpoint]),
+      switchMap((url) => {
+        const { http, cachedIri, cache } = this;
+        if (iri !== undefined && iri !== cachedIri) {
+          this.cachedIri = iri;
+          this.cache = new Map();
+        }
+        if (!cache.has(url)) {
+          const opts = { params: { id: iri ?? '' }, responseType: 'json' as const };
+          const resp = http.get(url, opts).pipe(map((data) => schema.parse(data)));
+          console.log(url);
+          console.log(firstValueFrom(resp));
+          cache.set(url, firstValueFrom(resp));
+        }
+        return from(cache.get(url) as Promise<z.infer<T>>);
+      }),
+      take(1)
+    );
   }
 
   /**
@@ -261,7 +278,6 @@ export class FtuDataImplService extends FtuDataService {
       console.error(`Iri not found in data: ${iri}`);
       return {} as T;
     }
-
     return item;
   }
 
diff --git a/libs/services/src/lib/service.module.ts b/libs/services/src/lib/service.module.ts
index 7342b8c41..9d2543759 100644
--- a/libs/services/src/lib/service.module.ts
+++ b/libs/services/src/lib/service.module.ts
@@ -3,6 +3,7 @@ import { ContactImplService } from './contact/contact.impl';
 import { ContactService } from './contact/contact.service';
 import { FTU_DATA_IMPL_ENDPOINTS, FtuDataImplService } from './ftu-data/ftu-data.impl';
 import { FtuDataService } from './ftu-data/ftu-data.service';
+import { of } from 'rxjs';
 
 @NgModule({
   providers: [
@@ -16,12 +17,12 @@ import { FtuDataService } from './ftu-data/ftu-data.service';
     },
     {
       provide: FTU_DATA_IMPL_ENDPOINTS,
-      useValue: {
+      useValue: of({
         illustrations: 'assets/TEMP/2d-ftu-illustrations.jsonld',
         summaries: 'assets/TEMP/ftu-cell-summaries.jsonld',
         datasets: 'assets/TEMP/ftu-datasets.jsonld',
         baseHref: '',
-      },
+      }),
     },
   ],
 })
diff --git a/libs/state/src/lib/illustrator/illustrator.state.ts b/libs/state/src/lib/illustrator/illustrator.state.ts
index 746c976f8..33cfbf8de 100644
--- a/libs/state/src/lib/illustrator/illustrator.state.ts
+++ b/libs/state/src/lib/illustrator/illustrator.state.ts
@@ -1,5 +1,5 @@
 import { inject, Injectable } from '@angular/core';
-import { FTU_DATA_IMPL_ENDPOINTS, FtuDataService, IllustrationMappingItem, Url } from '@hra-ui/services';
+import { FtuDataService, IllustrationMappingItem, Url } from '@hra-ui/services';
 import { Action, State, StateContext } from '@ngxs/store';
 import { forkJoin, Observable, tap } from 'rxjs';
 
@@ -40,11 +40,6 @@ export class IllustratorState {
    */
   private readonly dataService = inject(FtuDataService);
 
-  /**
-   * Endpoints injector
-   */
-  readonly endpoints = inject(FTU_DATA_IMPL_ENDPOINTS);
-
   /**
    * Loads the current state with the url and mapping.
    * The url and mapping are forked together using forkJoin.
@@ -59,7 +54,6 @@ export class IllustratorState {
       tap((result) =>
         patchState({
           ...result,
-          url: this.endpoints.baseHref + result.url,
           selectedOnHover: undefined,
           selectedOnClick: undefined,
         })

From f830e46bfb70571283a8e8694a3d8ba87c41caf7 Mon Sep 17 00:00:00 2001
From: edlu77 <eddd.lu@gmail.com>
Date: Thu, 7 Dec 2023 19:53:44 -0500
Subject: [PATCH 2/6] Revert deleted baseHref

---
 .../src/resource-registry/resource-registry.selectors.ts      | 4 ++--
 libs/services/src/lib/ftu-data/ftu-data.impl.ts               | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts b/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts
index 5a069d75a..9509f5603 100644
--- a/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts
+++ b/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts
@@ -110,7 +110,7 @@ export class ResourceRegistrySelectors {
    * @returns Url query function
    */
   @Selector([ResourceRegistrySelectors.field, BaseHrefSelectors.baseHref])
-  static url(getField: FieldQuery): DataQuery<string> {
-    return (id) => getField(id, BuiltinResourceType.Url, 'url', '');
+  static url(getField: FieldQuery, baseHref: string): DataQuery<string> {
+    return (id) => baseHref + getField(id, BuiltinResourceType.Url, 'url', '');
   }
 }
diff --git a/libs/services/src/lib/ftu-data/ftu-data.impl.ts b/libs/services/src/lib/ftu-data/ftu-data.impl.ts
index 8c139dfa4..5d7a47c30 100644
--- a/libs/services/src/lib/ftu-data/ftu-data.impl.ts
+++ b/libs/services/src/lib/ftu-data/ftu-data.impl.ts
@@ -255,8 +255,6 @@ export class FtuDataImplService extends FtuDataService {
         if (!cache.has(url)) {
           const opts = { params: { id: iri ?? '' }, responseType: 'json' as const };
           const resp = http.get(url, opts).pipe(map((data) => schema.parse(data)));
-          console.log(url);
-          console.log(firstValueFrom(resp));
           cache.set(url, firstValueFrom(resp));
         }
         return from(cache.get(url) as Promise<z.infer<T>>);

From 4b0f2f69576b54bf4e8fe0a1c304ceba166e939a Mon Sep 17 00:00:00 2001
From: edlu77 <eddd.lu@gmail.com>
Date: Fri, 8 Dec 2023 14:19:09 -0500
Subject: [PATCH 3/6] Fix bug with illustrations

---
 apps/ftu-ui/src/app/app.component.ts          | 31 ++++++-------------
 apps/ftu-ui/src/app/app.module.ts             |  6 ++--
 libs/services/src/index.ts                    |  1 +
 .../src/lib/ftu-data/ftu-data.impl.ts         |  9 +++---
 libs/services/src/lib/shared/common.model.ts  | 10 ++++++
 5 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/apps/ftu-ui/src/app/app.component.ts b/apps/ftu-ui/src/app/app.component.ts
index 62d79c6d3..77df9d0b9 100644
--- a/apps/ftu-ui/src/app/app.component.ts
+++ b/apps/ftu-ui/src/app/app.component.ts
@@ -1,7 +1,6 @@
 import {
   AfterContentInit,
   Component,
-  EventEmitter,
   HostBinding,
   HostListener,
   inject,
@@ -23,7 +22,7 @@ import {
   StorageSelectors,
 } from '@hra-ui/cdk/state';
 import { ScreenNoticeBehaviorComponent } from '@hra-ui/components/behavioral';
-import { FTU_DATA_IMPL_ENDPOINTS, FtuDataImplEndpoints, Url } from '@hra-ui/services';
+import { FTU_DATA_IMPL_ENDPOINTS, FtuDataImplEndpoints, setUrl, Url } from '@hra-ui/services';
 import {
   ActiveFtuActions,
   ActiveFtuSelectors,
@@ -32,7 +31,7 @@ import {
   TissueLibraryActions,
   TissueLibrarySelectors,
 } from '@hra-ui/state';
-import { tap } from 'rxjs';
+import { ReplaySubject, tap } from 'rxjs';
 
 @Component({
   selector: 'ftu-ui-root',
@@ -87,7 +86,7 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
   private readonly dialog = inject(MatDialog);
 
   private ref = inject(MatDialogRef<ScreenNoticeBehaviorComponent>);
-  private readonly endpoints = inject(FTU_DATA_IMPL_ENDPOINTS) as EventEmitter<FtuDataImplEndpoints>;
+  private readonly endpoints = inject(FTU_DATA_IMPL_ENDPOINTS) as ReplaySubject<FtuDataImplEndpoints>;
 
   constructor() {
     inject(Router).initialNavigation();
@@ -127,13 +126,14 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
   }
 
   ngOnInit() {
+    const { baseHref } = this;
     this.setBaseHref(this.baseHref);
-    this.loadLinks(this.setUrl(this.linksYamlUrl));
-    this.loadResources(this.setUrl(this.resourcesYamlUrl));
-    this.endpoints.emit({
-      illustrations: this.setUrl(this.illustrationsUrl),
-      datasets: this.setUrl(this.datasetUrl),
-      summaries: this.setUrl(this.summariesUrl),
+    this.loadLinks(setUrl(this.linksYamlUrl, baseHref));
+    this.loadResources(setUrl(this.resourcesYamlUrl, baseHref));
+    this.endpoints.next({
+      illustrations: setUrl(this.illustrationsUrl, baseHref),
+      datasets: setUrl(this.datasetUrl, baseHref),
+      summaries: setUrl(this.summariesUrl, baseHref),
       baseHref: this.baseHref as Url,
     });
   }
@@ -149,17 +149,6 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
       .subscribe();
   }
 
-  private setUrl(url: string): Url {
-    const { baseHref } = this;
-    if (url.startsWith('http')) {
-      return url as Url;
-    } else if (baseHref !== '' && !baseHref.endsWith('/')) {
-      return `${baseHref}/${url}` as Url;
-    } else {
-      return `${baseHref}${url}` as Url;
-    }
-  }
-
   showDefaultIri() {
     this.tissues
       .pipe(
diff --git a/apps/ftu-ui/src/app/app.module.ts b/apps/ftu-ui/src/app/app.module.ts
index e4dce4421..c3b31ca4a 100644
--- a/apps/ftu-ui/src/app/app.module.ts
+++ b/apps/ftu-ui/src/app/app.module.ts
@@ -1,5 +1,5 @@
 import { HttpClient, HttpClientModule } from '@angular/common/http';
-import { APP_INITIALIZER, DoBootstrap, EventEmitter, Injector, NgModule } from '@angular/core';
+import { APP_INITIALIZER, DoBootstrap, Injector, NgModule } from '@angular/core';
 import { createCustomElement } from '@angular/elements';
 import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { BrowserModule } from '@angular/platform-browser';
@@ -12,6 +12,8 @@ import { ThemingModule } from '@hra-ui/theming';
 import { NgxsModule } from '@ngxs/store';
 import { InlineSVGModule } from 'ng-inline-svg-2';
 import { MarkdownModule } from 'ngx-markdown';
+import { ReplaySubject } from 'rxjs';
+
 import { environment } from '../environments/environment';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -55,7 +57,7 @@ import { initFactory } from './app.init';
     },
     {
       provide: FTU_DATA_IMPL_ENDPOINTS,
-      useValue: new EventEmitter(),
+      useValue: new ReplaySubject(1),
     },
   ],
 })
diff --git a/libs/services/src/index.ts b/libs/services/src/index.ts
index 7847f2953..56dac13fb 100644
--- a/libs/services/src/index.ts
+++ b/libs/services/src/index.ts
@@ -15,6 +15,7 @@ export * from './lib/contact/contact.mock';
 export * from './lib/ftu-data/ftu-data.service';
 export * from './lib/ftu-data/ftu-data.impl';
 export * from './lib/service.module';
+export * from './lib/shared/common.model';
 export * from './lib/tissue-library/tissue-library.service';
 export * from './lib/tissue-library/tissue-library.mock';
 export * from './lib/tissue-ftu/tissue-ftu.service';
diff --git a/libs/services/src/lib/ftu-data/ftu-data.impl.ts b/libs/services/src/lib/ftu-data/ftu-data.impl.ts
index 5d7a47c30..25e061e32 100644
--- a/libs/services/src/lib/ftu-data/ftu-data.impl.ts
+++ b/libs/services/src/lib/ftu-data/ftu-data.impl.ts
@@ -1,10 +1,10 @@
 import { HttpClient } from '@angular/common/http';
 import { inject, Injectable, InjectionToken } from '@angular/core';
 import { createLinkId } from '@hra-ui/cdk/state';
-import { firstValueFrom, from, map, Observable, switchMap, take, withLatestFrom } from 'rxjs';
+import { firstValueFrom, from, map, Observable, shareReplay, switchMap, take, withLatestFrom } from 'rxjs';
 import { z } from 'zod';
 
-import { IRI, Iri, Url } from '../shared/common.model';
+import { IRI, Iri, setUrl, Url } from '../shared/common.model';
 import {
   CellSummary,
   DataFileReference,
@@ -179,7 +179,7 @@ export class FtuDataImplService extends FtuDataService {
       .pipe(map((data) => this.findIllustrationUrl(data)))
       .pipe(
         withLatestFrom(this.endpoints),
-        map(([url, { baseHref }]) => baseHref + url)
+        map(([url, { baseHref }]) => setUrl(url, baseHref))
       );
   }
 
@@ -259,7 +259,8 @@ export class FtuDataImplService extends FtuDataService {
         }
         return from(cache.get(url) as Promise<z.infer<T>>);
       }),
-      take(1)
+      take(1),
+      shareReplay(1)
     );
   }
 
diff --git a/libs/services/src/lib/shared/common.model.ts b/libs/services/src/lib/shared/common.model.ts
index f9638632b..a9f456d93 100644
--- a/libs/services/src/lib/shared/common.model.ts
+++ b/libs/services/src/lib/shared/common.model.ts
@@ -11,3 +11,13 @@ export type Url = z.infer<typeof URL>;
 
 /** Same as an Url */
 export type Iri = z.infer<typeof IRI>;
+
+export function setUrl(url: string, baseHref: string): Url {
+  if (url.startsWith('http')) {
+    return url as Url;
+  } else if (baseHref !== '' && !baseHref.endsWith('/')) {
+    return `${baseHref}/${url}` as Url;
+  } else {
+    return `${baseHref}${url}` as Url;
+  }
+}

From 8d002db422aec110af19521317bf1718d5d941a0 Mon Sep 17 00:00:00 2001
From: edlu77 <eddd.lu@gmail.com>
Date: Fri, 8 Dec 2023 19:38:35 -0500
Subject: [PATCH 4/6] Various fixes

---
 apps/ftu-ui-small-wc/src/app/app.component.ts |   59 +-
 apps/ftu-ui-small-wc/src/app/app.init.ts      |   12 +-
 .../assets/TEMP/2d-ftu-illustrations.jsonld   | 1966 ++++++++++-------
 .../src/assets/TEMP/ftu-cell-summaries.jsonld |   46 +-
 .../src/assets/TEMP/ftu-datasets.jsonld       |   60 +-
 apps/ftu-ui-small-wc/src/main.ts              |    7 +-
 apps/ftu-ui/src/app/app.component.ts          |   45 +-
 apps/ftu-ui/src/app/app.init.ts               |    4 +-
 .../src/assets/TEMP/ftu-datasets.jsonld       |   42 +-
 apps/ftu-ui/src/index.html                    |    5 +-
 .../src/app/app-web-component.ts              |    8 +-
 .../assets/TEMP/2d-ftu-illustrations.jsonld   | 1966 ++++++++++-------
 .../resource-registry.selectors.ts            |    5 +-
 .../src/lib/header/header.component.html      |    2 +-
 14 files changed, 2382 insertions(+), 1845 deletions(-)

diff --git a/apps/ftu-ui-small-wc/src/app/app.component.ts b/apps/ftu-ui-small-wc/src/app/app.component.ts
index 139314bf5..faf700134 100644
--- a/apps/ftu-ui-small-wc/src/app/app.component.ts
+++ b/apps/ftu-ui-small-wc/src/app/app.component.ts
@@ -1,9 +1,7 @@
 import {
   ChangeDetectionStrategy,
   Component,
-  EventEmitter,
   inject,
-  Injector,
   Input,
   OnChanges,
   OnInit,
@@ -12,7 +10,13 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import { dispatch, dispatch$, select$, selectSnapshot } from '@hra-ui/cdk/injectors';
-import { BaseHrefActions, createLinkId, LinkRegistryActions, ResourceRegistryActions } from '@hra-ui/cdk/state';
+import {
+  BaseHrefActions,
+  createLinkId,
+  LinkRegistryActions,
+  LinkType,
+  ResourceRegistryActions,
+} from '@hra-ui/cdk/state';
 import {
   BiomarkerDetailsWcComponent,
   FooterBehaviorComponent,
@@ -21,17 +25,18 @@ import {
   TissueLibraryBehaviorComponent,
 } from '@hra-ui/components/behavioral';
 import { FullscreenContainerComponent, FullscreenContentComponent } from '@hra-ui/components/molecules';
-import { FTU_DATA_IMPL_ENDPOINTS, FtuDataImplEndpoints, Iri } from '@hra-ui/services';
+import { FTU_DATA_IMPL_ENDPOINTS, FtuDataImplEndpoints, setUrl, Url } from '@hra-ui/services';
 import {
   ActiveFtuActions,
   ActiveFtuSelectors,
   IllustratorSelectors,
+  LinkIds,
   ScreenModeAction,
   ScreenModeSelectors,
   TissueLibraryActions,
   TissueLibrarySelectors,
 } from '@hra-ui/state';
-import { tap } from 'rxjs';
+import { ReplaySubject, tap } from 'rxjs';
 
 @Component({
   selector: 'hra-root',
@@ -80,6 +85,7 @@ export class AppComponent implements OnInit, OnChanges {
 
   private readonly setBaseHref = dispatch(BaseHrefActions.Set);
   private readonly loadLinks = dispatch(LinkRegistryActions.LoadFromYaml);
+  private readonly addMany = dispatch(LinkRegistryActions.AddMany);
   private readonly loadResources = dispatch(ResourceRegistryActions.LoadFromYaml);
   private readonly navigateToOrgan = dispatch(LinkRegistryActions.Navigate);
   private readonly setScreenSmall = dispatch(ScreenModeAction.SetSize);
@@ -88,17 +94,36 @@ export class AppComponent implements OnInit, OnChanges {
 
   private readonly reset = dispatch$(ActiveFtuActions.Reset);
 
-  private readonly injector = inject(Injector);
-  private readonly endpoints = inject(FTU_DATA_IMPL_ENDPOINTS) as EventEmitter<FtuDataImplEndpoints>;
+  private readonly endpoints = inject(FTU_DATA_IMPL_ENDPOINTS) as ReplaySubject<FtuDataImplEndpoints>;
 
   ngOnInit() {
+    const { baseHref } = this;
     this.setBaseHref(this.baseHref);
-    this.loadLinks(this.setUrl(this.linksYamlUrl));
-    this.loadResources(this.setUrl(this.resourcesYamlUrl));
-    this.endpoints.emit({
-      illustrations: this.setUrl(this.illustrationsUrl),
-      datasets: this.setUrl(this.datasetUrl),
-      summaries: this.setUrl(this.summariesUrl),
+    // this.loadLinks(setUrl(this.linksYamlUrl, baseHref)); //TODO: Fix this
+    this.addMany({
+      [LinkIds.LandingPage]: {
+        type: LinkType.Internal,
+        commands: ['/'],
+      },
+      [createLinkId('FTU')]: {
+        type: LinkType.Internal,
+        commands: ['ftu/'],
+      },
+      [LinkIds.Portal]: {
+        type: LinkType.External,
+        url: 'https://humanatlas.io/',
+      },
+      [LinkIds.Embed]: {
+        type: LinkType.External,
+        url: 'https://github.com/hubmapconsortium/hra-ui#readme',
+      },
+    });
+    this.loadResources(setUrl(this.resourcesYamlUrl, baseHref));
+    this.endpoints.next({
+      illustrations: setUrl(this.illustrationsUrl, baseHref),
+      datasets: setUrl(this.datasetUrl, baseHref),
+      summaries: setUrl(this.summariesUrl, baseHref),
+      baseHref: this.baseHref as Url,
     });
   }
 
@@ -113,14 +138,6 @@ export class AppComponent implements OnInit, OnChanges {
       .subscribe();
   }
 
-  private setUrl(url: string): Iri {
-    if (url.slice(0, 4) === 'http') {
-      return url as Iri;
-    } else {
-      return (this.baseHref + url) as Iri;
-    }
-  }
-
   showDefaultIri() {
     this.tissues
       .pipe(
diff --git a/apps/ftu-ui-small-wc/src/app/app.init.ts b/apps/ftu-ui-small-wc/src/app/app.init.ts
index 33fbd261d..0be4c315c 100644
--- a/apps/ftu-ui-small-wc/src/app/app.init.ts
+++ b/apps/ftu-ui-small-wc/src/app/app.init.ts
@@ -1,6 +1,6 @@
 import { dispatchAction$ } from '@hra-ui/cdk/injectors';
-import { LinkRegistryActions, LinkType, ResourceRegistryActions } from '@hra-ui/cdk/state';
-import { LinkIds, TissueLibraryActions } from '@hra-ui/state';
+import { LinkRegistryActions, LinkType, createLinkId } from '@hra-ui/cdk/state';
+import { LinkIds } from '@hra-ui/state';
 import { Observable } from 'rxjs';
 
 /**
@@ -16,10 +16,10 @@ export function initFactory(): () => Observable<unknown> {
           type: LinkType.Internal,
           commands: ['/'],
         },
+        [createLinkId('FTU')]: {
+          type: LinkType.Internal,
+          commands: ['ftu/'],
+        },
       }),
-
-      new LinkRegistryActions.LoadFromYaml('assets/links.yml'),
-      new ResourceRegistryActions.LoadFromYaml('assets/resources.yml'),
-      new TissueLibraryActions.Load(),
     ]);
 }
diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/2d-ftu-illustrations.jsonld b/apps/ftu-ui-small-wc/src/assets/TEMP/2d-ftu-illustrations.jsonld
index 92a327f0e..1bcae89e5 100644
--- a/apps/ftu-ui-small-wc/src/assets/TEMP/2d-ftu-illustrations.jsonld
+++ b/apps/ftu-ui-small-wc/src/assets/TEMP/2d-ftu-illustrations.jsonld
@@ -32,19 +32,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-ascending-thin-loop-of-henle#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-ascending-thin-loop-of-henle.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-ascending-thin-loop-of-henle.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-ascending-thin-loop-of-henle#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-ascending-thin-loop-of-henle.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-ascending-thin-loop-of-henle.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-ascending-thin-loop-of-henle#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-ascending-thin-loop-of-henle.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-ascending-thin-loop-of-henle.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -119,26 +119,26 @@
       "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct",
       "@type": "FtuIllustration",
       "representation_of": "UBERON:0004203",
-      "label": "cortical collecting duct",
+      "label": "Cortical Collecting Duct",
       "organ_id": "UBERON:0002113",
       "organ_label": "Kidney",
       "illustration_files": [
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-cortical-collecting-duct.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-cortical-collecting-duct.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-cortical-collecting-duct.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-cortical-collecting-duct.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-cortical-collecting-duct.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-cortical-collecting-duct.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -220,48 +220,48 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_B_1",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_B",
-          "label": "connecting tubule intercalated cell type B",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030021"
+          "label": "kidney collecting duct beta-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030005"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Cortical_Collecting_Duct_Intercalated_Cell_Type_B_2",
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_B_2",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_B",
-          "label": "connecting tubule intercalated cell type B",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030021"
+          "label": "kidney collecting duct beta-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030005"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Cortical_Collecting_Duct_Intercalated_Cell_Type_A_1",
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A_1",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A",
-          "label": "connecting tubule intercalated cell type A",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030020"
+          "label": "kidney collecting duct alpha-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030015"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Cortical_Collecting_Duct_Intercalated_Cell_Type_A_2",
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A_2",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A",
-          "label": "connecting tubule intercalated cell type A",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030020"
+          "label": "kidney collecting duct alpha-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030015"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Cortical_Collecting_Duct_Intercalated_Cell_Type_A_3",
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A_3",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A",
-          "label": "connecting tubule intercalated cell type A",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030020"
+          "label": "kidney collecting duct alpha-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030015"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Cortical_Collecting_Duct_Intercalated_Cell_Type_A_4",
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A_4",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A",
-          "label": "connecting tubule intercalated cell type A",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030020"
+          "label": "kidney collecting duct alpha-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030015"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Endothelium_Peritubular_Capillary_1",
@@ -316,19 +316,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-descending-thin-loop-of-henle#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-descending-thin-loop-of-henle.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-descending-thin-loop-of-henle#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-descending-thin-loop-of-henle.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-descending-thin-loop-of-henle#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-descending-thin-loop-of-henle.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -394,19 +394,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-inner-medullary-collecting-duct#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-inner-medullary-collecting-duct.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-inner-medullary-collecting-duct.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-inner-medullary-collecting-duct#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-inner-medullary-collecting-duct.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-inner-medullary-collecting-duct.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-inner-medullary-collecting-duct#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-inner-medullary-collecting-duct.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-inner-medullary-collecting-duct.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -416,7 +416,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_1",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -424,7 +424,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_2",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -432,7 +432,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_3",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -440,7 +440,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_4",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -448,7 +448,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_5",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -456,7 +456,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_6",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -464,7 +464,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_7",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -472,7 +472,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_8",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -480,7 +480,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_9",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -488,7 +488,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_10",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -496,7 +496,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_11",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -504,7 +504,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_12",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -512,7 +512,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_13",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -520,7 +520,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_14",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -594,203 +594,427 @@
       ],
       "mapping": [
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thin_limb_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_collecting_duct_AS",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thin_limb_1",
-          "svg_group_id": "Thin_limb",
-          "label": "thin limb of loop of Henle",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004193"
+          "svg_id": "Cortical_collecting_duct_AS",
+          "svg_group_id": "Collecting_Duct",
+          "label": "cortical collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004203"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thin_limb_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thin_limb_2",
-          "svg_group_id": "Thin_limb",
-          "label": "thin limb of loop of Henle",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001289"
+          "svg_id": "Cortical_Collecting_Duct_Cell_1",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thin_Limb_Cell_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thin_Limb_Cell_1",
-          "svg_group_id": "Thin_limb",
-          "label": "kidney loop of Henle thin limb epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1001107"
+          "svg_id": "Cortical_Collecting_Duct_Cell_2",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thin_Limb_Cell_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_3",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thin_Limb_Cell_2",
-          "svg_group_id": "Thin_limb",
-          "label": "kidney loop of Henle thin limb epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1001111"
+          "svg_id": "Cortical_Collecting_Duct_Cell_3",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Collecting_Duct",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_4",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Collecting_Duct",
+          "svg_id": "Cortical_Collecting_Duct_Cell_4",
           "svg_group_id": "Collecting_Duct",
-          "label": "collecting duct",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004203"
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_5",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_1",
-          "svg_group_id": "Distal_Convoluted_Tubule",
-          "label": "distal convoluted tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001292"
+          "svg_id": "Cortical_Collecting_Duct_Cell_5",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_6",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_6",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_7",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_7",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_8",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_8",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_9",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_9",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_10",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_10",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_11",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_11",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_12",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_12",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_13",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_13",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_14",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_14",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_15",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_15",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S3",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_2",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Proximal_Tubule_S3",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "proximal straight tubule",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001290"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S2",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S2",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "proximal convoluted tubule segment 2",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004197"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "proximal convoluted tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004196"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_1",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_1",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_2",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_2",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_3",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_3",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_4",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_4",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_5",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_5",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_6",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_6",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_7",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_7",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_8",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_8",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_9",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_9",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_10",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_10",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_11",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_11",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_12",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_12",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_13",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_13",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_14",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_14",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_15",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_15",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_16",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_16",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_AS",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Distal_Convulated_Tubule_AS",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "distal convoluted tubule",
           "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001292"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_1",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_1",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_2",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_2",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_3",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_3",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_3",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_3",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_4",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_4",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_4",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_4",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_5",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_5",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_5",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_5",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_6",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_6",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_6",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_6",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_7",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_7",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_7",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_7",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_8",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_8",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_8",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_8",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_9",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_9",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_9",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_9",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_10",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_10",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_10",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_10",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_11",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_11",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_11",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_11",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_12",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_12",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_12",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_12",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_13",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_13",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_13",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_13",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_14",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_14",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_14",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_14",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Glomerulus_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_15",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Glomerulus_1",
-          "svg_group_id": "Glomerulus",
-          "label": "renal corpuscle",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001229"
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Glomerulus_2",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Glomerulus_2",
-          "svg_group_id": "Glomerulus",
-          "label": "renal corpuscle",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001229"
+          "svg_id": "Distal_Convulated_Tubule_Cell_15",
+          "svg_group_id": "Distal_Convulated_Tubule",
+          "label": "kidney distal convoluted tubule epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Connecting_Tubule_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Connecting_Tubule_AS_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Connecting_Tubule_1",
+          "svg_id": "Connecting_Tubule_AS_1",
           "svg_group_id": "Connecting_Tubule",
-          "label": "connecting tubule",
+          "label": "renal connecting tubule",
           "representation_of": "http://purl.obolibrary.org/obo/UBERON_0005097"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Connecting_Tubule_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Connecting_Tubule_AS_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Connecting_Tubule_2",
+          "svg_id": "Connecting_Tubule_AS_2",
           "svg_group_id": "Connecting_Tubule",
-          "label": "connecting tubule",
+          "label": "renal connecting tubule",
           "representation_of": "http://purl.obolibrary.org/obo/UBERON_0005097"
         },
         {
@@ -922,324 +1146,492 @@
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000768"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_limb_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_1",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_1",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_limb_1",
-          "svg_group_id": "Thick_Ascending_limb",
+          "svg_id": "Macula_Densa_Cell_2",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_3",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_3",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_4",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_4",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_5",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_5",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_6",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_6",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_7",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_7",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_8",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_8",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_9",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_9",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_AS_1",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_AS_1",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "thick ascending limb of loop of Henle",
           "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001291"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_limb_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_AS_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_limb_2",
-          "svg_group_id": "Thick_Ascending_limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_AS_2",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "thick ascending limb of loop of Henle",
           "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001291"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_1",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_1",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_2",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_2",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_3",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_3",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_3",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_3",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_4",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_4",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_4",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_4",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_5",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_5",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_5",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_5",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_6",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_6",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_6",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_6",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_7",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_7",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_7",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_7",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_8",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_8",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_8",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_8",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_9",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_9",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_9",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_9",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_10",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_10",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_10",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_10",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_11",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_11",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_11",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_11",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Ascending_Thin_Limb_Of_Loop_Of_Henle_AS_1",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle_AS_1",
+          "svg_group_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "loop of Henle ascending limb thin segment",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004193"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Ascending_Thin_Limb_Of_Loop_Of_Henle_AS_2",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle_AS_2",
+          "svg_group_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "loop of Henle ascending limb thin segment",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004193"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Ascending_Thin_Limb_Of_Loop_Of_Henle_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_1",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle_Cell_1",
+          "svg_group_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "kidney loop of Henle thin ascending limb epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1001107"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Ascending_Thin_Limb_Of_Loop_Of_Henle_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_2",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle_Cell_2",
+          "svg_group_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "kidney loop of Henle thin ascending limb epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1001107"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_3",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Descending_Thin_Limb_Of_Loop_Of_Henle_AS_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_3",
-          "svg_group_id": "Proximal_Tubule_S2",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Descending_Thin_Limb_Of_Loop_Of_Henle_AS_1",
+          "svg_group_id": "Descending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "descending thin limb",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0005096"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_4",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Descending_Thin_Limb_Of_Loop_Of_Henle_AS_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_4",
-          "svg_group_id": "Proximal_Tubule_S2",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Descending_Thin_Limb_Of_Loop_Of_Henle_AS_2",
+          "svg_group_id": "Descending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "descending thin limb",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0005096"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_5",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Descending_Thin_Limb_Of_Loop_Of_Henle_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_5",
-          "svg_group_id": "Proximal_Tubule_S3",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Descending_Thin_Limb_Of_Loop_Of_Henle_Cell_1",
+          "svg_group_id": "Descending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "kidney loop of Henle thin descending limb epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1001111"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_6",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Descending_Thin_Limb_Of_Loop_Of_Henle_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_6",
-          "svg_group_id": "Proximal_Tubule_S3",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Descending_Thin_Limb_Of_Loop_Of_Henle_Cell_2",
+          "svg_group_id": "Descending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "kidney loop of Henle thin descending limb epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1001111"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_1",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_1",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_2",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_2",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_3",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_3",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_4",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_4",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_5",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_5",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_6",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_6",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_7",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_7",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_8",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_8",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_9",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_9",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_10",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_10",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_11",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_11",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_12",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_2",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_12",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_3",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_13",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_3",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_13",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_4",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_14",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_4",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_14",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_5",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_15",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_5",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_15",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_6",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_6",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_1",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_7",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_7",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_2",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_8",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_3",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_8",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_3",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_9",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_4",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_9",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_4",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_10",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_5",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_10",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_5",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_11",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_6",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_11",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_6",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_12",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_7",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_12",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_7",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_13",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_8",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_13",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_8",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_14",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_9",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_14",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_9",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_10",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_1",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_10",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_11",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_2",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_11",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_3",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_12",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_3",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_12",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_4",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_13",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_4",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_13",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_5",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_14",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_5",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_14",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_6",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Renal_Corpuscle_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_6",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Renal_Corpuscle_1",
+          "svg_group_id": "Renal_Corpuscle",
+          "label": "Renal Corpuscle",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001229"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_7",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Renal_Corpuscle_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_7",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Renal_Corpuscle_2",
+          "svg_group_id": "Renal_Corpuscle",
+          "label": "Renal Corpuscle",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001229"
         }
       ]
     },
@@ -1254,19 +1646,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-outer-medullary-collecting-duct#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-outer-medullary-collecting-duct.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-outer-medullary-collecting-duct.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-outer-medullary-collecting-duct#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-outer-medullary-collecting-duct.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-outer-medullary-collecting-duct.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-outer-medullary-collecting-duct#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-outer-medullary-collecting-duct.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-outer-medullary-collecting-duct.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -1444,19 +1836,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-renal-corpuscle#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-renal-corpuscle.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-renal-corpuscle#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-renal-corpuscle.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-renal-corpuscle#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-renal-corpuscle.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -2490,19 +2882,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-thick-ascending-loop-of-henle#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-thick-ascending-loop-of-henle.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-thick-ascending-loop-of-henle.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-thick-ascending-loop-of-henle#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-thick-ascending-loop-of-henle.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-thick-ascending-loop-of-henle.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-thick-ascending-loop-of-henle#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-thick-ascending-loop-of-henle.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-thick-ascending-loop-of-henle.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -2600,19 +2992,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/large-intestine-crypt-lieberkuhn#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-large-intestine-crypt-lieberkuhn.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-large-intestine-crypt-lieberkuhn.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/large-intestine-crypt-lieberkuhn#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-large-intestine-crypt-lieberkuhn.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-large-intestine-crypt-lieberkuhn.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/large-intestine-crypt-lieberkuhn#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-large-intestine-crypt-lieberkuhn.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-large-intestine-crypt-lieberkuhn.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -4262,19 +4654,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-liver-liver-lobule.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-liver-liver-lobule.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-liver-liver-lobule.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -4644,288 +5036,144 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_1",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_2",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_2",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_3",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_3",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_4",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_4",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_5",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_5",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_6",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_6",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_7",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_7",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_8",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_8",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_9",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_9",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_10",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_10",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_11",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_11",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_12",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_12",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_13",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_13",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_14",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_14",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_15",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_15",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_16",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_16",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_17",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_17",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_18",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_18",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_1",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_1",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_2",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_2",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_3",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_3",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_4",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_4",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_5",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_5",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_6",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_6",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_7",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_7",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_8",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_8",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_9",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_9",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_10",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_10",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_11",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_11",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_12",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_12",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_13",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_13",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_14",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_14",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_15",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_15",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_16",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_16",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_17",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_17",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_18",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_18",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Endothelial_Cell_Of_Hepatic_Sinusoid_1",
@@ -5652,19 +5900,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-bronchial-submucosal-gland.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-bronchial-submucosal-gland.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-bronchial-submucosal-gland.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -5674,135 +5922,135 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_1",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_2",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_2",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_3",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_3",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_4",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_4",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_5",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_5",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_6",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_6",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_7",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_7",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_8",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_8",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_9",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_9",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_10",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_10",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_11",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_11",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_12",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_12",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_13",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_13",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_14",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_14",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_15",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_15",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_16",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_16",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Basal_Cell_Of_Submucosal_Gland_1",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_1",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5810,7 +6058,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_2",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5818,7 +6066,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_3",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5826,7 +6074,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_4",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5834,7 +6082,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_5",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5842,7 +6090,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_6",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5850,7 +6098,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_7",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5858,7 +6106,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_8",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5866,7 +6114,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_9",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5874,7 +6122,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_10",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5882,7 +6130,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_11",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5890,7 +6138,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_12",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5898,7 +6146,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_1",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5906,7 +6154,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_2",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5914,7 +6162,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_3",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5922,7 +6170,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_4",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5930,7 +6178,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_5",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5938,7 +6186,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_6",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5946,7 +6194,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_7",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5954,7 +6202,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_8",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5962,7 +6210,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_9",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5970,7 +6218,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_10",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5978,7 +6226,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_11",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5986,7 +6234,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_12",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5994,7 +6242,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_13",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6002,7 +6250,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_14",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6010,7 +6258,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_15",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6018,7 +6266,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_16",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6026,7 +6274,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_17",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6034,7 +6282,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_18",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6042,7 +6290,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_19",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6050,7 +6298,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_20",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6058,7 +6306,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_21",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6066,7 +6314,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_22",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6074,7 +6322,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_23",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6082,7 +6330,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_24",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6090,7 +6338,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_25",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6098,7 +6346,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_26",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6106,7 +6354,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_27",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6114,7 +6362,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_28",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6122,7 +6370,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_29",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6130,7 +6378,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_30",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6138,7 +6386,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_31",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6146,7 +6394,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_32",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6154,7 +6402,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_33",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6162,7 +6410,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_34",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6170,7 +6418,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_35",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6178,7 +6426,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_36",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6186,7 +6434,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_37",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6194,7 +6442,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_38",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6202,7 +6450,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_39",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6210,7 +6458,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_40",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6218,7 +6466,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_41",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6226,7 +6474,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_42",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6234,7 +6482,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_43",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6242,7 +6490,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_44",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6250,7 +6498,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_45",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6258,7 +6506,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_46",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6266,7 +6514,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_47",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6274,7 +6522,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_48",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6282,7 +6530,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_49",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6290,7 +6538,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_50",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6298,7 +6546,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_51",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6306,7 +6554,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_52",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6330,7 +6578,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_1",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6338,7 +6586,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_2",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6346,7 +6594,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_3",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6354,7 +6602,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_4",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6362,7 +6610,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_5",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6370,7 +6618,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_6",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6378,7 +6626,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_7",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6386,7 +6634,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_8",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6394,7 +6642,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_9",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6402,7 +6650,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_10",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6410,7 +6658,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_11",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6418,7 +6666,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_12",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6426,7 +6674,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_13",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6434,7 +6682,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_14",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6442,7 +6690,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_15",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6450,7 +6698,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_16",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6458,7 +6706,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_17",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6466,7 +6714,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_18",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6474,7 +6722,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_19",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6482,7 +6730,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_20",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6490,7 +6738,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_21",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6498,7 +6746,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_22",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6506,7 +6754,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_23",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6514,7 +6762,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_24",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6522,7 +6770,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_25",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6530,7 +6778,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_26",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6538,7 +6786,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_27",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6546,7 +6794,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_28",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6554,7 +6802,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_29",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6562,7 +6810,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_30",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6570,7 +6818,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_31",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6578,7 +6826,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_32",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6586,7 +6834,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_33",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6594,7 +6842,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_34",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6602,7 +6850,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_35",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6610,7 +6858,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_36",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6618,7 +6866,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_37",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6626,7 +6874,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_38",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6634,7 +6882,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_39",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6642,7 +6890,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_40",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6650,7 +6898,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_41",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6658,7 +6906,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_42",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6666,7 +6914,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_43",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6674,7 +6922,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_44",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6682,7 +6930,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_45",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6690,7 +6938,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_46",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6698,7 +6946,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_47",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6706,7 +6954,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_48",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6714,7 +6962,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_49",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6722,7 +6970,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_50",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6730,7 +6978,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_51",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6738,7 +6986,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_52",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6746,7 +6994,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_53",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6754,7 +7002,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_54",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6762,7 +7010,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_55",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6938,19 +7186,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-pulmonary-alveolus#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-pulmonary-alveolus.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-pulmonary-alveolus.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-pulmonary-alveolus#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-pulmonary-alveolus.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-pulmonary-alveolus.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-pulmonary-alveolus#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-pulmonary-alveolus.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-pulmonary-alveolus.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -7136,7 +7384,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_1",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7144,7 +7392,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_2",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7152,7 +7400,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_3",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7160,7 +7408,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_4",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7168,7 +7416,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_5",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7176,7 +7424,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_6",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7184,7 +7432,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_7",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7192,7 +7440,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_1",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7200,7 +7448,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_2",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7208,7 +7456,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_3",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7216,7 +7464,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_4",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7224,7 +7472,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_5",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7232,7 +7480,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_6",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7240,7 +7488,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_7",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7248,7 +7496,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_8",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7256,7 +7504,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_9",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7488,19 +7736,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-intercalated-duct#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-intercalated-duct.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-intercalated-duct.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-intercalated-duct#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-intercalated-duct.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-intercalated-duct.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-intercalated-duct#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-intercalated-duct.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-intercalated-duct.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -7750,19 +7998,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-islets-langerhans#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-islets-langerhans.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-islets-langerhans#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-islets-langerhans.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-islets-langerhans#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-islets-langerhans.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -9540,19 +9788,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-pancreatic-acinus#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-pancreatic-acinus.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-pancreatic-acinus#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-pancreatic-acinus.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-pancreatic-acinus#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-pancreatic-acinus.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -9794,19 +10042,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/prostate-prostate-glandular-acinus#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-prostate-prostate-glandular-acinus.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/prostate-prostate-glandular-acinus#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-prostate-prostate-glandular-acinus.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/prostate-prostate-glandular-acinus#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-prostate-prostate-glandular-acinus.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -13832,19 +14080,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-dermal-papilla.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-dermal-papilla.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-dermal-papilla.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-dermal-papilla.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-dermal-papilla.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-dermal-papilla.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -14167,7 +14415,7 @@
           "svg_id": "Blood_Vessel_1",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_2",
@@ -14175,7 +14423,7 @@
           "svg_id": "Blood_Vessel_2",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_3",
@@ -14183,7 +14431,7 @@
           "svg_id": "Blood_Vessel_3",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_4",
@@ -14191,7 +14439,7 @@
           "svg_id": "Blood_Vessel_4",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_5",
@@ -14199,7 +14447,7 @@
           "svg_id": "Blood_Vessel_5",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_6",
@@ -14207,7 +14455,7 @@
           "svg_id": "Blood_Vessel_6",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_7",
@@ -14215,7 +14463,7 @@
           "svg_id": "Blood_Vessel_7",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         }
       ]
     },
@@ -14230,19 +14478,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-epidermal-ridge.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-epidermal-ridge.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-epidermal-ridge.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -15108,280 +15356,280 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_1",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_2",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_2",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_3",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_3",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_4",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_4",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_5",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_5",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_6",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_6",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_7",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_7",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_8",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_8",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_9",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_9",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_10",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_10",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_11",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_11",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_12",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_12",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_13",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_13",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_14",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_14",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_15",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_15",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_16",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_16",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_17",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_17",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_18",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_18",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_19",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_19",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_20",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_20",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_21",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_21",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_22",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_22",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_23",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_23",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_24",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_24",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_25",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_25",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_26",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_26",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_27",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_27",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_28",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_28",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_29",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_29",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_30",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_30",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_31",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_31",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_32",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_32",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_33",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_33",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_34",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_34",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_35",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_35",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Merkel_Cell_1",
@@ -15444,8 +15692,20 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/small-intestine-villus#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-small-intestine-villus.svg",
           "file_format": "image/svg+xml"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/small-intestine-villus#png_file",
+          "@type": "FtuIllustrationFile",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-small-intestine-villus.png",
+          "file_format": "image/png"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/small-intestine-villus#ai_file",
+          "@type": "FtuIllustrationFile",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-small-intestine-villus.ai",
+          "file_format": "application/pdf"
         }
       ],
       "mapping": [
@@ -20766,19 +21026,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-red-pulp#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-red-pulp.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-red-pulp.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-red-pulp#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-red-pulp.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-red-pulp.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-red-pulp#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-red-pulp.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-red-pulp.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -21500,19 +21760,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-white-pulp#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-white-pulp.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-white-pulp.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-white-pulp#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-white-pulp.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-white-pulp.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-white-pulp#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-white-pulp.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-white-pulp.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -25994,19 +26254,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-thymus-thymus-lobule.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-thymus-thymus-lobule.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-thymus-thymus-lobule.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-thymus-thymus-lobule.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-thymus-thymus-lobule.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-thymus-thymus-lobule.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -28273,7 +28533,7 @@
           "svg_id": "T_Cell_1",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_2",
@@ -28281,7 +28541,7 @@
           "svg_id": "T_Cell_2",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_3",
@@ -28289,7 +28549,7 @@
           "svg_id": "T_Cell_3",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_4",
@@ -28297,7 +28557,7 @@
           "svg_id": "T_Cell_4",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_5",
@@ -28305,7 +28565,7 @@
           "svg_id": "T_Cell_5",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_6",
@@ -28313,7 +28573,7 @@
           "svg_id": "T_Cell_6",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_7",
@@ -28321,7 +28581,7 @@
           "svg_id": "T_Cell_7",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_8",
@@ -28329,7 +28589,7 @@
           "svg_id": "T_Cell_8",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_9",
@@ -28337,7 +28597,7 @@
           "svg_id": "T_Cell_9",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_10",
@@ -28345,7 +28605,7 @@
           "svg_id": "T_Cell_10",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_11",
@@ -28353,7 +28613,7 @@
           "svg_id": "T_Cell_11",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_12",
@@ -28361,7 +28621,7 @@
           "svg_id": "T_Cell_12",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_13",
@@ -28369,7 +28629,7 @@
           "svg_id": "T_Cell_13",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_14",
@@ -28377,7 +28637,7 @@
           "svg_id": "T_Cell_14",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_15",
@@ -28385,7 +28645,7 @@
           "svg_id": "T_Cell_15",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_16",
@@ -28393,7 +28653,7 @@
           "svg_id": "T_Cell_16",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_17",
@@ -28401,7 +28661,7 @@
           "svg_id": "T_Cell_17",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_18",
@@ -28409,7 +28669,7 @@
           "svg_id": "T_Cell_18",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_19",
@@ -28417,7 +28677,7 @@
           "svg_id": "T_Cell_19",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_20",
@@ -28425,7 +28685,7 @@
           "svg_id": "T_Cell_20",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_21",
@@ -28433,7 +28693,7 @@
           "svg_id": "T_Cell_21",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_22",
@@ -28441,7 +28701,7 @@
           "svg_id": "T_Cell_22",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_23",
@@ -28449,7 +28709,7 @@
           "svg_id": "T_Cell_23",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_24",
@@ -28457,7 +28717,7 @@
           "svg_id": "T_Cell_24",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_25",
@@ -28465,7 +28725,7 @@
           "svg_id": "T_Cell_25",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_26",
@@ -28473,7 +28733,7 @@
           "svg_id": "T_Cell_26",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_27",
@@ -28481,7 +28741,7 @@
           "svg_id": "T_Cell_27",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_28",
@@ -28489,7 +28749,7 @@
           "svg_id": "T_Cell_28",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_29",
@@ -28497,7 +28757,7 @@
           "svg_id": "T_Cell_29",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Medullary_Thymocytes_1",
@@ -29673,7 +29933,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_1",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_2",
@@ -29681,7 +29941,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_2",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_3",
@@ -29689,7 +29949,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_3",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_4",
@@ -29697,7 +29957,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_4",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_5",
@@ -29705,7 +29965,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_5",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_6",
@@ -29713,7 +29973,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_6",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_7",
@@ -29721,7 +29981,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_7",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_8",
@@ -29729,7 +29989,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_8",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_9",
@@ -29737,7 +29997,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_9",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_10",
@@ -29745,7 +30005,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_10",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_11",
@@ -29753,7 +30013,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_11",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_12",
@@ -29761,7 +30021,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_12",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_13",
@@ -29769,7 +30029,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_13",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_14",
@@ -29777,7 +30037,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_14",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_15",
@@ -29785,7 +30045,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_15",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_16",
@@ -29793,7 +30053,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_16",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_17",
@@ -29801,7 +30061,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_17",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_18",
@@ -29809,7 +30069,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_18",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_19",
@@ -29817,7 +30077,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_19",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_20",
@@ -29825,7 +30085,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_20",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_21",
@@ -29833,7 +30093,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_21",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_22",
@@ -29841,7 +30101,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_22",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_23",
@@ -29849,7 +30109,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_23",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_24",
@@ -29857,7 +30117,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_24",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_25",
@@ -29865,7 +30125,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_25",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_26",
@@ -29873,7 +30133,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_26",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_27",
@@ -29881,7 +30141,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_27",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_28",
@@ -29889,7 +30149,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_28",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_29",
@@ -29897,7 +30157,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_29",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_30",
@@ -29905,7 +30165,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_30",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_31",
@@ -29913,7 +30173,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_31",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_32",
@@ -29921,7 +30181,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_32",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_33",
@@ -29929,7 +30189,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_33",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_34",
@@ -29937,7 +30197,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_34",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_35",
@@ -29945,7 +30205,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_35",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_36",
@@ -29953,7 +30213,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_36",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_37",
@@ -29961,7 +30221,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_37",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_38",
@@ -29969,7 +30229,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_38",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_39",
@@ -29977,7 +30237,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_39",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_40",
@@ -29985,7 +30245,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_40",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_41",
@@ -29993,7 +30253,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_41",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_42",
@@ -30001,7 +30261,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_42",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_43",
@@ -30009,7 +30269,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_43",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_44",
@@ -30017,7 +30277,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_44",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_45",
@@ -30025,7 +30285,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_45",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Dendritic_Cell_1",
diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/ftu-cell-summaries.jsonld b/apps/ftu-ui-small-wc/src/assets/TEMP/ftu-cell-summaries.jsonld
index 0e2c230d4..a25bbc131 100644
--- a/apps/ftu-ui-small-wc/src/assets/TEMP/ftu-cell-summaries.jsonld
+++ b/apps/ftu-ui-small-wc/src/assets/TEMP/ftu-cell-summaries.jsonld
@@ -33,7 +33,7 @@
       "summary": [
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_0000236",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_4030009",
           "cell_label": "epithelial cell of proximal tubule",
           "genes": [
             {
@@ -4496,8 +4496,8 @@
         },
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_1000892",
-          "cell_label": "kidney capillary endothelial cell",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_1001005",
+          "cell_label": "glomerular capillary endothelial cell",
           "genes": [
             {
               "@type": "GeneExpression",
@@ -5261,8 +5261,8 @@
         },
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_0000650",
-          "cell_label": "mesangial cell",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_1000742",
+          "cell_label": "glomerular mesangial cell",
           "genes": [
             {
               "@type": "GeneExpression",
@@ -6750,8 +6750,8 @@
       "summary": [
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_1000892",
-          "cell_label": "kidney capillary endothelial cell",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_1001033",
+          "cell_label": "peritubular capillary endothelial cell",
           "genes": [
             {
               "@type": "GeneExpression",
@@ -7515,8 +7515,8 @@
         },
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_0005011",
-          "cell_label": "Cortical Collecting Duct Intercalated Cell Type A",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_4030015",
+          "cell_label": "kidney collecting duct alpha-intercalated cell",
           "genes": [
             {
               "@type": "GeneExpression",
@@ -8252,8 +8252,8 @@
         },
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_0002201",
-          "cell_label": "Cortical Collecting Duct Intercalated Cell Type B",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_4030005",
+          "cell_label": "kidney collecting duct beta-intercalated cell",
           "genes": [
             {
               "@type": "GeneExpression",
@@ -9003,8 +9003,8 @@
         },
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_0005009",
-          "cell_label": "Cortical Collecting Duct Principal Cell",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_1000714",
+          "cell_label": "kidney cortex collecting duct principal cell",
           "genes": [
             {
               "@type": "GeneExpression",
@@ -9762,8 +9762,8 @@
       "summary": [
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_1000892",
-          "cell_label": "kidney capillary endothelial cell",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_1001131",
+          "cell_label": "vasa recta ascending limb cell",
           "genes": [
             {
               "@type": "GeneExpression",
@@ -10527,8 +10527,8 @@
         },
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_1001106",
-          "cell_label": "kidney loop of Henle thick ascending limb epithelial cell",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_1001107",
+          "cell_label": "kidney loop of Henle thin ascending limb epithelial cell",
           "genes": [
             {
               "@type": "GeneExpression",
@@ -12002,8 +12002,8 @@
         },
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_1000488",
-          "cell_label": "cholangiocyte",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_0000075",
+          "cell_label": "columnar/cuboidal epithelial cell",
           "genes": [
             {
               "@type": "GeneExpression",
@@ -13491,7 +13491,7 @@
       "summary": [
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_0002553",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_4028004",
           "cell_label": "alveolar type 1 fibroblast",
           "genes": [
             {
@@ -14944,7 +14944,7 @@
         },
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_1001567",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_4028002",
           "cell_label": "alveolar capillary type 1 endothelial cell",
           "genes": [
             {
@@ -16405,8 +16405,8 @@
       "summary": [
         {
           "@type": "CellSummaryRow",
-          "cell_id": "http://purl.obolibrary.org/obo/CL_1000271",
-          "cell_label": "Ciliated Cell Of Submucosal Gland",
+          "cell_id": "http://purl.obolibrary.org/obo/CL_4033055",
+          "cell_label": "airway submucosal gland duct ciliated cell",
           "genes": [
             {
               "@type": "GeneExpression",
diff --git a/apps/ftu-ui-small-wc/src/assets/TEMP/ftu-datasets.jsonld b/apps/ftu-ui-small-wc/src/assets/TEMP/ftu-datasets.jsonld
index adda2b83c..ddf0c1fe5 100644
--- a/apps/ftu-ui-small-wc/src/assets/TEMP/ftu-datasets.jsonld
+++ b/apps/ftu-ui-small-wc/src/assets/TEMP/ftu-datasets.jsonld
@@ -33,7 +33,7 @@
           "@id": "https://cns-iu.github.io/hra-cell-type-populations-supporting-information/data/enriched_rui_locations.jsonld#36e76662-60b8-4193-8a70-1bfd4f6938d0_D088_Lung",
           "@type": "Dataset",
           "label": "snRNA-seq of Three Healthy Human Kidney Tissue",
-          "link": "https://doi.org/10.1038/s41598-021-98806-y",
+          "link": "https://doi.org/10.1038/s41467-021-22368-w",
           "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
         }
       ]
@@ -46,7 +46,7 @@
           "@id": "https://cns-iu.github.io/hra-cell-type-populations-supporting-information/data/enriched_rui_locations.jsonld#36e76662-60b8-4193-8a70-1bfd4f6938d0_D088_Lung",
           "@type": "Dataset",
           "label": "snRNA-seq of Three Healthy Human Kidney Tissue",
-          "link": "https://doi.org/10.1038/s41598-021-98806-y",
+          "link": "https://doi.org/10.1038/s41467-021-22368-w",
           "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
         }
       ]
@@ -59,33 +59,7 @@
           "@id": "https://cns-iu.github.io/hra-cell-type-populations-supporting-information/data/enriched_rui_locations.jsonld#36e76662-60b8-4193-8a70-1bfd4f6938d0_D088_Lung",
           "@type": "Dataset",
           "label": "snRNA-seq of Three Healthy Human Kidney Tissue",
-          "link": "https://doi.org/10.1038/s41598-021-98806-y",
-          "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
-        }
-      ]
-    },
-    {
-      "@id": "https://purl.humanatlas.io/2d-ftu/kidney-inner-medullary-collecting-duct",
-      "@type": "FtuIllustration",
-      "data_sources": [
-        {
-          "@id": "https://cns-iu.github.io/hra-cell-type-populations-supporting-information/data/enriched_rui_locations.jsonld#36e76662-60b8-4193-8a70-1bfd4f6938d0_D088_Lung",
-          "@type": "Dataset",
-          "label": "snRNA-seq of Three Healthy Human Kidney Tissue",
-          "link": "https://doi.org/10.1038/s41598-021-98806-y",
-          "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
-        }
-      ]
-    },
-    {
-      "@id": "https://purl.humanatlas.io/2d-ftu/kidney-outer-medullary-collecting-duct",
-      "@type": "FtuIllustration",
-      "data_sources": [
-        {
-          "@id": "https://cns-iu.github.io/hra-cell-type-populations-supporting-information/data/enriched_rui_locations.jsonld#36e76662-60b8-4193-8a70-1bfd4f6938d0_D088_Lung",
-          "@type": "Dataset",
-          "label": "snRNA-seq of Three Healthy Human Kidney Tissue",
-          "link": "https://doi.org/10.1038/s41598-021-98806-y",
+          "link": "https://doi.org/10.1038/s41467-021-22368-w",
           "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
         }
       ]
@@ -98,33 +72,7 @@
           "@id": "https://cns-iu.github.io/hra-cell-type-populations-supporting-information/data/enriched_rui_locations.jsonld#36e76662-60b8-4193-8a70-1bfd4f6938d0_D088_Lung",
           "@type": "Dataset",
           "label": "snRNA-seq of Three Healthy Human Kidney Tissue",
-          "link": "https://doi.org/10.1038/s41598-021-98806-y",
-          "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
-        }
-      ]
-    },
-    {
-      "@id": "https://purl.humanatlas.io/2d-ftu/kidney-descending-thin-loop-of-henle",
-      "@type": "FtuIllustration",
-      "data_sources": [
-        {
-          "@id": "https://cns-iu.github.io/hra-cell-type-populations-supporting-information/data/enriched_rui_locations.jsonld#36e76662-60b8-4193-8a70-1bfd4f6938d0_D088_Lung",
-          "@type": "Dataset",
-          "label": "snRNA-seq of Three Healthy Human Kidney Tissue",
-          "link": "https://doi.org/10.1038/s41598-021-98806-y",
-          "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
-        }
-      ]
-    },
-    {
-      "@id": "https://purl.humanatlas.io/2d-ftu/kidney-ascending-thin-loop-of-henle",
-      "@type": "FtuIllustration",
-      "data_sources": [
-        {
-          "@id": "https://cns-iu.github.io/hra-cell-type-populations-supporting-information/data/enriched_rui_locations.jsonld#36e76662-60b8-4193-8a70-1bfd4f6938d0_D088_Lung",
-          "@type": "Dataset",
-          "label": "snRNA-seq of Three Healthy Human Kidney Tissue",
-          "link": "https://doi.org/10.1038/s41598-021-98806-y",
+          "link": "https://doi.org/10.1038/s41467-021-22368-w",
           "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
         }
       ]
diff --git a/apps/ftu-ui-small-wc/src/main.ts b/apps/ftu-ui-small-wc/src/main.ts
index 24135bd46..4622854f7 100644
--- a/apps/ftu-ui-small-wc/src/main.ts
+++ b/apps/ftu-ui-small-wc/src/main.ts
@@ -7,7 +7,7 @@ import { BrowserModule, createApplication } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { CdkStateModule } from '@hra-ui/cdk/state';
-import { HraServiceModule } from '@hra-ui/services';
+import { FTU_DATA_IMPL_ENDPOINTS, HraServiceModule } from '@hra-ui/services';
 import { HraStateModule } from '@hra-ui/state';
 import { ThemingModule } from '@hra-ui/theming';
 import { NgxsModule } from '@ngxs/store';
@@ -16,6 +16,7 @@ import { MarkdownModule } from 'ngx-markdown';
 import { AppComponent } from './app/app.component';
 import { initFactory } from './app/app.init';
 import { NavigationLessRouter } from './app/routing/simple-router.service';
+import { ReplaySubject } from 'rxjs';
 
 (async () => {
   const app = await createApplication({
@@ -48,6 +49,10 @@ import { NavigationLessRouter } from './app/routing/simple-router.service';
         provide: Router,
         useExisting: NavigationLessRouter,
       },
+      {
+        provide: FTU_DATA_IMPL_ENDPOINTS,
+        useValue: new ReplaySubject(1),
+      },
     ],
   });
 
diff --git a/apps/ftu-ui/src/app/app.component.ts b/apps/ftu-ui/src/app/app.component.ts
index 77df9d0b9..49e132ecf 100644
--- a/apps/ftu-ui/src/app/app.component.ts
+++ b/apps/ftu-ui/src/app/app.component.ts
@@ -17,6 +17,7 @@ import {
   BaseHrefActions,
   createLinkId,
   LinkRegistryActions,
+  LinkType,
   ResourceRegistryActions,
   StorageId,
   StorageSelectors,
@@ -27,6 +28,7 @@ import {
   ActiveFtuActions,
   ActiveFtuSelectors,
   IllustratorSelectors,
+  LinkIds,
   ScreenModeAction,
   TissueLibraryActions,
   TissueLibrarySelectors,
@@ -75,6 +77,7 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
 
   private readonly setBaseHref = dispatch(BaseHrefActions.Set);
   private readonly loadLinks = dispatch(LinkRegistryActions.LoadFromYaml);
+  private readonly addMany = dispatch(LinkRegistryActions.AddMany);
   private readonly loadResources = dispatch(ResourceRegistryActions.LoadFromYaml);
   private readonly navigateToOrgan = dispatch(LinkRegistryActions.Navigate);
   private readonly setScreenSmall = dispatch(ScreenModeAction.SetSize);
@@ -128,7 +131,47 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
   ngOnInit() {
     const { baseHref } = this;
     this.setBaseHref(this.baseHref);
-    this.loadLinks(setUrl(this.linksYamlUrl, baseHref));
+    // this.loadLinks(setUrl(this.linksYamlUrl, baseHref)); //TODO: Fix this
+    this.addMany({
+      [LinkIds.LandingPage]: {
+        type: LinkType.Internal,
+        commands: ['/'],
+      },
+      [LinkIds.ProductTitle]: {
+        type: LinkType.Internal,
+        commands: ['/'],
+      },
+      [createLinkId('FTU')]: {
+        type: LinkType.Internal,
+        commands: ['ftu/'],
+      },
+      [LinkIds.About]: {
+        type: LinkType.External,
+        url: 'https://humanatlas.io/',
+      },
+      [LinkIds.ExploreFTU]: {
+        type: LinkType.Internal,
+        commands: ['ftu/'],
+        extras: {
+          queryParams: {
+            id: 'https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland',
+          },
+        },
+      },
+      [LinkIds.Portal]: {
+        type: LinkType.External,
+        url: 'https://humanatlas.io/',
+      },
+      [LinkIds.LandingPageReadMore]: {
+        type: LinkType.External,
+        url: 'https://humanatlas.io/2d-ftu-illustrations',
+      },
+      [LinkIds.Embed]: {
+        type: LinkType.External,
+        url: 'https://github.com/hubmapconsortium/hra-ui#readme',
+      },
+    });
+
     this.loadResources(setUrl(this.resourcesYamlUrl, baseHref));
     this.endpoints.next({
       illustrations: setUrl(this.illustrationsUrl, baseHref),
diff --git a/apps/ftu-ui/src/app/app.init.ts b/apps/ftu-ui/src/app/app.init.ts
index 2804a82e8..2be1c0380 100644
--- a/apps/ftu-ui/src/app/app.init.ts
+++ b/apps/ftu-ui/src/app/app.init.ts
@@ -1,6 +1,6 @@
 import { dispatchAction$ } from '@hra-ui/cdk/injectors';
-import { LinkRegistryActions, LinkType, ResourceRegistryActions } from '@hra-ui/cdk/state';
-import { LinkIds, TissueLibraryActions } from '@hra-ui/state';
+import { LinkRegistryActions, LinkType } from '@hra-ui/cdk/state';
+import { LinkIds } from '@hra-ui/state';
 import { Observable } from 'rxjs';
 
 /**
diff --git a/apps/ftu-ui/src/assets/TEMP/ftu-datasets.jsonld b/apps/ftu-ui/src/assets/TEMP/ftu-datasets.jsonld
index 11e4dbbbe..ddf0c1fe5 100644
--- a/apps/ftu-ui/src/assets/TEMP/ftu-datasets.jsonld
+++ b/apps/ftu-ui/src/assets/TEMP/ftu-datasets.jsonld
@@ -36,9 +36,9 @@
           "link": "https://doi.org/10.1038/s41467-021-22368-w",
           "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
         }
-		]
-		},
-	{
+      ]
+    },
+    {
       "@id": "https://purl.humanatlas.io/2d-ftu/kidney-renal-corpuscle",
       "@type": "FtuIllustration",
       "data_sources": [
@@ -49,9 +49,9 @@
           "link": "https://doi.org/10.1038/s41467-021-22368-w",
           "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
         }
-	  ]
-	},
-	{
+      ]
+    },
+    {
       "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct",
       "@type": "FtuIllustration",
       "data_sources": [
@@ -62,9 +62,9 @@
           "link": "https://doi.org/10.1038/s41467-021-22368-w",
           "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
         }
-	  ]
-	},
-	{
+      ]
+    },
+    {
       "@id": "https://purl.humanatlas.io/2d-ftu/kidney-thick-ascending-loop-of-henle",
       "@type": "FtuIllustration",
       "data_sources": [
@@ -75,9 +75,9 @@
           "link": "https://doi.org/10.1038/s41467-021-22368-w",
           "description": "Single cell transcriptional and chromatin accessibility profiling redefine cellular heterogeneity in the adult human kidney"
         }
-	  ]
-	},
-	{
+      ]
+    },
+    {
       "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland",
       "@type": "FtuIllustration",
       "data_sources": [
@@ -88,9 +88,9 @@
           "link": "https://doi.org/10.1038/s41591-019-0468-5",
           "description": "A cellular census of human lungs identifies novel cell states in health and in asthma"
         }
-	  ]
-	},
-	{
+      ]
+    },
+    {
       "@id": "https://purl.humanatlas.io/2d-ftu/lung-pulmonary-alveolus",
       "@type": "FtuIllustration",
       "data_sources": [
@@ -101,9 +101,9 @@
           "link": "https://doi.org/10.1038/s41591-019-0468-5",
           "description": "A cellular census of human lungs identifies novel cell states in health and in asthma"
         }
-	  ]
-	},
-	{
+      ]
+    },
+    {
       "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule",
       "@type": "FtuIllustration",
       "data_sources": [
@@ -114,7 +114,7 @@
           "link": "https://doi.org/10.1038/s41598-021-98806-y",
           "description": "Single-cell and bulk transcriptomics of the liver reveals potential targets of NASH with fibrosis"
         }
-	  ]
-	}
-	]
+      ]
+    }
+  ]
 }
diff --git a/apps/ftu-ui/src/index.html b/apps/ftu-ui/src/index.html
index 5ecfb6619..dae7b6372 100644
--- a/apps/ftu-ui/src/index.html
+++ b/apps/ftu-ui/src/index.html
@@ -30,12 +30,11 @@
   <body>
     <hra-ftu-wc
       id="ftu"
-      base-href="https://cdn.jsdelivr.net/gh/hubmapconsortium/hra-ui@staging/apps/ftu-ui/"
       links-yaml-url="assets/links.yml"
       resources-yaml-url="assets/resources.yml"
-      dataset-url="https://cdn.jsdelivr.net/gh/cns-iu/hra-vccf-ftu-supporting-information/exploration/ftu-datasets.jsonld"
+      dataset-url="assets/TEMP/ftu-datasets.jsonld"
       illustrations-url="assets/TEMP/2d-ftu-illustrations.jsonld"
-      summaries-url="https://cdn.jsdelivr.net/gh/cns-iu/hra-vccf-ftu-supporting-information/exploration/ftu-cell-summaries.jsonld"
+      summaries-url="assets/TEMP/ftu-cell-summaries.jsonld"
     ></hra-ftu-wc>
   </body>
 </html>
diff --git a/apps/medical-illustration/src/app/app-web-component.ts b/apps/medical-illustration/src/app/app-web-component.ts
index 184672af1..d69e1512a 100644
--- a/apps/medical-illustration/src/app/app-web-component.ts
+++ b/apps/medical-illustration/src/app/app-web-component.ts
@@ -9,7 +9,7 @@ import {
   OnChanges,
   Output,
 } from '@angular/core';
-import { IllustrationMappingItem } from '@hra-ui/services';
+import { IllustrationMappingItem, setUrl } from '@hra-ui/services';
 import { Observable, tap } from 'rxjs';
 
 import { CellEntry, IllustrationData, JsonLd } from './models';
@@ -56,6 +56,9 @@ export class AppWebComponent implements OnChanges {
    * Sets illustration url and mapping data on input changes
    */
   ngOnChanges() {
+    if (this.lookupSrc === '') {
+      return;
+    }
     if (typeof this.lookupSrc === 'string') {
       this.getData(this.illustrationSrc, this.lookupSrc).subscribe();
     } else {
@@ -104,8 +107,7 @@ export class AppWebComponent implements OnChanges {
         (file) => file['file_format'] === 'image/svg+xml'
       );
       if (illustrationFile) {
-        this.url = this.baseHref + illustrationFile.file;
-        console.warn(this.url);
+        this.url = setUrl(illustrationFile.file, this.baseHref);
         this.mapping = this.cellEntryToNodeEntry(illustrationSrc.mapping);
         this.cdr.markForCheck();
       }
diff --git a/apps/medical-illustration/src/assets/TEMP/2d-ftu-illustrations.jsonld b/apps/medical-illustration/src/assets/TEMP/2d-ftu-illustrations.jsonld
index 92a327f0e..1bcae89e5 100644
--- a/apps/medical-illustration/src/assets/TEMP/2d-ftu-illustrations.jsonld
+++ b/apps/medical-illustration/src/assets/TEMP/2d-ftu-illustrations.jsonld
@@ -32,19 +32,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-ascending-thin-loop-of-henle#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-ascending-thin-loop-of-henle.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-ascending-thin-loop-of-henle.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-ascending-thin-loop-of-henle#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-ascending-thin-loop-of-henle.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-ascending-thin-loop-of-henle.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-ascending-thin-loop-of-henle#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-ascending-thin-loop-of-henle.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-ascending-thin-loop-of-henle.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -119,26 +119,26 @@
       "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct",
       "@type": "FtuIllustration",
       "representation_of": "UBERON:0004203",
-      "label": "cortical collecting duct",
+      "label": "Cortical Collecting Duct",
       "organ_id": "UBERON:0002113",
       "organ_label": "Kidney",
       "illustration_files": [
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-cortical-collecting-duct.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-cortical-collecting-duct.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-cortical-collecting-duct.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-cortical-collecting-duct.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-cortical-collecting-duct.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-cortical-collecting-duct.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -220,48 +220,48 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_B_1",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_B",
-          "label": "connecting tubule intercalated cell type B",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030021"
+          "label": "kidney collecting duct beta-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030005"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Cortical_Collecting_Duct_Intercalated_Cell_Type_B_2",
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_B_2",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_B",
-          "label": "connecting tubule intercalated cell type B",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030021"
+          "label": "kidney collecting duct beta-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030005"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Cortical_Collecting_Duct_Intercalated_Cell_Type_A_1",
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A_1",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A",
-          "label": "connecting tubule intercalated cell type A",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030020"
+          "label": "kidney collecting duct alpha-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030015"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Cortical_Collecting_Duct_Intercalated_Cell_Type_A_2",
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A_2",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A",
-          "label": "connecting tubule intercalated cell type A",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030020"
+          "label": "kidney collecting duct alpha-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030015"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Cortical_Collecting_Duct_Intercalated_Cell_Type_A_3",
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A_3",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A",
-          "label": "connecting tubule intercalated cell type A",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030020"
+          "label": "kidney collecting duct alpha-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030015"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Cortical_Collecting_Duct_Intercalated_Cell_Type_A_4",
           "@type": "FtuIllustrationNode",
           "svg_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A_4",
           "svg_group_id": "Cortical_Collecting_Duct_Intercalated_Cell_Type_A",
-          "label": "connecting tubule intercalated cell type A",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_4030020"
+          "label": "kidney collecting duct alpha-intercalated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030015"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-cortical-collecting-duct#Endothelium_Peritubular_Capillary_1",
@@ -316,19 +316,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-descending-thin-loop-of-henle#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-descending-thin-loop-of-henle.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-descending-thin-loop-of-henle#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-descending-thin-loop-of-henle.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-descending-thin-loop-of-henle#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-descending-thin-loop-of-henle.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-descending-thin-loop-of-henle.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -394,19 +394,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-inner-medullary-collecting-duct#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-inner-medullary-collecting-duct.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-inner-medullary-collecting-duct.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-inner-medullary-collecting-duct#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-inner-medullary-collecting-duct.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-inner-medullary-collecting-duct.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-inner-medullary-collecting-duct#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-inner-medullary-collecting-duct.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-inner-medullary-collecting-duct.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -416,7 +416,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_1",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -424,7 +424,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_2",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -432,7 +432,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_3",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -440,7 +440,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_4",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -448,7 +448,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_5",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -456,7 +456,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_6",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -464,7 +464,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_7",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -472,7 +472,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_8",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -480,7 +480,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_9",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -488,7 +488,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_10",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -496,7 +496,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_11",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -504,7 +504,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_12",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -512,7 +512,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_13",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -520,7 +520,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Inner_Medullary_Collecting_Duct_Cell_14",
           "svg_group_id": "Inner_Medullary_Collecting_Duct_Cell",
-          "label": "kidney inner medulla collecting duct cell",
+          "label": "kidney inner medulla collecting duct principal cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
@@ -594,203 +594,427 @@
       ],
       "mapping": [
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thin_limb_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_collecting_duct_AS",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thin_limb_1",
-          "svg_group_id": "Thin_limb",
-          "label": "thin limb of loop of Henle",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004193"
+          "svg_id": "Cortical_collecting_duct_AS",
+          "svg_group_id": "Collecting_Duct",
+          "label": "cortical collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004203"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thin_limb_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thin_limb_2",
-          "svg_group_id": "Thin_limb",
-          "label": "thin limb of loop of Henle",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001289"
+          "svg_id": "Cortical_Collecting_Duct_Cell_1",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thin_Limb_Cell_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thin_Limb_Cell_1",
-          "svg_group_id": "Thin_limb",
-          "label": "kidney loop of Henle thin limb epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1001107"
+          "svg_id": "Cortical_Collecting_Duct_Cell_2",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thin_Limb_Cell_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_3",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thin_Limb_Cell_2",
-          "svg_group_id": "Thin_limb",
-          "label": "kidney loop of Henle thin limb epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1001111"
+          "svg_id": "Cortical_Collecting_Duct_Cell_3",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Collecting_Duct",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_4",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Collecting_Duct",
+          "svg_id": "Cortical_Collecting_Duct_Cell_4",
           "svg_group_id": "Collecting_Duct",
-          "label": "collecting duct",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004203"
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_5",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_1",
-          "svg_group_id": "Distal_Convoluted_Tubule",
-          "label": "distal convoluted tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001292"
+          "svg_id": "Cortical_Collecting_Duct_Cell_5",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_6",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_6",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_7",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_7",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_8",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_8",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_9",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_9",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_10",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_10",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_11",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_11",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_12",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_12",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_13",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_13",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_14",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_14",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Cortical_Collecting_Duct_Cell_15",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Cortical_Collecting_Duct_Cell_15",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney cortex collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000714"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S3",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_2",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Proximal_Tubule_S3",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "proximal straight tubule",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001290"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S2",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S2",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "proximal convoluted tubule segment 2",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004197"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "proximal convoluted tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004196"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_1",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_1",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_2",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_2",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_3",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_3",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_4",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_4",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_5",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_5",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_6",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_6",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_7",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_7",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_8",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_8",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_9",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_9",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_10",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_10",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_11",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_11",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_12",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_12",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_13",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_13",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_14",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_14",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_15",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_15",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_S1_Cell_16",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Proximal_Tubule_S1_Cell_16",
+          "svg_group_id": "Proximal_Tubule",
+          "label": "epithelial cell of proximal tubule segment 1",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4030009"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_AS",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Distal_Convulated_Tubule_AS",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "distal convoluted tubule",
           "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001292"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_1",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_1",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_2",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_2",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_3",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_3",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_3",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_3",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_4",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_4",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_4",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_4",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_5",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_5",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_5",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_5",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_6",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_6",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_6",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_6",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_7",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_7",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_7",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_7",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_8",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_8",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_8",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_8",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_9",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_9",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_9",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_9",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_10",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_10",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_10",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_10",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_11",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_11",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_11",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_11",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_12",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_12",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_12",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_12",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_13",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_13",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_13",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_13",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convoluted_Tubule_Cell_14",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_14",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Distal_Convoluted_Tubule_Cell_14",
-          "svg_group_id": "Distal_Convoluted_Tubule",
+          "svg_id": "Distal_Convulated_Tubule_Cell_14",
+          "svg_group_id": "Distal_Convulated_Tubule",
           "label": "kidney distal convoluted tubule epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Glomerulus_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Distal_Convulated_Tubule_Cell_15",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Glomerulus_1",
-          "svg_group_id": "Glomerulus",
-          "label": "renal corpuscle",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001229"
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Glomerulus_2",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Glomerulus_2",
-          "svg_group_id": "Glomerulus",
-          "label": "renal corpuscle",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001229"
+          "svg_id": "Distal_Convulated_Tubule_Cell_15",
+          "svg_group_id": "Distal_Convulated_Tubule",
+          "label": "kidney distal convoluted tubule epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000849"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Connecting_Tubule_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Connecting_Tubule_AS_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Connecting_Tubule_1",
+          "svg_id": "Connecting_Tubule_AS_1",
           "svg_group_id": "Connecting_Tubule",
-          "label": "connecting tubule",
+          "label": "renal connecting tubule",
           "representation_of": "http://purl.obolibrary.org/obo/UBERON_0005097"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Connecting_Tubule_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Connecting_Tubule_AS_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Connecting_Tubule_2",
+          "svg_id": "Connecting_Tubule_AS_2",
           "svg_group_id": "Connecting_Tubule",
-          "label": "connecting tubule",
+          "label": "renal connecting tubule",
           "representation_of": "http://purl.obolibrary.org/obo/UBERON_0005097"
         },
         {
@@ -922,324 +1146,492 @@
           "representation_of": "http://purl.obolibrary.org/obo/CL_1000768"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_limb_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_1",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_1",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_limb_1",
-          "svg_group_id": "Thick_Ascending_limb",
+          "svg_id": "Macula_Densa_Cell_2",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_3",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_3",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_4",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_4",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_5",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_5",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_6",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_6",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_7",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_7",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_8",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_8",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_9",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Macula_Densa_Cell_9",
+          "svg_group_id": "Macula_Densa",
+          "label": "macula densa epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_AS_1",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_AS_1",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "thick ascending limb of loop of Henle",
           "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001291"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_limb_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_AS_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_limb_2",
-          "svg_group_id": "Thick_Ascending_limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_AS_2",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "thick ascending limb of loop of Henle",
           "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001291"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_1",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_1",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_2",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_2",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_3",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_3",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_3",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_3",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_4",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_4",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_4",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_4",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_5",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_5",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_5",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_5",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_6",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_6",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_6",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_6",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_7",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_7",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_7",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_7",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_8",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_8",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_8",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_8",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_9",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_9",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_9",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_9",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_10",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_10",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_10",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_10",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Cell_11",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_11",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Thick_Ascending_Limb_Cell_11",
-          "svg_group_id": "Thick_Ascending_Limb",
+          "svg_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle_Cell_11",
+          "svg_group_id": "Thick_Ascending_Limb_Of_Loop_Of_Henle",
           "label": "kidney loop of Henle thick ascending limb epithelial cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_1001106"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Ascending_Thin_Limb_Of_Loop_Of_Henle_AS_1",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle_AS_1",
+          "svg_group_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "loop of Henle ascending limb thin segment",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004193"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Ascending_Thin_Limb_Of_Loop_Of_Henle_AS_2",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle_AS_2",
+          "svg_group_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "loop of Henle ascending limb thin segment",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004193"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Ascending_Thin_Limb_Of_Loop_Of_Henle_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_1",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle_Cell_1",
+          "svg_group_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "kidney loop of Henle thin ascending limb epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1001107"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Ascending_Thin_Limb_Of_Loop_Of_Henle_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_2",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle_Cell_2",
+          "svg_group_id": "Ascending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "kidney loop of Henle thin ascending limb epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1001107"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_3",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Descending_Thin_Limb_Of_Loop_Of_Henle_AS_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_3",
-          "svg_group_id": "Proximal_Tubule_S2",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Descending_Thin_Limb_Of_Loop_Of_Henle_AS_1",
+          "svg_group_id": "Descending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "descending thin limb",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0005096"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_4",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Descending_Thin_Limb_Of_Loop_Of_Henle_AS_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_4",
-          "svg_group_id": "Proximal_Tubule_S2",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Descending_Thin_Limb_Of_Loop_Of_Henle_AS_2",
+          "svg_group_id": "Descending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "descending thin limb",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0005096"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_5",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Descending_Thin_Limb_Of_Loop_Of_Henle_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_5",
-          "svg_group_id": "Proximal_Tubule_S3",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Descending_Thin_Limb_Of_Loop_Of_Henle_Cell_1",
+          "svg_group_id": "Descending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "kidney loop of Henle thin descending limb epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1001111"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_6",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Descending_Thin_Limb_Of_Loop_Of_Henle_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_6",
-          "svg_group_id": "Proximal_Tubule_S3",
-          "label": "proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0004134"
+          "svg_id": "Descending_Thin_Limb_Of_Loop_Of_Henle_Cell_2",
+          "svg_group_id": "Descending_Thin_Limb_Of_Loop_Of_Henle",
+          "label": "kidney loop of Henle thin descending limb epithelial cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1001111"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_1",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_1",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_2",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_2",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_3",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_3",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_4",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_4",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_5",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_5",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_6",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_6",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_7",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_7",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_8",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_8",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_9",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_9",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_10",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_10",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_11",
+          "@type": "FtuIllustrationNode",
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_11",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_12",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_2",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_12",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_3",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_13",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_3",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_13",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_4",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_14",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_4",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_14",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_5",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Outer_Medullary_Collecting_Duct_Cell_15",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_5",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Outer_Medullary_Collecting_Duct_Cell_15",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney outer medulla collecting duct principal cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000716"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_6",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_6",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_1",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_7",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_7",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_2",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_8",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_3",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_8",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_3",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_9",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_4",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_9",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_4",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_10",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_5",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_10",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_5",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_11",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_6",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_11",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_6",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_12",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_7",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_12",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_7",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_13",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_8",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_13",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_8",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Proximal_Tubule_Cell_14",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_9",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Proximal_Tubule_Cell_14",
-          "svg_group_id": "Proximal_Tubule_S1",
-          "label": "epithelial cell of proximal tubule",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0002306"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_9",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_1",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_10",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_1",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_10",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_2",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_11",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_2",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_11",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_3",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_12",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_3",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_12",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_4",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_13",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_4",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_13",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_5",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Inner_Medullary_Collecting_Duct_Cell_14",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_5",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Inner_Medullary_Collecting_Duct_Cell_14",
+          "svg_group_id": "Collecting_Duct",
+          "label": "kidney inner medulla collecting duct",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_1000718"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_6",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Renal_Corpuscle_1",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_6",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Renal_Corpuscle_1",
+          "svg_group_id": "Renal_Corpuscle",
+          "label": "Renal Corpuscle",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001229"
         },
         {
-          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Macula_Densa_Cell_7",
+          "@id": "https://purl.humanatlas.io/2d-ftu/kidney-nephron#Renal_Corpuscle_2",
           "@type": "FtuIllustrationNode",
-          "svg_id": "Macula_Densa_Cell_7",
-          "svg_group_id": "Macula_Densa_Cell",
-          "label": "macula densa epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_1000850"
+          "svg_id": "Renal_Corpuscle_2",
+          "svg_group_id": "Renal_Corpuscle",
+          "label": "Renal Corpuscle",
+          "representation_of": "http://purl.obolibrary.org/obo/UBERON_0001229"
         }
       ]
     },
@@ -1254,19 +1646,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-outer-medullary-collecting-duct#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-outer-medullary-collecting-duct.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-outer-medullary-collecting-duct.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-outer-medullary-collecting-duct#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-outer-medullary-collecting-duct.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-outer-medullary-collecting-duct.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-outer-medullary-collecting-duct#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-outer-medullary-collecting-duct.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-outer-medullary-collecting-duct.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -1444,19 +1836,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-renal-corpuscle#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-renal-corpuscle.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-renal-corpuscle#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-renal-corpuscle.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-renal-corpuscle#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-renal-corpuscle.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-renal-corpuscle.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -2490,19 +2882,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-thick-ascending-loop-of-henle#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-thick-ascending-loop-of-henle.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-thick-ascending-loop-of-henle.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-thick-ascending-loop-of-henle#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-thick-ascending-loop-of-henle.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-thick-ascending-loop-of-henle.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/kidney-thick-ascending-loop-of-henle#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-kidney-thick-ascending-loop-of-henle.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-kidney-thick-ascending-loop-of-henle.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -2600,19 +2992,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/large-intestine-crypt-lieberkuhn#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-large-intestine-crypt-lieberkuhn.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-large-intestine-crypt-lieberkuhn.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/large-intestine-crypt-lieberkuhn#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-large-intestine-crypt-lieberkuhn.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-large-intestine-crypt-lieberkuhn.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/large-intestine-crypt-lieberkuhn#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-large-intestine-crypt-lieberkuhn.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-large-intestine-crypt-lieberkuhn.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -4262,19 +4654,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-liver-liver-lobule.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-liver-liver-lobule.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-liver-liver-lobule.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-liver-liver-lobule.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -4644,288 +5036,144 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_1",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_2",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_2",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_3",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_3",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_4",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_4",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_5",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_5",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_6",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_6",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_7",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_7",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_8",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_8",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_9",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_9",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_10",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_10",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_11",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_11",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_12",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_12",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_13",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_13",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_14",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_14",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_15",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_15",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_16",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_16",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_17",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_17",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatic_Progenitor_Cell_18",
           "@type": "FtuIllustrationNode",
           "svg_id": "Hepatic_Progenitor_Cell_18",
           "svg_group_id": "Hepatic_Progenitor_Cell",
-          "label": "hepatic progenitor cell",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_1",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_1",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_2",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_2",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_3",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_3",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_4",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_4",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_5",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_5",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_6",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_6",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_7",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_7",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_8",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_8",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_9",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_9",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_10",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_10",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_11",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_11",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_12",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_12",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_13",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_13",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_14",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_14",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_15",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_15",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_16",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_16",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_17",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_17",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
-        },
-        {
-          "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Hepatoblast_18",
-          "@type": "FtuIllustrationNode",
-          "svg_id": "Hepatoblast_18",
-          "svg_group_id": "Hepatoblast",
-          "label": "hepatoblast",
-          "representation_of": ""
+          "label": "Hepatic oval stem cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002196"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/liver-liver-lobule#Endothelial_Cell_Of_Hepatic_Sinusoid_1",
@@ -5652,19 +5900,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-bronchial-submucosal-gland.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-bronchial-submucosal-gland.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-bronchial-submucosal-gland.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-bronchial-submucosal-gland.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -5674,135 +5922,135 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_1",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_2",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_2",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_3",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_3",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_4",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_4",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_5",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_5",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_6",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_6",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_7",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_7",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_8",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_8",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_9",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_9",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_10",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_10",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_11",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_11",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_12",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_12",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_13",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_13",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_14",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_14",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_15",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_15",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Ciliated_Cell_Of_Submucosal_Gland_16",
           "@type": "FtuIllustrationNode",
           "svg_id": "Ciliated_Cell_Of_Submucosal_Gland_16",
           "svg_group_id": "Ciliated_Cell_Of_Submucosal_Gland",
-          "label": "ciliated cell of submucosal gland",
-          "representation_of": ""
+          "label": "airway submucosal gland duct ciliated cell",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_4033055"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland#Basal_Cell_Of_Submucosal_Gland_1",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_1",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5810,7 +6058,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_2",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5818,7 +6066,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_3",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5826,7 +6074,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_4",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5834,7 +6082,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_5",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5842,7 +6090,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_6",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5850,7 +6098,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_7",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5858,7 +6106,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_8",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5866,7 +6114,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_9",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5874,7 +6122,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_10",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5882,7 +6130,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_11",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5890,7 +6138,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_Of_Submucosal_Gland_12",
           "svg_group_id": "Basal_Cell_Of_Submucosal_Gland",
-          "label": "basal cell of submucosal gland",
+          "label": "airway submucosal gland duct basal cell",
           "representation_of": "http://purl.obolibrary.org/obo/LMHA_00087"
         },
         {
@@ -5898,7 +6146,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_1",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5906,7 +6154,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_2",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5914,7 +6162,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_3",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5922,7 +6170,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_4",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5930,7 +6178,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_5",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5938,7 +6186,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_6",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5946,7 +6194,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_7",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5954,7 +6202,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_8",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5962,7 +6210,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_9",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5970,7 +6218,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_10",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5978,7 +6226,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_11",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5986,7 +6234,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_12",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -5994,7 +6242,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_13",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6002,7 +6250,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_14",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6010,7 +6258,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_15",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6018,7 +6266,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_16",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6026,7 +6274,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_17",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6034,7 +6282,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_18",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6042,7 +6290,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_19",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6050,7 +6298,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_20",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6058,7 +6306,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_21",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6066,7 +6314,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_22",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6074,7 +6322,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_23",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6082,7 +6330,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_24",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6090,7 +6338,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_25",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6098,7 +6346,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_26",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6106,7 +6354,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_27",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6114,7 +6362,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_28",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6122,7 +6370,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_29",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6130,7 +6378,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_30",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6138,7 +6386,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_31",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6146,7 +6394,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_32",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6154,7 +6402,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_33",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6162,7 +6410,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_34",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6170,7 +6418,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_35",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6178,7 +6426,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_36",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6186,7 +6434,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_37",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6194,7 +6442,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_38",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6202,7 +6450,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_39",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6210,7 +6458,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_40",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6218,7 +6466,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_41",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6226,7 +6474,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_42",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6234,7 +6482,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_43",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6242,7 +6490,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_44",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6250,7 +6498,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_45",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6258,7 +6506,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_46",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6266,7 +6514,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_47",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6274,7 +6522,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_48",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6282,7 +6530,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_49",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6290,7 +6538,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_50",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6298,7 +6546,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_51",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6306,7 +6554,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Mucus_Cell_52",
           "svg_group_id": "Mucus_Cell",
-          "label": "mucus secreting cell of bronchus submucosal glands",
+          "label": "mucus secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033022"
         },
         {
@@ -6330,7 +6578,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_1",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6338,7 +6586,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_2",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6346,7 +6594,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_3",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6354,7 +6602,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_4",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6362,7 +6610,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_5",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6370,7 +6618,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_6",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6378,7 +6626,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_7",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6386,7 +6634,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_8",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6394,7 +6642,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_9",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6402,7 +6650,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_10",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6410,7 +6658,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_11",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6418,7 +6666,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_12",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6426,7 +6674,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_13",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6434,7 +6682,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_14",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6442,7 +6690,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_15",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6450,7 +6698,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_16",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6458,7 +6706,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_17",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6466,7 +6714,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_18",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6474,7 +6722,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_19",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6482,7 +6730,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_20",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6490,7 +6738,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_21",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6498,7 +6746,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_22",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6506,7 +6754,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_23",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6514,7 +6762,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_24",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6522,7 +6770,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_25",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6530,7 +6778,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_26",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6538,7 +6786,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_27",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6546,7 +6794,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_28",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6554,7 +6802,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_29",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6562,7 +6810,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_30",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6570,7 +6818,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_31",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6578,7 +6826,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_32",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6586,7 +6834,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_33",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6594,7 +6842,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_34",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6602,7 +6850,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_35",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6610,7 +6858,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_36",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6618,7 +6866,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_37",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6626,7 +6874,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_38",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6634,7 +6882,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_39",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6642,7 +6890,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_40",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6650,7 +6898,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_41",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6658,7 +6906,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_42",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6666,7 +6914,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_43",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6674,7 +6922,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_44",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6682,7 +6930,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_45",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6690,7 +6938,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_46",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6698,7 +6946,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_47",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6706,7 +6954,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_48",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6714,7 +6962,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_49",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6722,7 +6970,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_50",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6730,7 +6978,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_51",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6738,7 +6986,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_52",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6746,7 +6994,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_53",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6754,7 +7002,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_54",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6762,7 +7010,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Serous_Cell_55",
           "svg_group_id": "Serous_Cell",
-          "label": "serous cell of submucosal glands",
+          "label": "serous secreting cell of bronchus submucosal gland",
           "representation_of": "http://purl.obolibrary.org/obo/CL_0000313"
         },
         {
@@ -6938,19 +7186,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-pulmonary-alveolus#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-pulmonary-alveolus.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-pulmonary-alveolus.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-pulmonary-alveolus#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-pulmonary-alveolus.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-pulmonary-alveolus.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/lung-pulmonary-alveolus#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-lung-pulmonary-alveolus.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-lung-pulmonary-alveolus.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -7136,7 +7384,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_1",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7144,7 +7392,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_2",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7152,7 +7400,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_3",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7160,7 +7408,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_4",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7168,7 +7416,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_5",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7176,7 +7424,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_6",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7184,7 +7432,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Lung_Matrix_Fibroblast_7",
           "svg_group_id": "Lung_Matrix_Fibroblast",
-          "label": "alveolar type 1 fibroblast",
+          "label": "alveolar type 1 fibroblast cell",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4028004"
         },
         {
@@ -7192,7 +7440,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_1",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7200,7 +7448,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_2",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7208,7 +7456,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_3",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7216,7 +7464,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_4",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7224,7 +7472,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_5",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7232,7 +7480,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_6",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7240,7 +7488,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_7",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7248,7 +7496,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_8",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7256,7 +7504,7 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Secondary_Crest_Myofibroblast_9",
           "svg_group_id": "Secondary_Crest_Myofibroblast",
-          "label": "secondary crest myofibroblasts",
+          "label": "secondary crest myofibroblast",
           "representation_of": "http://purl.obolibrary.org/obo/CL_4033016"
         },
         {
@@ -7488,19 +7736,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-intercalated-duct#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-intercalated-duct.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-intercalated-duct.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-intercalated-duct#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-intercalated-duct.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-intercalated-duct.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-intercalated-duct#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-intercalated-duct.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-intercalated-duct.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -7750,19 +7998,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-islets-langerhans#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-islets-langerhans.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-islets-langerhans#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-islets-langerhans.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-islets-langerhans#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-islets-langerhans.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-islets-langerhans.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -9540,19 +9788,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-pancreatic-acinus#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-pancreatic-acinus.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-pancreatic-acinus#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-pancreatic-acinus.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/pancreas-pancreatic-acinus#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-pancreas-pancreatic-acinus.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-pancreas-pancreatic-acinus.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -9794,19 +10042,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/prostate-prostate-glandular-acinus#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-prostate-prostate-glandular-acinus.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/prostate-prostate-glandular-acinus#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-prostate-prostate-glandular-acinus.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/prostate-prostate-glandular-acinus#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-prostate-prostate-glandular-acinus.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-prostate-prostate-glandular-acinus.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -13832,19 +14080,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-dermal-papilla.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-dermal-papilla.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-dermal-papilla.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-dermal-papilla.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-dermal-papilla.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-dermal-papilla.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -14167,7 +14415,7 @@
           "svg_id": "Blood_Vessel_1",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_2",
@@ -14175,7 +14423,7 @@
           "svg_id": "Blood_Vessel_2",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_3",
@@ -14183,7 +14431,7 @@
           "svg_id": "Blood_Vessel_3",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_4",
@@ -14191,7 +14439,7 @@
           "svg_id": "Blood_Vessel_4",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_5",
@@ -14199,7 +14447,7 @@
           "svg_id": "Blood_Vessel_5",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_6",
@@ -14207,7 +14455,7 @@
           "svg_id": "Blood_Vessel_6",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-dermal-papilla#Blood_Vessel_7",
@@ -14215,7 +14463,7 @@
           "svg_id": "Blood_Vessel_7",
           "svg_group_id": "Blood_Vessel",
           "label": "endothelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000115"
         }
       ]
     },
@@ -14230,19 +14478,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-epidermal-ridge.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-epidermal-ridge.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-skin-epidermal-ridge.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-skin-epidermal-ridge.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -15108,280 +15356,280 @@
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_1",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_2",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_2",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_3",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_3",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_4",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_4",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_5",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_5",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_6",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_6",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_7",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_7",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_8",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_8",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_9",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_9",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_10",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_10",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_11",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_11",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_12",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_12",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_13",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_13",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_14",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_14",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_15",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_15",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_16",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_16",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_17",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_17",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_18",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_18",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_19",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_19",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_20",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_20",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_21",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_21",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_22",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_22",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_23",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_23",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_24",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_24",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_25",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_25",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_26",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_26",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_27",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_27",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_28",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_28",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_29",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_29",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_30",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_30",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_31",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_31",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_32",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_32",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_33",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_33",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_34",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_34",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Basal_Cell_35",
           "@type": "FtuIllustrationNode",
           "svg_id": "Basal_Cell_35",
           "svg_group_id": "Basal_Cell",
-          "label": "basal cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0000646"
+          "label": "basal cell of epidermis",
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0002187"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/skin-epidermal-ridge#Merkel_Cell_1",
@@ -15444,8 +15692,20 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/small-intestine-villus#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-small-intestine-villus.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-small-intestine-villus.svg",
           "file_format": "image/svg+xml"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/small-intestine-villus#png_file",
+          "@type": "FtuIllustrationFile",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-small-intestine-villus.png",
+          "file_format": "image/png"
+        },
+        {
+          "@id": "https://purl.humanatlas.io/2d-ftu/small-intestine-villus#ai_file",
+          "@type": "FtuIllustrationFile",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-small-intestine-villus.ai",
+          "file_format": "application/pdf"
         }
       ],
       "mapping": [
@@ -20766,19 +21026,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-red-pulp#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-red-pulp.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-red-pulp.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-red-pulp#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-red-pulp.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-red-pulp.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-red-pulp#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-red-pulp.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-red-pulp.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -21500,19 +21760,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-white-pulp#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-white-pulp.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-white-pulp.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-white-pulp#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-white-pulp.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-white-pulp.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/spleen-white-pulp#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-spleen-white-pulp.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-spleen-white-pulp.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -25994,19 +26254,19 @@
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#svg_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-thymus-thymus-lobule.svg",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-thymus-thymus-lobule.svg",
           "file_format": "image/svg+xml"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#png_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-thymus-thymus-lobule.png",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-thymus-thymus-lobule.png",
           "file_format": "image/png"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#ai_file",
           "@type": "FtuIllustrationFile",
-          "file": "assets/TEMP/temp-svgs/2d-ftu-thymus-thymus-lobule.ai",
+          "file": "https://cdn.humanatlas.io/hra-releases/v2.0/2d-ftu/2d-ftu-thymus-thymus-lobule.ai",
           "file_format": "application/pdf"
         }
       ],
@@ -28273,7 +28533,7 @@
           "svg_id": "T_Cell_1",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_2",
@@ -28281,7 +28541,7 @@
           "svg_id": "T_Cell_2",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_3",
@@ -28289,7 +28549,7 @@
           "svg_id": "T_Cell_3",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_4",
@@ -28297,7 +28557,7 @@
           "svg_id": "T_Cell_4",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_5",
@@ -28305,7 +28565,7 @@
           "svg_id": "T_Cell_5",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_6",
@@ -28313,7 +28573,7 @@
           "svg_id": "T_Cell_6",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_7",
@@ -28321,7 +28581,7 @@
           "svg_id": "T_Cell_7",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_8",
@@ -28329,7 +28589,7 @@
           "svg_id": "T_Cell_8",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_9",
@@ -28337,7 +28597,7 @@
           "svg_id": "T_Cell_9",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_10",
@@ -28345,7 +28605,7 @@
           "svg_id": "T_Cell_10",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_11",
@@ -28353,7 +28613,7 @@
           "svg_id": "T_Cell_11",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_12",
@@ -28361,7 +28621,7 @@
           "svg_id": "T_Cell_12",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_13",
@@ -28369,7 +28629,7 @@
           "svg_id": "T_Cell_13",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_14",
@@ -28377,7 +28637,7 @@
           "svg_id": "T_Cell_14",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_15",
@@ -28385,7 +28645,7 @@
           "svg_id": "T_Cell_15",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_16",
@@ -28393,7 +28653,7 @@
           "svg_id": "T_Cell_16",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_17",
@@ -28401,7 +28661,7 @@
           "svg_id": "T_Cell_17",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_18",
@@ -28409,7 +28669,7 @@
           "svg_id": "T_Cell_18",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_19",
@@ -28417,7 +28677,7 @@
           "svg_id": "T_Cell_19",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_20",
@@ -28425,7 +28685,7 @@
           "svg_id": "T_Cell_20",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_21",
@@ -28433,7 +28693,7 @@
           "svg_id": "T_Cell_21",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_22",
@@ -28441,7 +28701,7 @@
           "svg_id": "T_Cell_22",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_23",
@@ -28449,7 +28709,7 @@
           "svg_id": "T_Cell_23",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_24",
@@ -28457,7 +28717,7 @@
           "svg_id": "T_Cell_24",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_25",
@@ -28465,7 +28725,7 @@
           "svg_id": "T_Cell_25",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_26",
@@ -28473,7 +28733,7 @@
           "svg_id": "T_Cell_26",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_27",
@@ -28481,7 +28741,7 @@
           "svg_id": "T_Cell_27",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_28",
@@ -28489,7 +28749,7 @@
           "svg_id": "T_Cell_28",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#T_Cell_29",
@@ -28497,7 +28757,7 @@
           "svg_id": "T_Cell_29",
           "svg_group_id": "T_Cells",
           "label": "T cell",
-          "representation_of": ""
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0000084"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Medullary_Thymocytes_1",
@@ -29673,7 +29933,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_1",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_2",
@@ -29681,7 +29941,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_2",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_3",
@@ -29689,7 +29949,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_3",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_4",
@@ -29697,7 +29957,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_4",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_5",
@@ -29705,7 +29965,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_5",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_6",
@@ -29713,7 +29973,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_6",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_7",
@@ -29721,7 +29981,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_7",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_8",
@@ -29729,7 +29989,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_8",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_9",
@@ -29737,7 +29997,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_9",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_10",
@@ -29745,7 +30005,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_10",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_11",
@@ -29753,7 +30013,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_11",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_12",
@@ -29761,7 +30021,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_12",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_13",
@@ -29769,7 +30029,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_13",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_14",
@@ -29777,7 +30037,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_14",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_15",
@@ -29785,7 +30045,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_15",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_16",
@@ -29793,7 +30053,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_16",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_17",
@@ -29801,7 +30061,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_17",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_18",
@@ -29809,7 +30069,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_18",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_19",
@@ -29817,7 +30077,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_19",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_20",
@@ -29825,7 +30085,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_20",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_21",
@@ -29833,7 +30093,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_21",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_22",
@@ -29841,7 +30101,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_22",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_23",
@@ -29849,7 +30109,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_23",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_24",
@@ -29857,7 +30117,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_24",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_25",
@@ -29865,7 +30125,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_25",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_26",
@@ -29873,7 +30133,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_26",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_27",
@@ -29881,7 +30141,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_27",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_28",
@@ -29889,7 +30149,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_28",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_29",
@@ -29897,7 +30157,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_29",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_30",
@@ -29905,7 +30165,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_30",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_31",
@@ -29913,7 +30173,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_31",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_32",
@@ -29921,7 +30181,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_32",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_33",
@@ -29929,7 +30189,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_33",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_34",
@@ -29937,7 +30197,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_34",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_35",
@@ -29945,7 +30205,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_35",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_36",
@@ -29953,7 +30213,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_36",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_37",
@@ -29961,7 +30221,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_37",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_38",
@@ -29969,7 +30229,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_38",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_39",
@@ -29977,7 +30237,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_39",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_40",
@@ -29985,7 +30245,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_40",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_41",
@@ -29993,7 +30253,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_41",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_42",
@@ -30001,7 +30261,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_42",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_43",
@@ -30009,7 +30269,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_43",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_44",
@@ -30017,7 +30277,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_44",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Corticomedullary_Thymic_Epithelial_Cell_45",
@@ -30025,7 +30285,7 @@
           "svg_id": "Corticomedullary_Thymic_Epithelial_Cell_45",
           "svg_group_id": "Corticomedullary_Thymic_Epithelial_Cell",
           "label": "corticomedullary thymic epithelial cell",
-          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070 "
+          "representation_of": "http://purl.obolibrary.org/obo/CL_0009070"
         },
         {
           "@id": "https://purl.humanatlas.io/2d-ftu/thymus-thymus-lobule#Dendritic_Cell_1",
diff --git a/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts b/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts
index 9509f5603..c66aa0a07 100644
--- a/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts
+++ b/libs/cdk/state/src/resource-registry/resource-registry.selectors.ts
@@ -111,6 +111,9 @@ export class ResourceRegistrySelectors {
    */
   @Selector([ResourceRegistrySelectors.field, BaseHrefSelectors.baseHref])
   static url(getField: FieldQuery, baseHref: string): DataQuery<string> {
-    return (id) => baseHref + getField(id, BuiltinResourceType.Url, 'url', '');
+    return (id) => {
+      const relUrl = getField(id, BuiltinResourceType.Url, 'url', '');
+      return relUrl !== '' ? baseHref + relUrl : '';
+    };
   }
 }
diff --git a/libs/components/molecules/src/lib/header/header.component.html b/libs/components/molecules/src/lib/header/header.component.html
index 4e97001e7..d77215d54 100644
--- a/libs/components/molecules/src/lib/header/header.component.html
+++ b/libs/components/molecules/src/lib/header/header.component.html
@@ -1,5 +1,5 @@
 <a class="product" matRipple [hraLink]="productTitleLink">
-  <img class="logo image" [src]="productLogoUrl" alt="Prodoct Logo" aria-hidden="true" />
+  <img class="logo image" [src]="productLogoUrl" alt="Product Logo" aria-hidden="true" />
   <h1 class="text">{{ productTitle }}</h1>
 </a>
 <h1 class="app text">{{ appTitle }}</h1>

From f59ad488d1b4073f1bb865a6c363cddfd14b1c92 Mon Sep 17 00:00:00 2001
From: edlu77 <eddd.lu@gmail.com>
Date: Mon, 11 Dec 2023 12:38:47 -0500
Subject: [PATCH 5/6] Testing + documentation + bug fixes

---
 .../src/app/app.component.spec.ts             | 21 +++++++--
 apps/ftu-ui-small-wc/src/app/app.component.ts | 29 +-----------
 apps/ftu-ui/src/app/app.component.spec.ts     | 25 ++++------
 apps/ftu-ui/src/app/app.component.ts          | 47 +------------------
 libs/cdk/src/lib/link/link.directive.ts       | 15 +++---
 .../src/base-href/base-href.selectors.ts      |  5 ++
 .../state/src/base-href/base-href.state.ts    |  6 ++-
 .../resource-registry.selectors.spec.ts       |  2 +-
 libs/services/src/lib/shared/common.model.ts  |  6 +++
 9 files changed, 55 insertions(+), 101 deletions(-)

diff --git a/apps/ftu-ui-small-wc/src/app/app.component.spec.ts b/apps/ftu-ui-small-wc/src/app/app.component.spec.ts
index 663a8e27e..2de15b933 100644
--- a/apps/ftu-ui-small-wc/src/app/app.component.spec.ts
+++ b/apps/ftu-ui-small-wc/src/app/app.component.spec.ts
@@ -1,14 +1,17 @@
+import { TestBed } from '@angular/core/testing';
 import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { dispatch, dispatch$, dispatchAction$, select$, selectSnapshot } from '@hra-ui/cdk/injectors';
-import { of } from 'rxjs';
+import { LinkRegistryActions } from '@hra-ui/cdk/state';
+import { FTU_DATA_IMPL_ENDPOINTS, FtuDataImplEndpoints } from '@hra-ui/services';
+import { ActiveFtuActions, TissueLibraryActions } from '@hra-ui/state';
+import { mock } from 'jest-mock-extended';
+import { of, ReplaySubject } from 'rxjs';
 import { Shallow } from 'shallow-render';
+
 import { AppComponent } from './app.component';
 import { initFactory } from './app.init';
 import { NavigationLessRouter } from './routing/simple-router.service';
-import { FTU_DATA_IMPL_ENDPOINTS } from '@hra-ui/services';
-import { LinkRegistryActions } from '@hra-ui/cdk/state';
-import { ActiveFtuActions, TissueLibraryActions } from '@hra-ui/state';
 
 jest.mock('@hra-ui/cdk/injectors');
 
@@ -18,10 +21,20 @@ describe('AppComponent', () => {
   beforeEach(() => {
     jest.clearAllMocks();
 
+    TestBed.configureTestingModule({
+      providers: [
+        {
+          provide: FTU_DATA_IMPL_ENDPOINTS,
+          useValue: mock<ReplaySubject<FtuDataImplEndpoints>>({ next: () => undefined }),
+        },
+      ],
+    });
+
     jest.mocked(selectSnapshot).mockReturnValue(jest.fn());
     jest.mocked(dispatch).mockReturnValue(jest.fn());
     jest.mocked(select$).mockReturnValue(of());
     jest.mocked(dispatch$).mockReturnValue(jest.fn(() => of({})));
+
     shallow = new Shallow(AppComponent)
       .provideMock(Router, NavigationLessRouter)
       .provide([
diff --git a/apps/ftu-ui-small-wc/src/app/app.component.ts b/apps/ftu-ui-small-wc/src/app/app.component.ts
index faf700134..15bb6653a 100644
--- a/apps/ftu-ui-small-wc/src/app/app.component.ts
+++ b/apps/ftu-ui-small-wc/src/app/app.component.ts
@@ -10,13 +10,7 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import { dispatch, dispatch$, select$, selectSnapshot } from '@hra-ui/cdk/injectors';
-import {
-  BaseHrefActions,
-  createLinkId,
-  LinkRegistryActions,
-  LinkType,
-  ResourceRegistryActions,
-} from '@hra-ui/cdk/state';
+import { BaseHrefActions, createLinkId, LinkRegistryActions, ResourceRegistryActions } from '@hra-ui/cdk/state';
 import {
   BiomarkerDetailsWcComponent,
   FooterBehaviorComponent,
@@ -30,7 +24,6 @@ import {
   ActiveFtuActions,
   ActiveFtuSelectors,
   IllustratorSelectors,
-  LinkIds,
   ScreenModeAction,
   ScreenModeSelectors,
   TissueLibraryActions,
@@ -99,25 +92,7 @@ export class AppComponent implements OnInit, OnChanges {
   ngOnInit() {
     const { baseHref } = this;
     this.setBaseHref(this.baseHref);
-    // this.loadLinks(setUrl(this.linksYamlUrl, baseHref)); //TODO: Fix this
-    this.addMany({
-      [LinkIds.LandingPage]: {
-        type: LinkType.Internal,
-        commands: ['/'],
-      },
-      [createLinkId('FTU')]: {
-        type: LinkType.Internal,
-        commands: ['ftu/'],
-      },
-      [LinkIds.Portal]: {
-        type: LinkType.External,
-        url: 'https://humanatlas.io/',
-      },
-      [LinkIds.Embed]: {
-        type: LinkType.External,
-        url: 'https://github.com/hubmapconsortium/hra-ui#readme',
-      },
-    });
+    this.loadLinks(setUrl(this.linksYamlUrl, baseHref));
     this.loadResources(setUrl(this.resourcesYamlUrl, baseHref));
     this.endpoints.next({
       illustrations: setUrl(this.illustrationsUrl, baseHref),
diff --git a/apps/ftu-ui/src/app/app.component.spec.ts b/apps/ftu-ui/src/app/app.component.spec.ts
index 94f46359b..b348c78a4 100644
--- a/apps/ftu-ui/src/app/app.component.spec.ts
+++ b/apps/ftu-ui/src/app/app.component.spec.ts
@@ -1,24 +1,26 @@
+import { ENVIRONMENT_INITIALIZER } from '@angular/core';
+import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { dispatch, dispatch$, dispatchAction$, select$, selectQuerySnapshot } from '@hra-ui/cdk/injectors';
+import { LinkRegistryActions } from '@hra-ui/cdk/state';
+import { FTU_DATA_IMPL_ENDPOINTS } from '@hra-ui/services';
+import { ActiveFtuActions, TissueLibraryActions } from '@hra-ui/state';
+import { mock } from 'jest-mock-extended';
 import { of } from 'rxjs';
 import { Shallow } from 'shallow-render';
+
 import { AppComponent } from './app.component';
 import { initFactory } from './app.init';
 import { AppModule } from './app.module';
-import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { mock } from 'jest-mock-extended';
-import { LinkRegistryActions } from '@hra-ui/cdk/state';
-import { ENVIRONMENT_INITIALIZER } from '@angular/core';
-import { ActiveFtuActions, TissueLibraryActions } from '@hra-ui/state';
-import { FTU_DATA_IMPL_ENDPOINTS } from '@hra-ui/services';
 
 jest.mock('@hra-ui/cdk/injectors');
 
 describe('AppComponent', () => {
   const dialog = mock<MatDialog>();
   const postRef = mock<MatDialogRef<void>>({ afterClosed: () => of(undefined) });
+
   let shallow: Shallow<AppComponent>;
 
   beforeEach(() => {
@@ -32,16 +34,7 @@ describe('AppComponent', () => {
       .replaceModule(RouterModule, RouterTestingModule)
       .replaceModule(BrowserAnimationsModule, NoopAnimationsModule)
       .dontMock(MatDialogModule)
-      .provide([
-        {
-          provide: FTU_DATA_IMPL_ENDPOINTS,
-          useClass: {
-            datasets: '',
-            illustrations: '',
-            summaries: '',
-          },
-        },
-      ])
+      .dontMock(FTU_DATA_IMPL_ENDPOINTS)
       .provideMock({ provide: MatDialog, useValue: dialog })
       .dontMock(ENVIRONMENT_INITIALIZER);
   });
diff --git a/apps/ftu-ui/src/app/app.component.ts b/apps/ftu-ui/src/app/app.component.ts
index 49e132ecf..2bde4cfe6 100644
--- a/apps/ftu-ui/src/app/app.component.ts
+++ b/apps/ftu-ui/src/app/app.component.ts
@@ -17,7 +17,6 @@ import {
   BaseHrefActions,
   createLinkId,
   LinkRegistryActions,
-  LinkType,
   ResourceRegistryActions,
   StorageId,
   StorageSelectors,
@@ -28,8 +27,6 @@ import {
   ActiveFtuActions,
   ActiveFtuSelectors,
   IllustratorSelectors,
-  LinkIds,
-  ScreenModeAction,
   TissueLibraryActions,
   TissueLibrarySelectors,
 } from '@hra-ui/state';
@@ -77,10 +74,8 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
 
   private readonly setBaseHref = dispatch(BaseHrefActions.Set);
   private readonly loadLinks = dispatch(LinkRegistryActions.LoadFromYaml);
-  private readonly addMany = dispatch(LinkRegistryActions.AddMany);
   private readonly loadResources = dispatch(ResourceRegistryActions.LoadFromYaml);
   private readonly navigateToOrgan = dispatch(LinkRegistryActions.Navigate);
-  private readonly setScreenSmall = dispatch(ScreenModeAction.SetSize);
   private readonly reloadDataSets = dispatch(TissueLibraryActions.Load);
   private readonly reloadActiveFtu = dispatch(ActiveFtuActions.Load);
 
@@ -131,47 +126,7 @@ export class AppComponent implements AfterContentInit, OnChanges, OnInit {
   ngOnInit() {
     const { baseHref } = this;
     this.setBaseHref(this.baseHref);
-    // this.loadLinks(setUrl(this.linksYamlUrl, baseHref)); //TODO: Fix this
-    this.addMany({
-      [LinkIds.LandingPage]: {
-        type: LinkType.Internal,
-        commands: ['/'],
-      },
-      [LinkIds.ProductTitle]: {
-        type: LinkType.Internal,
-        commands: ['/'],
-      },
-      [createLinkId('FTU')]: {
-        type: LinkType.Internal,
-        commands: ['ftu/'],
-      },
-      [LinkIds.About]: {
-        type: LinkType.External,
-        url: 'https://humanatlas.io/',
-      },
-      [LinkIds.ExploreFTU]: {
-        type: LinkType.Internal,
-        commands: ['ftu/'],
-        extras: {
-          queryParams: {
-            id: 'https://purl.humanatlas.io/2d-ftu/lung-bronchial-submucosal-gland',
-          },
-        },
-      },
-      [LinkIds.Portal]: {
-        type: LinkType.External,
-        url: 'https://humanatlas.io/',
-      },
-      [LinkIds.LandingPageReadMore]: {
-        type: LinkType.External,
-        url: 'https://humanatlas.io/2d-ftu-illustrations',
-      },
-      [LinkIds.Embed]: {
-        type: LinkType.External,
-        url: 'https://github.com/hubmapconsortium/hra-ui#readme',
-      },
-    });
-
+    this.loadLinks(setUrl(this.linksYamlUrl, baseHref));
     this.loadResources(setUrl(this.resourcesYamlUrl, baseHref));
     this.endpoints.next({
       illustrations: setUrl(this.illustrationsUrl, baseHref),
diff --git a/libs/cdk/src/lib/link/link.directive.ts b/libs/cdk/src/lib/link/link.directive.ts
index 05261cbd8..182f9e9f6 100644
--- a/libs/cdk/src/lib/link/link.directive.ts
+++ b/libs/cdk/src/lib/link/link.directive.ts
@@ -1,4 +1,4 @@
-import { Directive, ElementRef, HostBinding, HostListener, inject, Injector, Input, OnChanges } from '@angular/core';
+import { Directive, DoCheck, ElementRef, HostBinding, HostListener, inject, Injector, Input } from '@angular/core';
 import { ActivatedRoute, Params, QueryParamsHandling, UrlCreationOptions } from '@angular/router';
 import { dispatch, selectQuerySnapshot } from '@hra-ui/cdk/injectors';
 import { EMPTY_LINK, LinkEntry, LinkRegistryActions, LinkRegistrySelectors, LinkType } from '@hra-ui/cdk/state';
@@ -9,7 +9,7 @@ import { createExternalUrl, createInternalUrl } from '@hra-ui/utils';
   selector: '[hraLink]',
   standalone: true,
 })
-export class LinkDirective implements OnChanges {
+export class LinkDirective implements DoCheck {
   /** linkId with empty string as default value */
   @Input('hraLink') linkId = EMPTY_LINK;
 
@@ -64,8 +64,11 @@ export class LinkDirective implements OnChanges {
   }
 
   /** Updates the current link/url based on the inputs */
-  ngOnChanges(): void {
-    this.updateLink();
+  ngDoCheck(): void {
+    const link = this.queryLink(this.linkId);
+    if (this.link !== link) {
+      this.updateLink(link);
+    }
   }
 
   /**
@@ -92,8 +95,8 @@ export class LinkDirective implements OnChanges {
   }
 
   /** Updates the link entry and bound attributes */
-  private updateLink(): void {
-    const link = (this.link = this.queryLink(this.linkId));
+  private updateLink(link?: LinkEntry): void {
+    this.link = link;
     ({ href: this.href, rel: this.rel, target: this.target } = this.getLinkAttributes(link));
   }
 
diff --git a/libs/cdk/state/src/base-href/base-href.selectors.ts b/libs/cdk/state/src/base-href/base-href.selectors.ts
index b35c44fe5..303f830f7 100644
--- a/libs/cdk/state/src/base-href/base-href.selectors.ts
+++ b/libs/cdk/state/src/base-href/base-href.selectors.ts
@@ -3,6 +3,11 @@ import { BaseHrefState } from './base-href.state';
 
 /** Selectors for BaseHrefState */
 export class BaseHrefSelectors {
+  /**
+   * Returns base href value
+   * @param value href value
+   * @returns href value
+   */
   @Selector([BaseHrefState])
   static baseHref(value: string): string {
     return value;
diff --git a/libs/cdk/state/src/base-href/base-href.state.ts b/libs/cdk/state/src/base-href/base-href.state.ts
index dbfb4d2d6..70f2ea719 100644
--- a/libs/cdk/state/src/base-href/base-href.state.ts
+++ b/libs/cdk/state/src/base-href/base-href.state.ts
@@ -11,12 +11,16 @@ import { Set } from './base-href.actions';
 })
 @Injectable()
 export class BaseHrefState {
+  /**
+   * Sets base href value
+   * @param ctx state context
+   * @param { baseHref } href value
+   */
   @Action(Set)
   setBaseHref(ctx: StateContext<string>, { baseHref }: Set) {
     if (baseHref !== '' && !baseHref.endsWith('/')) {
       baseHref = baseHref + '/';
     }
-
     ctx.setState(baseHref);
   }
 }
diff --git a/libs/cdk/state/src/resource-registry/resource-registry.selectors.spec.ts b/libs/cdk/state/src/resource-registry/resource-registry.selectors.spec.ts
index f7f5ebab5..ac5689399 100644
--- a/libs/cdk/state/src/resource-registry/resource-registry.selectors.spec.ts
+++ b/libs/cdk/state/src/resource-registry/resource-registry.selectors.spec.ts
@@ -121,7 +121,7 @@ describe('ResourceRegistrySelectors', () => {
 
   describe('url()', () => {
     const field = ResourceRegistrySelectors.field(state);
-    const url = ResourceRegistrySelectors.url(field);
+    const url = ResourceRegistrySelectors.url(field, '');
 
     it('should return url from id', () => {
       expect(url(urlId)).toEqual('http://google.com');
diff --git a/libs/services/src/lib/shared/common.model.ts b/libs/services/src/lib/shared/common.model.ts
index a9f456d93..aad1b412e 100644
--- a/libs/services/src/lib/shared/common.model.ts
+++ b/libs/services/src/lib/shared/common.model.ts
@@ -12,6 +12,12 @@ export type Url = z.infer<typeof URL>;
 /** Same as an Url */
 export type Iri = z.infer<typeof IRI>;
 
+/**
+ * Returns url with base href value
+ * @param url url
+ * @param baseHref base href
+ * @returns updated url
+ */
 export function setUrl(url: string, baseHref: string): Url {
   if (url.startsWith('http')) {
     return url as Url;

From 3b89694ce34dcbfc1a8cf5119558cb0c5ca17fe2 Mon Sep 17 00:00:00 2001
From: edlu77 <eddd.lu@gmail.com>
Date: Mon, 11 Dec 2023 13:11:15 -0500
Subject: [PATCH 6/6] FIx test

---
 .../landing-page-content.component.spec.ts                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.spec.ts b/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.spec.ts
index 5b6b809bc..099c1a97e 100644
--- a/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.spec.ts
+++ b/libs/components/behavioral/src/lib/landing-page-content/landing-page-content.component.spec.ts
@@ -1,14 +1,16 @@
-import { dispatch, injectDestroy$, selectQuerySnapshot } from '@hra-ui/cdk/injectors';
+import { dispatch, injectDestroy$, selectQuerySnapshot, selectSnapshot } from '@hra-ui/cdk/injectors';
+import { FTU_DATA_IMPL_ENDPOINTS } from '@hra-ui/services';
 import { Subject } from 'rxjs';
 import { Shallow } from 'shallow-render';
+
 import { LandingPageContentComponent } from './landing-page-content.component';
-import { FTU_DATA_IMPL_ENDPOINTS } from '@hra-ui/services';
 
 jest.mock('@hra-ui/cdk/injectors');
 
 describe('LandingPageContentComponent', () => {
   let shallow: Shallow<LandingPageContentComponent>;
   jest.mocked(selectQuerySnapshot).mockReturnValue(jest.fn());
+  jest.mocked(selectSnapshot).mockReturnValue(jest.fn());
   jest.mocked(dispatch).mockReturnValue(jest.fn());
 
   const destroy$ = new Subject<void>();