diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 42afe78881..a7148cbc74 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -1,19 +1,21 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 
 import { Collection } from "../core/shared/collection.model";
 import { Bitstream } from "../core/shared/bitstream.model";
 import { RemoteData } from "../core/data/remote-data";
 import { CollectionDataService } from "../core/data/collection-data.service";
+import { Subscription } from "rxjs/Subscription";
 
 @Component({
   selector: 'ds-collection-page',
   styleUrls: ['./collection-page.component.css'],
   templateUrl: './collection-page.component.html',
 })
-export class CollectionPageComponent implements OnInit {
+export class CollectionPageComponent implements OnInit, OnDestroy {
   collectionData: RemoteData<Collection>;
   logoData: RemoteData<Bitstream>;
+  private subs: Subscription[] = [];
 
   constructor(
     private collectionDataService: CollectionDataService,
@@ -24,12 +26,16 @@ export class CollectionPageComponent implements OnInit {
 
   ngOnInit(): void {
     this.route.params.subscribe((params: Params) => {
-      this.collectionData = this.collectionDataService.findById(params['id'])
-      this.collectionData.payload
-        .subscribe(collection => this.logoData = collection.logo);
+      this.collectionData = this.collectionDataService.findById(params['id']);
+      this.subs.push(this.collectionData.payload
+        .subscribe(collection => this.logoData = collection.logo));
     });
   }
 
+  ngOnDestroy(): void {
+    this.subs.forEach(sub => sub.unsubscribe());
+  }
+
   universalInit() {
   }
 }
diff --git a/src/app/core/cache/builders/build-decorators.ts b/src/app/core/cache/builders/build-decorators.ts
index 00cb50663a..f00d8d87e5 100644
--- a/src/app/core/cache/builders/build-decorators.ts
+++ b/src/app/core/cache/builders/build-decorators.ts
@@ -1,7 +1,7 @@
 import "reflect-metadata";
 import { GenericConstructor } from "../../shared/generic-constructor";
 import { CacheableObject } from "../object-cache.reducer";
-import { NormalizedDSOType } from "../models/normalized-dspace-object-type";
+import { ResourceType } from "../../shared/resource-type";
 
 const mapsToMetadataKey = Symbol("mapsTo");
 const relationshipKey = Symbol("relationship");
@@ -16,7 +16,7 @@ export const getMapsTo = function(target: any) {
   return Reflect.getOwnMetadata(mapsToMetadataKey, target);
 };
 
-export const relationship = function(value: NormalizedDSOType): any {
+export const relationship = function(value: ResourceType): any {
   return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
     if (!target || !propertyKey) {
       return;
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 4a70f05166..2096d47459 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -13,7 +13,8 @@ import { Observable } from "rxjs/Observable";
 import { RemoteData } from "../../data/remote-data";
 import { GenericConstructor } from "../../shared/generic-constructor";
 import { getMapsTo, getResourceType, getRelationships } from "./build-decorators";
-import { NormalizedDSOFactory } from "../models/normalized-dspace-object-factory";
+import { NormalizedObjectFactory } from "../models/normalized-object-factory";
+import { Request } from "../../data/request.models";
 
 @Injectable()
 export class RemoteDataBuildService {
@@ -124,13 +125,13 @@ export class RemoteDataBuildService {
     relationships.forEach((relationship: string) => {
       if (hasValue(normalized[relationship])) {
         const resourceType = getResourceType(normalized, relationship);
-        const resourceConstructor = NormalizedDSOFactory.getConstructor(resourceType);
+        const resourceConstructor = NormalizedObjectFactory.getConstructor(resourceType);
         if (Array.isArray(normalized[relationship])) {
           // without the setTimeout, the actions inside requestService.configure
           // are dispatched, but sometimes don't arrive. I'm unsure why atm.
           setTimeout(() => {
             normalized[relationship].forEach((href: string) => {
-              this.requestService.configure(href, resourceConstructor)
+              this.requestService.configure(new Request(href))
             });
           }, 0);
 
@@ -145,7 +146,7 @@ export class RemoteDataBuildService {
           // without the setTimeout, the actions inside requestService.configure
           // are dispatched, but sometimes don't arrive. I'm unsure why atm.
           setTimeout(() => {
-            this.requestService.configure(normalized[relationship], resourceConstructor);
+            this.requestService.configure(new Request(normalized[relationship]));
           },0);
 
           links[relationship] = this.buildSingle(normalized[relationship], resourceConstructor);
diff --git a/src/app/core/cache/models/normalized-bundle.model.ts b/src/app/core/cache/models/normalized-bundle.model.ts
index bb0e7b0708..6333428227 100644
--- a/src/app/core/cache/models/normalized-bundle.model.ts
+++ b/src/app/core/cache/models/normalized-bundle.model.ts
@@ -2,7 +2,7 @@ import { autoserialize, inheritSerialization } from "cerialize";
 import { NormalizedDSpaceObject } from "./normalized-dspace-object.model";
 import { Bundle } from "../../shared/bundle.model";
 import { mapsTo, relationship } from "../builders/build-decorators";
-import { NormalizedDSOType } from "./normalized-dspace-object-type";
+import { ResourceType } from "../../shared/resource-type";
 
 @mapsTo(Bundle)
 @inheritSerialization(NormalizedDSpaceObject)
@@ -11,7 +11,7 @@ export class NormalizedBundle extends NormalizedDSpaceObject {
    * The primary bitstream of this Bundle
    */
   @autoserialize
-  @relationship(NormalizedDSOType.NormalizedBitstream)
+  @relationship(ResourceType.Bitstream)
   primaryBitstream: string;
 
   /**
@@ -25,6 +25,6 @@ export class NormalizedBundle extends NormalizedDSpaceObject {
   owner: string;
 
   @autoserialize
-  @relationship(NormalizedDSOType.NormalizedBitstream)
+  @relationship(ResourceType.Bitstream)
   bitstreams: Array<string>;
 }
diff --git a/src/app/core/cache/models/normalized-collection.model.ts b/src/app/core/cache/models/normalized-collection.model.ts
index cc6a4173e8..2114e4cc43 100644
--- a/src/app/core/cache/models/normalized-collection.model.ts
+++ b/src/app/core/cache/models/normalized-collection.model.ts
@@ -2,7 +2,7 @@ import { autoserialize, inheritSerialization, autoserializeAs } from "cerialize"
 import { NormalizedDSpaceObject } from "./normalized-dspace-object.model";
 import { Collection } from "../../shared/collection.model";
 import { mapsTo, relationship } from "../builders/build-decorators";
-import { NormalizedDSOType } from "./normalized-dspace-object-type";
+import { ResourceType } from "../../shared/resource-type";
 
 @mapsTo(Collection)
 @inheritSerialization(NormalizedDSpaceObject)
@@ -18,7 +18,7 @@ export class NormalizedCollection extends NormalizedDSpaceObject {
    * The Bitstream that represents the logo of this Collection
    */
   @autoserialize
-  @relationship(NormalizedDSOType.NormalizedBitstream)
+  @relationship(ResourceType.Bitstream)
   logo: string;
 
   /**
@@ -32,7 +32,7 @@ export class NormalizedCollection extends NormalizedDSpaceObject {
   owner: string;
 
   @autoserialize
-  @relationship(NormalizedDSOType.NormalizedItem)
+  @relationship(ResourceType.Item)
   items: Array<string>;
 
 }
diff --git a/src/app/core/cache/models/normalized-community.model.ts b/src/app/core/cache/models/normalized-community.model.ts
index e691f30fec..c5005a25e0 100644
--- a/src/app/core/cache/models/normalized-community.model.ts
+++ b/src/app/core/cache/models/normalized-community.model.ts
@@ -2,7 +2,7 @@ import { autoserialize, inheritSerialization, autoserializeAs } from "cerialize"
 import { NormalizedDSpaceObject } from "./normalized-dspace-object.model";
 import { Community } from "../../shared/community.model";
 import { mapsTo, relationship } from "../builders/build-decorators";
-import { NormalizedDSOType } from "./normalized-dspace-object-type";
+import { ResourceType } from "../../shared/resource-type";
 
 @mapsTo(Community)
 @inheritSerialization(NormalizedDSpaceObject)
@@ -18,7 +18,7 @@ export class NormalizedCommunity extends NormalizedDSpaceObject {
    * The Bitstream that represents the logo of this Community
    */
   @autoserialize
-  @relationship(NormalizedDSOType.NormalizedBitstream)
+  @relationship(ResourceType.Bitstream)
   logo: string;
 
   /**
@@ -32,7 +32,7 @@ export class NormalizedCommunity extends NormalizedDSpaceObject {
   owner: string;
 
   @autoserialize
-  @relationship(NormalizedDSOType.NormalizedCollection)
+  @relationship(ResourceType.Collection)
   collections: Array<string>;
 
 }
diff --git a/src/app/core/cache/models/normalized-dspace-object-type.ts b/src/app/core/cache/models/normalized-dspace-object-type.ts
deleted file mode 100644
index 8ac9215b44..0000000000
--- a/src/app/core/cache/models/normalized-dspace-object-type.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export enum NormalizedDSOType {
-  NormalizedBitstream,
-  NormalizedBundle,
-  NormalizedItem,
-  NormalizedCollection,
-  NormalizedCommunity
-}
diff --git a/src/app/core/cache/models/normalized-dspace-object.model.ts b/src/app/core/cache/models/normalized-dspace-object.model.ts
index 17aa2d3d8c..f4b879c01a 100644
--- a/src/app/core/cache/models/normalized-dspace-object.model.ts
+++ b/src/app/core/cache/models/normalized-dspace-object.model.ts
@@ -1,6 +1,7 @@
 import { autoserialize, autoserializeAs } from "cerialize";
 import { CacheableObject } from "../object-cache.reducer";
 import { Metadatum } from "../../shared/metadatum.model";
+import { ResourceType } from "../../shared/resource-type";
 
 /**
  * An abstract model class for a DSpaceObject.
@@ -26,7 +27,7 @@ export abstract class NormalizedDSpaceObject implements CacheableObject {
    * A string representing the kind of DSpaceObject, e.g. community, item, …
    */
   @autoserialize
-  type: string;
+  type: ResourceType;
 
   /**
    * The name for this DSpaceObject
@@ -49,5 +50,6 @@ export abstract class NormalizedDSpaceObject implements CacheableObject {
   /**
    * The DSpaceObject that owns this DSpaceObject
    */
+  @autoserialize
   owner: string;
 }
diff --git a/src/app/core/cache/models/normalized-item.model.ts b/src/app/core/cache/models/normalized-item.model.ts
index cdd3acdb92..15b4822cdf 100644
--- a/src/app/core/cache/models/normalized-item.model.ts
+++ b/src/app/core/cache/models/normalized-item.model.ts
@@ -2,7 +2,7 @@ import { inheritSerialization, autoserialize } from "cerialize";
 import { NormalizedDSpaceObject } from "./normalized-dspace-object.model";
 import { Item } from "../../shared/item.model";
 import { mapsTo, relationship } from "../builders/build-decorators";
-import { NormalizedDSOType } from "./normalized-dspace-object-type";
+import { ResourceType } from "../../shared/resource-type";
 
 @mapsTo(Item)
 @inheritSerialization(NormalizedDSpaceObject)
@@ -33,7 +33,7 @@ export class NormalizedItem extends NormalizedDSpaceObject {
    * An array of Collections that are direct parents of this Item
    */
   @autoserialize
-  @relationship(NormalizedDSOType.NormalizedCollection)
+  @relationship(ResourceType.Collection)
   parents: Array<string>;
 
   /**
@@ -42,6 +42,6 @@ export class NormalizedItem extends NormalizedDSpaceObject {
   owner: string;
 
   @autoserialize
-  @relationship(NormalizedDSOType.NormalizedBundle)
+  @relationship(ResourceType.Bundle)
   bundles: Array<string>;
 }
diff --git a/src/app/core/cache/models/normalized-dspace-object-factory.ts b/src/app/core/cache/models/normalized-object-factory.ts
similarity index 62%
rename from src/app/core/cache/models/normalized-dspace-object-factory.ts
rename to src/app/core/cache/models/normalized-object-factory.ts
index 052f7be3ee..45eaacbf5c 100644
--- a/src/app/core/cache/models/normalized-dspace-object-factory.ts
+++ b/src/app/core/cache/models/normalized-object-factory.ts
@@ -4,25 +4,25 @@ import { NormalizedBundle } from "./normalized-bundle.model";
 import { NormalizedItem } from "./normalized-item.model";
 import { NormalizedCollection } from "./normalized-collection.model";
 import { GenericConstructor } from "../../shared/generic-constructor";
-import { NormalizedDSOType } from "./normalized-dspace-object-type";
 import { NormalizedCommunity } from "./normalized-community.model";
+import { ResourceType } from "../../shared/resource-type";
 
-export class NormalizedDSOFactory {
-  public static getConstructor(type: NormalizedDSOType): GenericConstructor<NormalizedDSpaceObject> {
+export class NormalizedObjectFactory {
+  public static getConstructor(type: ResourceType): GenericConstructor<NormalizedDSpaceObject> {
     switch (type) {
-      case NormalizedDSOType.NormalizedBitstream: {
+      case ResourceType.Bitstream: {
         return NormalizedBitstream
       }
-      case NormalizedDSOType.NormalizedBundle: {
+      case ResourceType.Bundle: {
         return NormalizedBundle
       }
-      case NormalizedDSOType.NormalizedItem: {
+      case ResourceType.Item: {
         return NormalizedItem
       }
-      case NormalizedDSOType.NormalizedCollection: {
+      case ResourceType.Collection: {
         return NormalizedCollection
       }
-      case NormalizedDSOType.NormalizedCommunity: {
+      case ResourceType.Community: {
         return NormalizedCommunity
       }
       default: {
diff --git a/src/app/core/cache/response-cache.models.ts b/src/app/core/cache/response-cache.models.ts
index 741acf99a6..4208b4cada 100644
--- a/src/app/core/cache/response-cache.models.ts
+++ b/src/app/core/cache/response-cache.models.ts
@@ -9,8 +9,12 @@ export class SuccessResponse extends Response {
 }
 
 export class ErrorResponse extends Response {
-  constructor(public errorMessage: string) {
+  errorMessage: string;
+
+  constructor(error: Error) {
     super(false);
+    console.error(error);
+    this.errorMessage = error.message;
   }
 }
 
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index 809ff799b3..43db6cc4a2 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -33,11 +33,8 @@ export abstract class DataService<TNormalized extends CacheableObject, TDomain>
 
   findAll(scopeID?: string): RemoteData<Array<TDomain>> {
     const href = this.getFindAllHref(scopeID);
-    if (!this.responseCache.has(href) && !this.requestService.isPending(href)) {
-      const request = new FindAllRequest(href, this.normalizedResourceType, scopeID);
-      this.store.dispatch(new RequestConfigureAction(request));
-      this.store.dispatch(new RequestExecuteAction(href));
-    }
+    const request = new FindAllRequest(href, scopeID);
+    this.requestService.configure(request);
     return this.rdbService.buildList<TNormalized, TDomain>(href, this.normalizedResourceType);
     // return this.rdbService.buildList(href);
   }
@@ -48,21 +45,14 @@ export abstract class DataService<TNormalized extends CacheableObject, TDomain>
 
   findById(id: string): RemoteData<TDomain> {
     const href = this.getFindByIDHref(id);
-    if (!this.objectCache.hasBySelfLink(href) && !this.requestService.isPending(href)) {
-      const request = new FindByIDRequest(href, this.normalizedResourceType, id);
-      this.store.dispatch(new RequestConfigureAction(request));
-      this.store.dispatch(new RequestExecuteAction(href));
-    }
+    const request = new FindByIDRequest(href, id);
+    this.requestService.configure(request);
     return this.rdbService.buildSingle<TNormalized, TDomain>(href, this.normalizedResourceType);
     // return this.rdbService.buildSingle(href);
   }
 
   findByHref(href: string): RemoteData<TDomain> {
-    if (!this.objectCache.hasBySelfLink(href) && !this.requestService.isPending(href)) {
-      const request = new Request(href, this.normalizedResourceType);
-      this.store.dispatch(new RequestConfigureAction(request));
-      this.store.dispatch(new RequestExecuteAction(href));
-    }
+    this.requestService.configure(new Request(href));
     return this.rdbService.buildSingle<TNormalized, TDomain>(href, this.normalizedResourceType);
     // return this.rdbService.buildSingle(href));
   }
diff --git a/src/app/core/data/request.effects.ts b/src/app/core/data/request.effects.ts
index e5d887626e..64e7aec1fd 100644
--- a/src/app/core/data/request.effects.ts
+++ b/src/app/core/data/request.effects.ts
@@ -8,7 +8,7 @@ import { DSpaceRESTv2Serializer } from "../dspace-rest-v2/dspace-rest-v2.seriali
 import { CacheableObject } from "../cache/object-cache.reducer";
 import { Observable } from "rxjs";
 import { Response, SuccessResponse, ErrorResponse } from "../cache/response-cache.models";
-import { hasNoValue } from "../../shared/empty.util";
+import { hasNoValue, hasValue, isEmpty, isNotEmpty } from "../../shared/empty.util";
 import { GlobalConfig, GLOBAL_CONFIG } from "../../../config";
 import { RequestState, RequestEntry } from "./request.reducer";
 import {
@@ -17,6 +17,12 @@ import {
 } from "./request.actions";
 import { ResponseCacheService } from "../cache/response-cache.service";
 import { RequestService } from "./request.service";
+import { NormalizedObjectFactory } from "../cache/models/normalized-object-factory";
+import { ResourceType } from "../shared/resource-type";
+
+function isObjectLevel(halObj: any) {
+  return isNotEmpty(halObj._links) && hasValue(halObj._links.self);
+}
 
 @Injectable()
 export class RequestEffects {
@@ -38,30 +44,87 @@ export class RequestEffects {
         .take(1);
     })
     .flatMap((entry: RequestEntry) => {
-      const [ifArray, ifNotArray] = this.restApi.get(entry.request.href)
-        .share() // share ensures restApi.get() doesn't get called twice when the partitions are used below
-        .partition((data: DSpaceRESTV2Response) => Array.isArray(data._embedded));
-
-      return Observable.merge(
-
-        ifArray.map((data: DSpaceRESTV2Response) => {
-          return new DSpaceRESTv2Serializer(entry.request.resourceType).deserializeArray(data);
-        }).do((cos: CacheableObject[]) => cos.forEach((t) => this.addToObjectCache(t)))
-          .map((cos: Array<CacheableObject>): Array<string> => cos.map(t => t.uuid)),
-
-        ifNotArray.map((data: DSpaceRESTV2Response) => {
-          return new DSpaceRESTv2Serializer(entry.request.resourceType).deserialize(data);
-        }).do((co: CacheableObject) => this.addToObjectCache(co))
-          .map((co: CacheableObject): Array<string> => [co.uuid])
-
-      ).map((ids: Array<string>) => new SuccessResponse(ids))
+      return this.restApi.get(entry.request.href)
+        .map((data: DSpaceRESTV2Response) => this.processEmbedded(data._embedded))
+        .map((ids: Array<string>) => new SuccessResponse(ids))
         .do((response: Response) => this.responseCache.add(entry.request.href, response, this.EnvConfig.cache.msToLive))
         .map((response: Response) => new RequestCompleteAction(entry.request.href))
-        .catch((error: Error) => Observable.of(new ErrorResponse(error.message))
+        .catch((error: Error) => Observable.of(new ErrorResponse(error))
           .do((response: Response) => this.responseCache.add(entry.request.href, response, this.EnvConfig.cache.msToLive))
           .map((response: Response) => new RequestCompleteAction(entry.request.href)));
     });
 
+  protected processEmbedded(_embedded: any): Array<string> {
+
+    if (isNotEmpty(_embedded)) {
+      if (isObjectLevel(_embedded)) {
+        return this.deserializeAndCache(_embedded);
+      }
+      else {
+        let uuids = [];
+        Object.keys(_embedded)
+          .filter(property => _embedded.hasOwnProperty(property))
+          .forEach(property => {
+            uuids = [...uuids, ...this.deserializeAndCache(_embedded[property])];
+          });
+        return uuids;
+      }
+    }
+  }
+
+  protected deserializeAndCache(obj): Array<string> {
+    let type: ResourceType;
+    const isArray = Array.isArray(obj);
+
+    if (isArray && isEmpty(obj)) {
+      return [];
+    }
+
+    if (isArray) {
+      type = obj[0]["type"];
+    }
+    else {
+      type = obj["type"];
+    }
+
+    if (hasValue(type)) {
+      const normObjConstructor = NormalizedObjectFactory.getConstructor(type);
+
+      if (hasValue(normObjConstructor)) {
+        const serializer = new DSpaceRESTv2Serializer(normObjConstructor);
+
+        if (isArray) {
+          obj.forEach(o => {
+            if (isNotEmpty(o._embedded)) {
+              this.processEmbedded(o._embedded);
+            }
+          });
+          const normalizedObjArr = serializer.deserializeArray(obj);
+          normalizedObjArr.forEach(t => this.addToObjectCache(t));
+          return normalizedObjArr.map(t => t.uuid);
+        }
+        else {
+          if (isNotEmpty(obj._embedded)) {
+            this.processEmbedded(obj._embedded);
+          }
+          const normalizedObj = serializer.deserialize(obj);
+          this.addToObjectCache(normalizedObj);
+          return [normalizedObj.uuid];
+        }
+
+      }
+      else {
+        //TODO move check to Validator?
+        throw new Error(`The server returned an object with an unknown a known type: ${type}`);
+      }
+
+    }
+    else {
+      //TODO move check to Validator
+      throw new Error(`The server returned an object without a type: ${JSON.stringify(obj)}`);
+    }
+  }
+
   protected addToObjectCache(co: CacheableObject): void {
     if (hasNoValue(co) || hasNoValue(co.uuid)) {
       throw new Error('The server returned an invalid object');
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index 9171bbe509..eb74f4b35d 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -5,28 +5,25 @@ import { GenericConstructor } from "../shared/generic-constructor";
 export class Request<T> {
   constructor(
     public href: string,
-    public resourceType: GenericConstructor<T>
   ) {}
 }
 
 export class FindByIDRequest<T> extends Request<T> {
   constructor(
     href: string,
-    resourceType: GenericConstructor<T>,
     public resourceID: string
   ) {
-    super(href, resourceType);
+    super(href);
   }
 }
 
 export class FindAllRequest<T> extends Request<T> {
   constructor(
     href: string,
-    resourceType: GenericConstructor<T>,
     public scopeID?: string,
     public paginationOptions?: PaginationOptions,
     public sortOptions?: SortOptions
   ) {
-    super(href, resourceType);
+    super(href);
   }
 }
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index b3b28af2c2..35ce8ea078 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -8,7 +8,6 @@ import { RequestConfigureAction, RequestExecuteAction } from "./request.actions"
 import { ResponseCacheService } from "../cache/response-cache.service";
 import { ObjectCacheService } from "../cache/object-cache.service";
 import { CacheableObject } from "../cache/object-cache.reducer";
-import { GenericConstructor } from "../shared/generic-constructor";
 
 @Injectable()
 export class RequestService {
@@ -35,14 +34,13 @@ export class RequestService {
     return this.store.select<RequestEntry>('core', 'data', 'request', href);
   }
 
-  configure<T extends CacheableObject>(href: string, normalizedType: GenericConstructor<T>): void {
-    const isCached = this.objectCache.hasBySelfLink(href);
-    const isPending = this.isPending(href);
+  configure<T extends CacheableObject>(request: Request<T>): void {
+    const isCached = this.objectCache.hasBySelfLink(request.href);
+    const isPending = this.isPending(request.href);
 
     if (!(isCached || isPending)) {
-      const request = new Request(href, normalizedType);
       this.store.dispatch(new RequestConfigureAction(request));
-      this.store.dispatch(new RequestExecuteAction(href));
+      this.store.dispatch(new RequestExecuteAction(request.href));
     }
   }
 }
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.serializer.spec.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2.serializer.spec.ts
index 236244873c..67914c2a92 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2.serializer.spec.ts
+++ b/src/app/core/dspace-rest-v2/dspace-rest-v2.serializer.spec.ts
@@ -84,14 +84,10 @@ describe("DSpaceRESTv2Serializer", () => {
 
     it("should turn a valid document describing a single entity in to a valid model", () => {
       const serializer = new DSpaceRESTv2Serializer(TestModel);
-      const doc = {
-        "_embedded": testResponses[0],
-      };
+      const model = serializer.deserialize(testResponses[0]);
 
-      const model = serializer.deserialize(doc);
-
-      expect(model.id).toBe(doc._embedded.id);
-      expect(model.name).toBe(doc._embedded.name);
+      expect(model.id).toBe(testResponses[0].id);
+      expect(model.name).toBe(testResponses[0].name);
     });
 
     //TODO cant implement/test this yet - depends on how relationships
@@ -127,12 +123,8 @@ describe("DSpaceRESTv2Serializer", () => {
 
     it("should throw an error when dealing with a document describing an array", () => {
       const serializer = new DSpaceRESTv2Serializer(TestModel);
-      const doc = {
-        "_embedded": testResponses
-      };
-
       expect(() => {
-        serializer.deserialize(doc);
+        serializer.deserialize(testResponses);
       }).toThrow();
     });
 
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.serializer.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2.serializer.ts
index d4d5a7ce59..b9f1a0be14 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2.serializer.ts
+++ b/src/app/core/dspace-rest-v2/dspace-rest-v2.serializer.ts
@@ -3,6 +3,7 @@ import { Serializer } from "../serializer";
 import { DSpaceRESTV2Response } from "./dspace-rest-v2-response.model";
 import { DSpaceRESTv2Validator } from "./dspace-rest-v2.validator";
 import { GenericConstructor } from "../shared/generic-constructor";
+import { hasNoValue, hasValue } from "../../shared/empty.util";
 
 /**
  * This Serializer turns responses from v2 of DSpace's REST API
@@ -49,13 +50,13 @@ export class DSpaceRESTv2Serializer<T> implements Serializer<T> {
    * @param response An object returned by the backend
    * @returns a model of type T
    */
-  deserialize(response: DSpaceRESTV2Response): T {
+  deserialize(response: any): T {
     // TODO enable validation, once rest data stabilizes
     // new DSpaceRESTv2Validator(response).validate();
-    if (Array.isArray(response._embedded)) {
+    if (Array.isArray(response)) {
       throw new Error('Expected a single model, use deserializeArray() instead');
     }
-    let normalized = Object.assign({}, response._embedded, this.normalizeLinks(response._embedded._links));
+    let normalized = Object.assign({}, response, this.normalizeLinks(response._links));
     return <T> Deserialize(normalized, this.modelType);
   }
 
@@ -65,13 +66,13 @@ export class DSpaceRESTv2Serializer<T> implements Serializer<T> {
    * @param response An object returned by the backend
    * @returns an array of models of type T
    */
-  deserializeArray(response: DSpaceRESTV2Response): Array<T> {
+  deserializeArray(response: any): Array<T> {
     //TODO enable validation, once rest data stabilizes
     // new DSpaceRESTv2Validator(response).validate();
-    if (!Array.isArray(response._embedded)) {
+    if (!Array.isArray(response)) {
       throw new Error('Expected an Array, use deserialize() instead');
     }
-    let normalized = response._embedded.map((resource) => {
+    let normalized = response.map((resource) => {
        return Object.assign({}, resource, this.normalizeLinks(resource._links));
     });
 
diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts
index 2005a250e7..ca7c67207a 100644
--- a/src/app/core/shared/dspace-object.model.ts
+++ b/src/app/core/shared/dspace-object.model.ts
@@ -2,6 +2,7 @@ import { Metadatum } from "./metadatum.model"
 import { isEmpty, isNotEmpty } from "../../shared/empty.util";
 import { CacheableObject } from "../cache/object-cache.reducer";
 import { RemoteData } from "../data/remote-data";
+import { ResourceType } from "./resource-type";
 
 /**
  * An abstract model class for a DSpaceObject.
@@ -23,7 +24,7 @@ export abstract class DSpaceObject implements CacheableObject {
     /**
      * A string representing the kind of DSpaceObject, e.g. community, item, …
      */
-    type: string;
+    type: ResourceType;
 
     /**
      * The name for this DSpaceObject
diff --git a/src/app/core/shared/resource-type.ts b/src/app/core/shared/resource-type.ts
new file mode 100644
index 0000000000..2e180cba71
--- /dev/null
+++ b/src/app/core/shared/resource-type.ts
@@ -0,0 +1,11 @@
+/**
+ * TODO replace with actual string enum after upgrade to TypeScript 2.4:
+ * https://github.com/Microsoft/TypeScript/pull/15486
+ */
+export enum ResourceType {
+  Bundle = <any> "bundle",
+  Bitstream = <any> "bitstream",
+  Item = <any> "item",
+  Collection = <any> "collection",
+  Community = <any> "community"
+}
diff --git a/src/app/shared/pagination/pagination.component.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts
index b1e1390dd8..3ff6f39609 100644
--- a/src/app/shared/pagination/pagination.component.spec.ts
+++ b/src/app/shared/pagination/pagination.component.spec.ts
@@ -247,12 +247,12 @@ describe('Pagination component', () => {
 
     changePage(testFixture, 3);
     tick();
-    expect(routerStub.navigate).toHaveBeenCalledWith([{pageId: 'test', page: 3, pageSize: 10}]);
+    expect(routerStub.navigate).toHaveBeenCalledWith([], { queryParams: { pageId: 'test', page: 3, pageSize: 10 } });
     expect(paginationComponent.currentPage).toEqual(3);
 
     changePageSize(testFixture, '20');
     tick();
-    expect(routerStub.navigate).toHaveBeenCalledWith([{pageId: 'test', page: 3, pageSize: 20}]);
+    expect(routerStub.navigate).toHaveBeenCalledWith([], { queryParams: { pageId: 'test', page: 3, pageSize: 20 } });
     expect(paginationComponent.pageSize).toEqual(20);
   }));
 
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 2d5be240bc..cb1155f652 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -57,6 +57,11 @@ export class PaginationComponent implements OnDestroy, OnInit {
    * Current page.
    */
   public currentPage = 1;
+  
+  /**
+   * Current URL query parameters
+   */
+  public currentQueryParams = {};
 
   /**
    * An observable of HostWindowState type
@@ -121,14 +126,15 @@ export class PaginationComponent implements OnDestroy, OnInit {
     this.pageSize = this.paginationOptions.pageSize;
     this.pageSizeOptions = this.paginationOptions.pageSizeOptions;
 
-    this.routeSubscription = this.route.params
-      .map(params => params)
-      .subscribe(params => {
-        if(this.id == params['pageId']
-           && (this.paginationOptions.currentPage != params['page']
-           || this.paginationOptions.pageSize != params['pageSize'])
+    this.routeSubscription = this.route.queryParams
+      .map(queryParams => queryParams)
+      .subscribe(queryParams => {
+        this.currentQueryParams = queryParams;
+        if(this.id == queryParams['pageId']
+           && (this.paginationOptions.currentPage != queryParams['page']
+           || this.paginationOptions.pageSize != queryParams['pageSize'])
           ) {
-          this.validateParams(params['page'], params['pageSize']);
+          this.validateParams(queryParams['page'], queryParams['pageSize']);
         }
       });
     this.setShowingDetail();
@@ -162,7 +168,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The page being navigated to.
    */
   public doPageChange(page: number) {
-    this.router.navigate([{ pageId: this.id, page: page, pageSize: this.pageSize }]);
+    this.router.navigate([], { queryParams: Object.assign({}, this.currentQueryParams, { pageId: this.id, page: page, pageSize: this.pageSize }) });
     this.currentPage = page;
     this.setShowingDetail();
     this.pageChange.emit(page);
@@ -175,7 +181,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The new page size.
    */
   public setPageSize(pageSize: number) {
-    this.router.navigate([{ pageId: this.id, page: this.currentPage, pageSize: pageSize }]);
+    this.router.navigate([], { queryParams: Object.assign({}, this.currentQueryParams, { pageId: this.id, page: this.currentPage, pageSize: pageSize }) });
     this.pageSize = pageSize;
     this.setShowingDetail();
     this.pageSizeChange.emit(pageSize);
diff --git a/src/app/shared/testing/router-stubs.ts b/src/app/shared/testing/router-stubs.ts
index 42a6270aea..4f68678288 100644
--- a/src/app/shared/testing/router-stubs.ts
+++ b/src/app/shared/testing/router-stubs.ts
@@ -4,7 +4,6 @@ import { BehaviorSubject } from "rxjs";
 export class RouterStub {
   //noinspection TypeScriptUnresolvedFunction
   navigate = jasmine.createSpy('navigate');
-  //navigate1: jasmine.createSpy('navigate');
 }
 
 export class ActivatedRouteStub {
@@ -12,6 +11,7 @@ export class ActivatedRouteStub {
   // ActivatedRoute.params is Observable
   private subject = new BehaviorSubject(this.testParams);
   params = this.subject.asObservable();
+  queryParams = this.subject.asObservable();
 
   constructor(params?: Params) {
     if (params) {
diff --git a/src/backend/api.ts b/src/backend/api.ts
index 2fa94e9c28..4255d5723f 100644
--- a/src/backend/api.ts
+++ b/src/backend/api.ts
@@ -82,7 +82,7 @@ export function createMockApi() {
     let id = req.params.community_id;
     try {
       req.community_id = id;
-      req.community = COMMUNITIES.find((community) => {
+      req.community = COMMUNITIES["communities"].find((community) => {
         return community.id === id;
       });
       next();
@@ -143,7 +143,7 @@ export function createMockApi() {
     let id = req.params.collection_id;
     try {
       req.collection_id = id;
-      req.collection = COLLECTIONS.find((collection) => {
+      req.collection = COLLECTIONS["collections"].find((collection) => {
         return collection.id === id;
       });
       next();
@@ -205,7 +205,7 @@ export function createMockApi() {
     let id = req.params.item_id;
     try {
       req.item_id = id;
-      req.item = ITEMS.find((item) => {
+      req.item = ITEMS["items"].find((item) => {
         return item.id === id;
       });
       next();
@@ -250,7 +250,7 @@ export function createMockApi() {
         let id = req.params.bundle_id;
         try {
             req.bundle_id = id;
-            req.bundle = BUNDLES.find((bundle) => {
+            req.bundle = BUNDLES["bundles"].find((bundle) => {
                 return bundle.id === id;
             });
             next();
@@ -280,7 +280,7 @@ export function createMockApi() {
         let id = req.params.bitstream_id;
         try {
             req.bitstream_id = id;
-            req.bitstream = BITSTREAMS.find((bitstream) => {
+            req.bitstream = BITSTREAMS["bitstreams"].find((bitstream) => {
                 return bitstream.id === id;
             });
             next();
diff --git a/src/backend/bitstreams.ts b/src/backend/bitstreams.ts
index 67ab3dbe76..63eae94a98 100644
--- a/src/backend/bitstreams.ts
+++ b/src/backend/bitstreams.ts
@@ -1,80 +1,83 @@
-export const BITSTREAMS = [
-  {
-    "_links": {
-      "self": { "href": "/bitstreams/3678" },
-      "bundle": { "href": "/bundles/35e0606d-5e18-4f9c-aa61-74fc751cc3f9" },
-      "retrieve": { "href": "/bitstreams/43c57c2b-206f-4645-8c8f-5f10c84b09fa/retrieve" }
+export const BITSTREAMS = {
+  "bitstreams": [
+    {
+      "_links": {
+        "self": { "href": "/bitstreams/3678" },
+        "bundle": { "href": "/bundles/35e0606d-5e18-4f9c-aa61-74fc751cc3f9" },
+        "retrieve": { "href": "/bitstreams/43c57c2b-206f-4645-8c8f-5f10c84b09fa/retrieve" }
+      },
+      "id": "3678",
+      "uuid": "43c57c2b-206f-4645-8c8f-5f10c84b09fa",
+      "type": "bitstream",
+      "name": "do_open_access_CRL.pdf",
+      "size": 636626,
+      "checksum": {
+        "value": "063dfbbbac873aa3fca479b878eccff3",
+        "algorithm": "MD5"
+      },
+      "metadata": [
+        { "key": "dc.title", "value": "do_open_access_CRL.pdf", "language": null },
+        { "key": "dc.description", "value": "Conference Paper", "language": "en" }
+      ],
+      "format": "Adobe PDF",
+      "mimetype": "application/pdf"
     },
-    "id": "3678",
-    "uuid": "43c57c2b-206f-4645-8c8f-5f10c84b09fa",
-    "type": "bitstream",
-    "name": "do_open_access_CRL.pdf",
-    "size": 636626,
-    "checksum": {
-      "value": "063dfbbbac873aa3fca479b878eccff3",
-      "algorithm": "MD5"
+    {
+      "_links": {
+        "self": { "href": "/bitstreams/8842" },
+        "bundle": { "href": "/bundles/a469c57a-abcf-45c3-83e4-b187ebd708fd" },
+        "retrieve": { "href": "/rest/bitstreams/1a013ecc-fb25-4689-a44f-f1383ad26632/retrieve" }
+      },
+      "id": "8842",
+      "uuid": "1a013ecc-fb25-4689-a44f-f1383ad26632",
+      "type": "bitstream",
+      "name": "do_open_access_CRL.pdf.jpg",
+      "size": 41183,
+      "checksum": {
+        "value": "a8ad475e86f9645c60e13e06f1427814",
+        "algorithm": "MD5"
+      },
+      "metadata": [
+        { "key": "dc.title", "value": "do_open_access_CRL.pdf.jpg", "language": null },
+        { "key": "dc.description", "value": "Generated Thumbnail", "language": "en" }
+      ],
+      "format": "JPEG",
+      "mimetype": "image/jpeg"
     },
-    "metadata": [
-      { "key": "dc.title", "value": "do_open_access_CRL.pdf", "language": null },
-      { "key": "dc.description", "value": "Conference Paper", "language": "en" }
-    ],
-    "format": "Adobe PDF",
-    "mimetype": "application/pdf"
-  },
-  {
-    "_links": {
-      "self": { "href": "/bitstreams/8842" },
-      "bundle": { "href": "/bundles/a469c57a-abcf-45c3-83e4-b187ebd708fd" },
-      "retrieve": { "href": "/rest/bitstreams/1a013ecc-fb25-4689-a44f-f1383ad26632/retrieve" }
+    {
+      "_links": {
+        "self": { "href": "/bitstreams/8934" },
+        "bundle": { "href": "/bundles/99f78e5e-3677-43b0-aaef-cddaa1a49092" },
+        "retrieve": { "href": "/rest/bitstreams/ba7d24f2-8fc7-4b8e-b7b6-6c32be1c12a6/retrieve" }
+      },
+      "id": "8934",
+      "uuid": "ba7d24f2-8fc7-4b8e-b7b6-6c32be1c12a6",
+      "type": "bitstream",
+      "name": "license.txt",
+      "size": 41183,
+      "checksum": {
+        "value": "8ad416e8a39e645020e13e06f1427814",
+        "algorithm": "MD5"
+      },
+      "metadata": [
+        { "key": "dc.title", "value": "license.txt", "language": null },
+        { "key": "dc.description", "value": "License", "language": "en" }
+      ],
+      "format": "Text",
+      "mimetype": "text/plain"
     },
-    "id": "8842",
-    "uuid": "1a013ecc-fb25-4689-a44f-f1383ad26632",
-    "type": "bitstream",
-    "name": "do_open_access_CRL.pdf.jpg",
-    "size": 41183,
-    "checksum": {
-      "value": "a8ad475e86f9645c60e13e06f1427814",
-      "algorithm": "MD5"
+    {
+      "_links": {
+        "self": { "href": "/bitstreams/4688" },
+      },
+      "id": "4688",
+      "uuid": "1bb1be24-c934-41e3-a0fb-ca7a71ab0e71",
+      "type": "bitstream",
+      "name": "collection-5179-logo.png",
+      "size": 299832,
+      "url": "/bitstreams/1bb1be24-c934-41e3-a0fb-ca7a71ab0e71/retrieve",
+      "format": "PNG",
+      "mimetype": "image/png"
     },
-    "metadata": [
-      { "key": "dc.title", "value": "do_open_access_CRL.pdf.jpg", "language": null },
-      { "key": "dc.description", "value": "Generated Thumbnail", "language": "en" }
-    ],
-    "format": "JPEG",
-    "mimetype": "image/jpeg"
-  },
-  {
-    "_links": {
-      "self": { "href": "/bitstreams/8934" },
-      "bundle": { "href": "/bundles/99f78e5e-3677-43b0-aaef-cddaa1a49092" },
-      "retrieve": { "href": "/rest/bitstreams/ba7d24f2-8fc7-4b8e-b7b6-6c32be1c12a6/retrieve" }
-    },
-    "id": "8934",
-    "uuid": "ba7d24f2-8fc7-4b8e-b7b6-6c32be1c12a6",
-    "name": "license.txt",
-    "size": 41183,
-    "checksum": {
-      "value": "8ad416e8a39e645020e13e06f1427814",
-      "algorithm": "MD5"
-    },
-    "metadata": [
-      { "key": "dc.title", "value": "license.txt", "language": null },
-      { "key": "dc.description", "value": "License", "language": "en" }
-    ],
-    "format": "Text",
-    "mimetype": "text/plain"
-  },
-  {
-    "_links": {
-      "self": { "href": "/bitstreams/4688" },
-    },
-    "id": "4688",
-    "uuid": "1bb1be24-c934-41e3-a0fb-ca7a71ab0e71",
-    "type": "bitstream",
-    "name": "collection-5179-logo.png",
-    "size": 299832,
-    "url": "/bitstreams/1bb1be24-c934-41e3-a0fb-ca7a71ab0e71/retrieve",
-    "format": "PNG",
-    "mimetype": "image/png"
-  },
-];
+  ]
+};
diff --git a/src/backend/bundles.ts b/src/backend/bundles.ts
index 9656643375..06a38e6fac 100644
--- a/src/backend/bundles.ts
+++ b/src/backend/bundles.ts
@@ -1,58 +1,61 @@
-export const BUNDLES = [
-  {
-    "_links": {
-      "self": { "href": "/bundles/2355" },
-      "items": [
-        { "href": "/items/8871" }
-      ],
-      "bitstreams": [
-        { "href": "/bitstreams/3678" },
-      ],
-      "primaryBitstream": { "href": "/bitstreams/3678" }
+export const BUNDLES = {
+  "bundles": [
+    {
+      "_links": {
+        "self": { "href": "/bundles/2355" },
+        "items": [
+          { "href": "/items/8871" }
+        ],
+        "bitstreams": [
+          { "href": "/bitstreams/3678" },
+        ],
+        "primaryBitstream": { "href": "/bitstreams/3678" }
+      },
+      "id": "2355",
+      "uuid": "35e0606d-5e18-4f9c-aa61-74fc751cc3f9",
+      "type": "bundle",
+      "name": "ORIGINAL",
+      "metadata": [
+        { "key": "dc.title", "value": "ORIGINAL", "language": "en" }
+      ]
     },
-    "id": "2355",
-    "uuid": "35e0606d-5e18-4f9c-aa61-74fc751cc3f9",
-    "type": "bundle",
-    "name": "ORIGINAL",
-    "metadata": [
-      { "key": "dc.title", "value": "ORIGINAL", "language": "en" }
-    ]
-  },
-  {
-    "_links": {
-      "self": { "href": "/bundles/5687" },
-      "items": [
-        { "href": "/items/8871" }
-      ],
-      "bitstreams": [
-        { "href": "/bitstreams/8842" },
-      ],
-      "primaryBitstream": { "href": "/bitstreams/8842" }
+    {
+      "_links": {
+        "self": { "href": "/bundles/5687" },
+        "items": [
+          { "href": "/items/8871" }
+        ],
+        "bitstreams": [
+          { "href": "/bitstreams/8842" },
+        ],
+        "primaryBitstream": { "href": "/bitstreams/8842" }
+      },
+      "id": "5687",
+      "uuid": "a469c57a-abcf-45c3-83e4-b187ebd708fd",
+      "type": "bundle",
+      "name": "THUMBNAIL",
+      "metadata": [
+        { "key": "dc.title", "value": "THUMBNAIL", "language": "en" }
+      ]
     },
-    "id": "5687",
-    "uuid": "a469c57a-abcf-45c3-83e4-b187ebd708fd",
-    "type": "bundle",
-    "name": "THUMBNAIL",
-    "metadata": [
-      { "key": "dc.title", "value": "THUMBNAIL", "language": "en" }
-    ]
-  },
-  {
-    "_links": {
-      "self": { "href": "/bundles/8475" },
-      "items": [
-        { "href": "/items/8871" }
-      ],
-      "bitstreams": [
-        { "href": "/bitstreams/8934" },
-      ],
-      "primaryBitstream": { "href": "/bitstreams/8934" }
-    },
-    "id": "8475",
-    "uuid": "99f78e5e-3677-43b0-aaef-cddaa1a49092",
-    "name": "LICENSE",
-    "metadata": [
-      { "key": "dc.title", "value": "LICENSE", "language": "en" }
-    ]
-  }
-];
+    {
+      "_links": {
+        "self": { "href": "/bundles/8475" },
+        "items": [
+          { "href": "/items/8871" }
+        ],
+        "bitstreams": [
+          { "href": "/bitstreams/8934" },
+        ],
+        "primaryBitstream": { "href": "/bitstreams/8934" }
+      },
+      "id": "8475",
+      "uuid": "99f78e5e-3677-43b0-aaef-cddaa1a49092",
+      "type": "bundle",
+      "name": "LICENSE",
+      "metadata": [
+        { "key": "dc.title", "value": "LICENSE", "language": "en" }
+      ]
+    }
+  ]
+};
diff --git a/src/backend/collections.ts b/src/backend/collections.ts
index 995f93f98c..5170f14c46 100644
--- a/src/backend/collections.ts
+++ b/src/backend/collections.ts
@@ -1,75 +1,77 @@
-export const COLLECTIONS = [
-  {
-    "_links": {
-      "self": { "href": "/collections/5179" },
-      "items": [
-        { "href": "/items/8871" },
-        { "href": "/items/9978" }
-      ],
-      "logo": { "href": "/bitstreams/4688" }
-    },
-    "id": "5179",
-    "uuid": "9e32a2e2-6b91-4236-a361-995ccdc14c60",
-    "type": "collection",
-    "name": "A Test Collection",
-    "handle": "123456789/5179",
-    "metadata": [
-      {
-        "key": "dc.rights",
-        "value": "<p>© 2005-2016 JOHN DOE SOME RIGHTS RESERVED</p>",
-        "language": null
+export const COLLECTIONS = {
+  "collections": [
+    {
+      "_links": {
+        "self": { "href": "/collections/5179" },
+        "items": [
+          { "href": "/items/8871" },
+          { "href": "/items/9978" }
+        ],
+        "logo": { "href": "/bitstreams/4688" }
       },
-      {
-        "key": "dc.description",
-        "value": "<p class='lead'>An introductory text dolor sit amet, consectetur adipiscing elit. Duis laoreet lorem erat, eget auctor est ultrices quis. Nullam ac tincidunt quam. In nec nisl odio. In egestas aliquam tincidunt.</p>\r\n<p>Integer vitae diam id dolor pharetra dignissim in sed enim. Vivamus pulvinar tristique sem a iaculis. Aenean ultricies dui vel facilisis laoreet. Integer porta erat eu ultrices rhoncus. Sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum.</p>",
-        "language": null
-      },
-      {
-        "key": "dc.description.abstract",
-        "value": "A collection for testing purposes",
-        "language": null
-      },
-      {
-        "key": "dc.description.tableofcontents",
-        "value": "<p>Some news sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum. Donec sed ultricies erat, nec sollicitudin mauris. Duis varius nulla quis quam vulputate, at hendrerit turpis rutrum. Integer nec facilisis sapien. Fusce fringilla malesuada lectus id pulvinar. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae</p>",
-        "language": null
-      }
-    ]
-  },
-  {
-    "_links": {
-      "self": { "href": "/collections/6547" },
-      "items": [
-        { "href": "/items/8871" },
-        { "href": "/items/9978" }
+      "id": "5179",
+      "uuid": "9e32a2e2-6b91-4236-a361-995ccdc14c60",
+      "type": "collection",
+      "name": "A Test Collection",
+      "handle": "123456789/5179",
+      "metadata": [
+        {
+          "key": "dc.rights",
+          "value": "<p>© 2005-2016 JOHN DOE SOME RIGHTS RESERVED</p>",
+          "language": null
+        },
+        {
+          "key": "dc.description",
+          "value": "<p class='lead'>An introductory text dolor sit amet, consectetur adipiscing elit. Duis laoreet lorem erat, eget auctor est ultrices quis. Nullam ac tincidunt quam. In nec nisl odio. In egestas aliquam tincidunt.</p>\r\n<p>Integer vitae diam id dolor pharetra dignissim in sed enim. Vivamus pulvinar tristique sem a iaculis. Aenean ultricies dui vel facilisis laoreet. Integer porta erat eu ultrices rhoncus. Sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum.</p>",
+          "language": null
+        },
+        {
+          "key": "dc.description.abstract",
+          "value": "A collection for testing purposes",
+          "language": null
+        },
+        {
+          "key": "dc.description.tableofcontents",
+          "value": "<p>Some news sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum. Donec sed ultricies erat, nec sollicitudin mauris. Duis varius nulla quis quam vulputate, at hendrerit turpis rutrum. Integer nec facilisis sapien. Fusce fringilla malesuada lectus id pulvinar. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae</p>",
+          "language": null
+        }
       ]
     },
-    "id": "6547",
-    "uuid": "598ce822-c357-46f3-ab70-63724d02d6ad",
-    "type": "collection",
-    "name": "Another Test Collection",
-    "handle": "123456789/6547",
-    "metadata": [
-      {
-        "key": "dc.rights",
-        "value": "<p>© 2005-2016 JOHN DOE SOME RIGHTS RESERVED</p>",
-        "language": null
+    {
+      "_links": {
+        "self": { "href": "/collections/6547" },
+        "items": [
+          { "href": "/items/8871" },
+          { "href": "/items/9978" }
+        ]
       },
-      {
-        "key": "dc.description",
-        "value": "<p class='lead'>Another introductory text dolor sit amet, consectetur adipiscing elit. Duis laoreet lorem erat, eget auctor est ultrices quis. Nullam ac tincidunt quam. In nec nisl odio. In egestas aliquam tincidunt.</p>\r\n<p>Integer vitae diam id dolor pharetra dignissim in sed enim. Vivamus pulvinar tristique sem a iaculis. Aenean ultricies dui vel facilisis laoreet. Integer porta erat eu ultrices rhoncus. Sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum.</p>",
-        "language": null
-      },
-      {
-        "key": "dc.description.abstract",
-        "value": "Another collection for testing purposes",
-        "language": null
-      },
-      {
-        "key": "dc.description.tableofcontents",
-        "value": "<p>Some more news sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum. Donec sed ultricies erat, nec sollicitudin mauris. Duis varius nulla quis quam vulputate, at hendrerit turpis rutrum. Integer nec facilisis sapien. Fusce fringilla malesuada lectus id pulvinar. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae</p>",
-        "language": null
-      }
-    ]
-  }
-];
+      "id": "6547",
+      "uuid": "598ce822-c357-46f3-ab70-63724d02d6ad",
+      "type": "collection",
+      "name": "Another Test Collection",
+      "handle": "123456789/6547",
+      "metadata": [
+        {
+          "key": "dc.rights",
+          "value": "<p>© 2005-2016 JOHN DOE SOME RIGHTS RESERVED</p>",
+          "language": null
+        },
+        {
+          "key": "dc.description",
+          "value": "<p class='lead'>Another introductory text dolor sit amet, consectetur adipiscing elit. Duis laoreet lorem erat, eget auctor est ultrices quis. Nullam ac tincidunt quam. In nec nisl odio. In egestas aliquam tincidunt.</p>\r\n<p>Integer vitae diam id dolor pharetra dignissim in sed enim. Vivamus pulvinar tristique sem a iaculis. Aenean ultricies dui vel facilisis laoreet. Integer porta erat eu ultrices rhoncus. Sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum.</p>",
+          "language": null
+        },
+        {
+          "key": "dc.description.abstract",
+          "value": "Another collection for testing purposes",
+          "language": null
+        },
+        {
+          "key": "dc.description.tableofcontents",
+          "value": "<p>Some more news sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum. Donec sed ultricies erat, nec sollicitudin mauris. Duis varius nulla quis quam vulputate, at hendrerit turpis rutrum. Integer nec facilisis sapien. Fusce fringilla malesuada lectus id pulvinar. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae</p>",
+          "language": null
+        }
+      ]
+    }
+  ]
+};
diff --git a/src/backend/items.ts b/src/backend/items.ts
index 3f2087afe6..45d71fa092 100644
--- a/src/backend/items.ts
+++ b/src/backend/items.ts
@@ -1,171 +1,334 @@
-export const ITEMS = [
-  {
-    "_links": {
-      "self": {
-        "href": "/items/8871"
+export const ITEMS = {
+  "items": [
+    {
+      "_links": {
+        "self": {
+          "href": "/items/8871"
+        },
+        "parents": [
+          {
+            "href": "/collections/5179"
+          },
+          {
+            "href": "/collections/6547"
+          }
+        ],
+        "bundles": [
+          {
+            "href": "/bundles/2355"
+          },
+          // {
+          //   "href": "/bundles/5687"
+          // }
+        ]
       },
-      "parents": [
+      "id": "8871",
+      "uuid": "21539b1d-9ef1-4eda-9c77-49565b5bfb78",
+      "type": "item",
+      "name": "Do Open-Access Articles Have a Greater Research Impact?",
+      "handle": "123456789/8871",
+      "lastModified": "2016-10-14 10:41:12.886",
+      "isArchived": true,
+      "isWithdrawn": false,
+      "metadata": [
         {
-          "href": "/collections/5179"
+          "key": "dc.contributor.author",
+          "value": "Antelman, Kristin",
+          "language": "en"
         },
         {
-          "href": "/collections/6547"
+          "key": "dc.date.accessioned",
+          "value": "2016-10-14T10:41:13Z",
+          "language": null
+        },
+        {
+          "key": "dc.date.available",
+          "value": "2016-10-14T10:41:13Z",
+          "language": null
+        },
+        {
+          "key": "dc.date.issued",
+          "value": "2004-09-01",
+          "language": "en"
+        },
+        {
+          "key": "dc.identifier.uri",
+          "value": "http://hdl.handle.net/123456789/8871",
+          "language": null
+        },
+        {
+          "key": "dc.description.abstract",
+          "value": "Although many authors believe that their work has a greater research impact if it is freely available, studies to demonstrate that impact are few. This study looks at articles in four disciplines at varying stages of adoption of open access—philosophy, political science, electrical and electronic engineering and mathematics—to see whether they have a greater impact as measured by citations in the ISI Web of Science database when their authors make them freely available on the Internet. The finding is that, across all four disciplines, freely available articles do have a greater research impact. Shedding light on this category of open access reveals that scholars in diverse disciplines are adopting open-access practices and being rewarded for it.",
+          "language": "en"
+        },
+        {
+          "key": "dc.publisher",
+          "value": "College & Research Libraries News",
+          "language": "en"
+        },
+        {
+          "key": "dc.subject",
+          "value": "Publishing",
+          "language": "en"
+        },
+        {
+          "key": "dc.subject",
+          "value": "Intellectual Property",
+          "language": "en"
+        },
+        {
+          "key": "dc.subject",
+          "value": "Open Access",
+          "language": "en"
+        },
+        {
+          "key": "dc.title",
+          "value": "Do Open-Access Articles Have a Greater Research Impact?",
+          "language": "en"
+        },
+        {
+          "key": "dc.type",
+          "value": "(not specified)",
+          "language": "en"
         }
       ],
-      "bundles": [
-        {
-          "href": "/bundles/2355"
-        },
-        {
-          "href": "/bundles/5687"
-        },
-        {
-          "href": "/bundles/8475"
-        }
-      ]
-    },
-    "id": "8871",
-    "uuid": "21539b1d-9ef1-4eda-9c77-49565b5bfb78",
-    "type": "item",
-    "name": "Do Open-Access Articles Have a Greater Research Impact?",
-    "handle": "123456789/8871",
-    "lastModified": "2016-10-14 10:41:12.886",
-    "isArchived": true,
-    "isWithdrawn": false,
-    "metadata": [
-      {
-        "key": "dc.contributor.author",
-        "value": "Antelman, Kristin",
-        "language": "en"
-      },
-      {
-        "key": "dc.date.accessioned",
-        "value": "2016-10-14T10:41:13Z",
-        "language": null
-      },
-      {
-        "key": "dc.date.available",
-        "value": "2016-10-14T10:41:13Z",
-        "language": null
-      },
-      {
-        "key": "dc.date.issued",
-        "value": "2004-09-01",
-        "language": "en"
-      },
-      {
-        "key": "dc.identifier.uri",
-        "value": "http://hdl.handle.net/123456789/8871",
-        "language": null
-      },
-      {
-        "key": "dc.description.abstract",
-        "value": "Although many authors believe that their work has a greater research impact if it is freely available, studies to demonstrate that impact are few. This study looks at articles in four disciplines at varying stages of adoption of open access—philosophy, political science, electrical and electronic engineering and mathematics—to see whether they have a greater impact as measured by citations in the ISI Web of Science database when their authors make them freely available on the Internet. The finding is that, across all four disciplines, freely available articles do have a greater research impact. Shedding light on this category of open access reveals that scholars in diverse disciplines are adopting open-access practices and being rewarded for it.",
-        "language": "en"
-      },
-      {
-        "key": "dc.publisher",
-        "value": "College & Research Libraries News",
-        "language": "en"
-      },
-      {
-        "key": "dc.subject",
-        "value": "Publishing",
-        "language": "en"
-      },
-      {
-        "key": "dc.subject",
-        "value": "Intellectual Property",
-        "language": "en"
-      },
-      {
-        "key": "dc.subject",
-        "value": "Open Access",
-        "language": "en"
-      },
-      {
-        "key": "dc.title",
-        "value": "Do Open-Access Articles Have a Greater Research Impact?",
-        "language": "en"
-      },
-      {
-        "key": "dc.type",
-        "value": "(not specified)",
-        "language": "en"
+      "_embedded": {
+        "parents": [
+          {
+            "_links": {
+              "self": { "href": "/collections/6547" },
+              "items": [
+                { "href": "/items/8871" },
+                { "href": "/items/9978" }
+              ]
+            },
+            "id": "6547",
+            "uuid": "598ce822-c357-46f3-ab70-63724d02d6ad",
+            "type": "collection",
+            "name": "Another Test Collection",
+            "handle": "123456789/6547",
+            "metadata": [
+              {
+                "key": "dc.rights",
+                "value": "<p>© 2005-2016 JOHN DOE SOME RIGHTS RESERVED</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description",
+                "value": "<p class='lead'>Another introductory text dolor sit amet, consectetur adipiscing elit. Duis laoreet lorem erat, eget auctor est ultrices quis. Nullam ac tincidunt quam. In nec nisl odio. In egestas aliquam tincidunt.</p>\r\n<p>Integer vitae diam id dolor pharetra dignissim in sed enim. Vivamus pulvinar tristique sem a iaculis. Aenean ultricies dui vel facilisis laoreet. Integer porta erat eu ultrices rhoncus. Sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum.</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description.abstract",
+                "value": "Another collection for testing purposes",
+                "language": null
+              },
+              {
+                "key": "dc.description.tableofcontents",
+                "value": "<p>Some more news sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum. Donec sed ultricies erat, nec sollicitudin mauris. Duis varius nulla quis quam vulputate, at hendrerit turpis rutrum. Integer nec facilisis sapien. Fusce fringilla malesuada lectus id pulvinar. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae</p>",
+                "language": null
+              }
+            ]
+          }
+        ],
+        "bundles": [
+          {
+            "_links": {
+              "self": { "href": "/bundles/2355" },
+              "items": [
+                { "href": "/items/8871" }
+              ],
+              "bitstreams": [
+                { "href": "/bitstreams/3678" },
+              ],
+              "primaryBitstream": { "href": "/bitstreams/3678" }
+            },
+            "id": "2355",
+            "uuid": "35e0606d-5e18-4f9c-aa61-74fc751cc3f9",
+            "type": "bundle",
+            "name": "ORIGINAL",
+            "metadata": [
+              { "key": "dc.title", "value": "ORIGINAL", "language": "en" }
+            ],
+            "_embedded": {
+              "bitstreams": [
+                {
+                  "_links": {
+                    "self": { "href": "/bitstreams/3678" },
+                    "bundle": { "href": "/bundles/35e0606d-5e18-4f9c-aa61-74fc751cc3f9" },
+                    "retrieve": { "href": "/bitstreams/43c57c2b-206f-4645-8c8f-5f10c84b09fa/retrieve" }
+                  },
+                  "id": "3678",
+                  "uuid": "43c57c2b-206f-4645-8c8f-5f10c84b09fa",
+                  "type": "bitstream",
+                  "name": "do_open_access_CRL.pdf",
+                  "size": 636626,
+                  "checksum": {
+                    "value": "063dfbbbac873aa3fca479b878eccff3",
+                    "algorithm": "MD5"
+                  },
+                  "metadata": [
+                    { "key": "dc.title", "value": "do_open_access_CRL.pdf", "language": null },
+                    { "key": "dc.description", "value": "Conference Paper", "language": "en" }
+                  ],
+                  "format": "Adobe PDF",
+                  "mimetype": "application/pdf"
+                }
+              ]
+            }
+          }
+        ]
       }
-    ]
-  },
-  {
-    "_links": {
-      "self": {
-        "href": "/items/9978"
+    },
+    {
+      "_links": {
+        "self": {
+          "href": "/items/9978"
+        },
+        "parents": [
+          {
+            "href": "/collections/5179"
+          },
+          {
+            "href": "/collections/6547"
+          }
+        ],
+        "bundles": [
+          {
+            "href": "/bundles/2355"
+          },
+          // {
+          //   "href": "/bundles/5687"
+          // }
+        ]
       },
-      "parents": [
+      "id": "9978",
+      "uuid": "be8325f7-243b-49f4-8a4b-df2b793ff3b5",
+      "type": "item",
+      "name": "Another Test Item",
+      "handle": "123456789/9978",
+      "lastModified": "2016-05-27 03:00:20.063",
+      "isArchived": true,
+      "isWithdrawn": false,
+      "metadata": [
         {
-          "href": "/collections/5179"
+          "key": "dc.contributor.author",
+          "value": "John Doe",
+          "language": "en"
         },
         {
-          "href": "/collections/6547"
+          "key": "dc.date.accessioned",
+          "value": "2016-05-27T07:45:04Z",
+          "language": null
+        },
+        {
+          "key": "dc.date.available",
+          "value": "2016-05-27T07:45:04Z",
+          "language": null
+        },
+        {
+          "key": "dc.date.issued",
+          "value": "2016-05-27",
+          "language": "en"
+        },
+        {
+          "key": "dc.identifier.uri",
+          "value": "http://hdl.handle.net/123456789/9978",
+          "language": null
+        },
+        {
+          "key": "dc.description.abstract",
+          "value": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas lacus velit, lacinia eu ultrices nec, auctor in sem. Donec interdum convallis ornare. Aliquam et tortor risus. Praesent ut feugiat eros, eu consequat nibh. Morbi id quam eu mi pellentesque consequat vel vitae sem. Praesent sed velit ullamcorper, efficitur odio non, aliquet urna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Pellentesque eu placerat urna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nulla non aliquet mauris. Nulla quis posuere lorem. Pellentesque tempus maximus ipsum ac pretium. Nunc hendrerit tempus sem, vitae luctus erat consectetur vestibulum. Nulla sodales felis in dictum sagittis.\n\nNullam porta magna quis magna vulputate elementum. Pellentesque dictum lorem id nisl tincidunt condimentum. Sed est dolor, dapibus sit amet augue at, malesuada cursus quam. Pellentesque elit felis, malesuada dictum congue tristique, iaculis euismod ligula. Donec dignissim dolor eu lacus pulvinar porttitor. Sed quis semper augue, dictum sollicitudin eros. \n\nMauris congue lectus at turpis viverra scelerisque. Praesent at urna rhoncus, condimentum odio ac, sagittis libero. Nulla aliquam ornare bibendum. Duis quis ornare urna. Suspendisse semper tincidunt neque nec consequat. Sed enim diam, mollis eu neque vitae, lacinia varius risus. Fusce nec sem tempor, efficitur lectus sed, porta sem. Pellentesque sollicitudin ut dui vitae malesuada.",
+          "language": "en"
+        },
+        {
+          "key": "dc.title",
+          "value": "Another Test Item",
+          "language": "en"
+        },
+        {
+          "key": "dc.type",
+          "value": "(not specified)",
+          "language": "en"
         }
       ],
-      "bundles": [
-        {
-          "href": "/bundles/2355"
-        },
-        {
-          "href": "/bundles/5687"
-        }
-      ]
-    },
-    "id": "9978",
-    "uuid": "be8325f7-243b-49f4-8a4b-df2b793ff3b5",
-    "type": "item",
-    "name": "Another Test Item",
-    "handle": "123456789/9978",
-    "lastModified": "2016-05-27 03:00:20.063",
-    "isArchived": true,
-    "isWithdrawn": false,
-    "metadata": [
-      {
-        "key": "dc.contributor.author",
-        "value": "John Doe",
-        "language": "en"
-      },
-      {
-        "key": "dc.date.accessioned",
-        "value": "2016-05-27T07:45:04Z",
-        "language": null
-      },
-      {
-        "key": "dc.date.available",
-        "value": "2016-05-27T07:45:04Z",
-        "language": null
-      },
-      {
-        "key": "dc.date.issued",
-        "value": "2016-05-27",
-        "language": "en"
-      },
-      {
-        "key": "dc.identifier.uri",
-        "value": "http://hdl.handle.net/123456789/9978",
-        "language": null
-      },
-      {
-        "key": "dc.description.abstract",
-        "value": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas lacus velit, lacinia eu ultrices nec, auctor in sem. Donec interdum convallis ornare. Aliquam et tortor risus. Praesent ut feugiat eros, eu consequat nibh. Morbi id quam eu mi pellentesque consequat vel vitae sem. Praesent sed velit ullamcorper, efficitur odio non, aliquet urna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Pellentesque eu placerat urna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nulla non aliquet mauris. Nulla quis posuere lorem. Pellentesque tempus maximus ipsum ac pretium. Nunc hendrerit tempus sem, vitae luctus erat consectetur vestibulum. Nulla sodales felis in dictum sagittis.\n\nNullam porta magna quis magna vulputate elementum. Pellentesque dictum lorem id nisl tincidunt condimentum. Sed est dolor, dapibus sit amet augue at, malesuada cursus quam. Pellentesque elit felis, malesuada dictum congue tristique, iaculis euismod ligula. Donec dignissim dolor eu lacus pulvinar porttitor. Sed quis semper augue, dictum sollicitudin eros. \n\nMauris congue lectus at turpis viverra scelerisque. Praesent at urna rhoncus, condimentum odio ac, sagittis libero. Nulla aliquam ornare bibendum. Duis quis ornare urna. Suspendisse semper tincidunt neque nec consequat. Sed enim diam, mollis eu neque vitae, lacinia varius risus. Fusce nec sem tempor, efficitur lectus sed, porta sem. Pellentesque sollicitudin ut dui vitae malesuada.",
-        "language": "en"
-      },
-      {
-        "key": "dc.title",
-        "value": "Another Test Item",
-        "language": "en"
-      },
-      {
-        "key": "dc.type",
-        "value": "(not specified)",
-        "language": "en"
+      "_embedded": {
+        "parents": [
+          {
+            "_links": {
+              "self": { "href": "/collections/5179" },
+              "items": [
+                { "href": "/items/8871" },
+                { "href": "/items/9978" }
+              ],
+              "logo": { "href": "/bitstreams/4688" }
+            },
+            "id": "5179",
+            "uuid": "9e32a2e2-6b91-4236-a361-995ccdc14c60",
+            "type": "collection",
+            "name": "A Test Collection",
+            "handle": "123456789/5179",
+            "metadata": [
+              {
+                "key": "dc.rights",
+                "value": "<p>© 2005-2016 JOHN DOE SOME RIGHTS RESERVED</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description",
+                "value": "<p class='lead'>An introductory text dolor sit amet, consectetur adipiscing elit. Duis laoreet lorem erat, eget auctor est ultrices quis. Nullam ac tincidunt quam. In nec nisl odio. In egestas aliquam tincidunt.</p>\r\n<p>Integer vitae diam id dolor pharetra dignissim in sed enim. Vivamus pulvinar tristique sem a iaculis. Aenean ultricies dui vel facilisis laoreet. Integer porta erat eu ultrices rhoncus. Sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum.</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description.abstract",
+                "value": "A collection for testing purposes",
+                "language": null
+              },
+              {
+                "key": "dc.description.tableofcontents",
+                "value": "<p>Some news sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum. Donec sed ultricies erat, nec sollicitudin mauris. Duis varius nulla quis quam vulputate, at hendrerit turpis rutrum. Integer nec facilisis sapien. Fusce fringilla malesuada lectus id pulvinar. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae</p>",
+                "language": null
+              }
+            ]
+          },
+          {
+            "_links": {
+              "self": { "href": "/collections/6547" },
+              "items": [
+                { "href": "/items/8871" },
+                { "href": "/items/9978" }
+              ]
+            },
+            "id": "6547",
+            "uuid": "598ce822-c357-46f3-ab70-63724d02d6ad",
+            "type": "collection",
+            "name": "Another Test Collection",
+            "handle": "123456789/6547",
+            "metadata": [
+              {
+                "key": "dc.rights",
+                "value": "<p>© 2005-2016 JOHN DOE SOME RIGHTS RESERVED</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description",
+                "value": "<p class='lead'>Another introductory text dolor sit amet, consectetur adipiscing elit. Duis laoreet lorem erat, eget auctor est ultrices quis. Nullam ac tincidunt quam. In nec nisl odio. In egestas aliquam tincidunt.</p>\r\n<p>Integer vitae diam id dolor pharetra dignissim in sed enim. Vivamus pulvinar tristique sem a iaculis. Aenean ultricies dui vel facilisis laoreet. Integer porta erat eu ultrices rhoncus. Sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum.</p>",
+                "language": null
+              },
+              {
+                "key": "dc.description.abstract",
+                "value": "Another collection for testing purposes",
+                "language": null
+              },
+              {
+                "key": "dc.description.tableofcontents",
+                "value": "<p>Some more news sed condimentum malesuada ex sit amet ullamcorper. Morbi a ipsum dolor. Vivamus interdum eget lacus ut fermentum. Donec sed ultricies erat, nec sollicitudin mauris. Duis varius nulla quis quam vulputate, at hendrerit turpis rutrum. Integer nec facilisis sapien. Fusce fringilla malesuada lectus id pulvinar. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae</p>",
+                "language": null
+              }
+            ]
+          }
+        ]
       }
-    ]
-  }
-];
+    }
+  ]
+};
diff --git a/src/backend/metadata.ts b/src/backend/metadata.ts
index 68f2ac9f5e..0524b4769e 100644
--- a/src/backend/metadata.ts
+++ b/src/backend/metadata.ts
@@ -1,182 +1,184 @@
-export const METADATA = [
-  {
-    "type": "metadata",
-    "id": "d58a3098-b390-4cd6-8f52-b088b3daa637",
-    "attributes": {
-      "key": "dc.contributor.author",
-      "value": "Antelman, Kristin",
-      "language": "en"
+export const METADATA = {
+  "metadata": [
+    {
+      "type": "metadata",
+      "id": "d58a3098-b390-4cd6-8f52-b088b3daa637",
+      "attributes": {
+        "key": "dc.contributor.author",
+        "value": "Antelman, Kristin",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "56660730-0e0d-47ec-864a-bda2327d5716",
+      "attributes": {
+        "key": "dc.date.accessioned",
+        "value": "2016-10-14T10:41:13Z",
+        "language": null
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "b9d4ae74-2758-4964-a95e-eecd35b62f26",
+      "attributes": {
+        "key": "dc.date.available",
+        "value": "2016-10-14T10:41:13Z",
+        "language": null
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "311529ea-e339-4d8f-9292-813ebe515f03",
+      "attributes": {
+        "key": "dc.date.issued",
+        "value": "2004-09-01",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "fa875444-3faf-482a-b099-77233bda914d",
+      "attributes": {
+        "key": "dc.identifier.uri",
+        "value": "http://hdl.handle.net/123456789/8871",
+        "language": null
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "ddbb161b-6e52-4a90-9096-c8eae8cec4c9",
+      "attributes": {
+        "key": "dc.description.abstract",
+        "value": "Although many authors believe that their work has a greater research impact if it is freely available, studies to demonstrate that impact are few. This study looks at articles in four disciplines at varying stages of adoption of open access—philosophy, political science, electrical and electronic engineering and mathematics—to see whether they have a greater impact as measured by citations in the ISI Web of Science database when their authors make them freely available on the Internet. The finding is that, across all four disciplines, freely available articles do have a greater research impact. Shedding light on this category of open access reveals that scholars in diverse disciplines are adopting open-access practices and being rewarded for it.",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "ba51287d-a2c9-409b-8129-060b693a7570",
+      "attributes": {
+        "key": "dc.publisher",
+        "value": "College & Research Libraries News",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "e5c1c9d4-b4e2-4bdc-9153-6b769742b33f",
+      "attributes": {
+        "key": "dc.subject",
+        "value": "Publishing",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "4c125844-1eca-47aa-98f8-61c51a9c962f",
+      "attributes": {
+        "key": "dc.subject",
+        "value": "Intellectual Property",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "362c753c-a44d-468d-b256-486470b8c1e1",
+      "attributes": {
+        "key": "dc.subject",
+        "value": "Open Access",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": " 69a02355-37bb-479f-9496-c8743fcacf3c",
+      "attributes": {
+        "key": "dc.title",
+        "value": "Do Open-Access Articles Have a Greater Research Impact?",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "ffbd75d5-bf3a-47ff-af22-490240f6fcc6",
+      "attributes": {
+        "key": "dc.type",
+        "value": "(not specified)",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "981c725e-53f3-4749-89ee-ef042f23c3c3",
+      "attributes": {
+        "key": "dc.contributor.author",
+        "value": "John Doe",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "521df61d-c541-4180-beb8-ac0a1bd1e852",
+      "attributes": {
+        "key": "dc.date.accessioned",
+        "value": "2016-05-27T07:45:04Z",
+        "language": null
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "551a216d-5350-4b15-9398-9bc2e95e7a3d",
+      "attributes": {
+        "key": "dc.date.available",
+        "value": "2016-05-27T07:45:04Z",
+        "language": null
+      }
+    },
+    {
+      "type": "metadata",
+      "id": " eb17dce4-3892-47fe-b014-6ff8e17a93ef",
+      "attributes": {
+        "key": "dc.date.issued",
+        "value": "2016-05-27",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "3e840957-cb1b-4521-8f5d-fb5f6956f303",
+      "attributes": {
+        "key": "dc.identifier.uri",
+        "value": "http://hdl.handle.net/123456789/9978",
+        "language": null
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "ae0bc880-481b-4425-aa5b-354b38d24e4f",
+      "attributes": {
+        "key": "dc.description.abstract",
+        "value": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas lacus velit, lacinia eu ultrices nec, auctor in sem. Donec interdum convallis ornare. Aliquam et tortor risus. Praesent ut feugiat eros, eu consequat nibh. Morbi id quam eu mi pellentesque consequat vel vitae sem. Praesent sed velit ullamcorper, efficitur odio non, aliquet urna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Pellentesque eu placerat urna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nulla non aliquet mauris. Nulla quis posuere lorem. Pellentesque tempus maximus ipsum ac pretium. Nunc hendrerit tempus sem, vitae luctus erat consectetur vestibulum. Nulla sodales felis in dictum sagittis.\n\nNullam porta magna quis magna vulputate elementum. Pellentesque dictum lorem id nisl tincidunt condimentum. Sed est dolor, dapibus sit amet augue at, malesuada cursus quam. Pellentesque elit felis, malesuada dictum congue tristique, iaculis euismod ligula. Donec dignissim dolor eu lacus pulvinar porttitor. Sed quis semper augue, dictum sollicitudin eros. \n\nMauris congue lectus at turpis viverra scelerisque. Praesent at urna rhoncus, condimentum odio ac, sagittis libero. Nulla aliquam ornare bibendum. Duis quis ornare urna. Suspendisse semper tincidunt neque nec consequat. Sed enim diam, mollis eu neque vitae, lacinia varius risus. Fusce nec sem tempor, efficitur lectus sed, porta sem. Pellentesque sollicitudin ut dui vitae malesuada.",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "8dc89ac4-d606-4f1a-8524-8f70a6b371de",
+      "attributes": {
+        "key": "dc.title",
+        "value": "Another Test Item",
+        "language": "en"
+      }
+    },
+    {
+      "type": "metadata",
+      "id": "13185eb9-dc05-4bd7-9c2d-5322a2ac5326",
+      "attributes": {
+        "key": "dc.type",
+        "value": "(not specified)",
+        "language": "en"
+      }
     }
-  },
-  {
-    "type": "metadata",
-    "id": "56660730-0e0d-47ec-864a-bda2327d5716",
-    "attributes": {
-      "key": "dc.date.accessioned",
-      "value": "2016-10-14T10:41:13Z",
-      "language": null
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "b9d4ae74-2758-4964-a95e-eecd35b62f26",
-    "attributes": {
-      "key": "dc.date.available",
-      "value": "2016-10-14T10:41:13Z",
-      "language": null
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "311529ea-e339-4d8f-9292-813ebe515f03",
-    "attributes": {
-      "key": "dc.date.issued",
-      "value": "2004-09-01",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "fa875444-3faf-482a-b099-77233bda914d",
-    "attributes": {
-      "key": "dc.identifier.uri",
-      "value": "http://hdl.handle.net/123456789/8871",
-      "language": null
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "ddbb161b-6e52-4a90-9096-c8eae8cec4c9",
-    "attributes": {
-      "key": "dc.description.abstract",
-      "value": "Although many authors believe that their work has a greater research impact if it is freely available, studies to demonstrate that impact are few. This study looks at articles in four disciplines at varying stages of adoption of open access—philosophy, political science, electrical and electronic engineering and mathematics—to see whether they have a greater impact as measured by citations in the ISI Web of Science database when their authors make them freely available on the Internet. The finding is that, across all four disciplines, freely available articles do have a greater research impact. Shedding light on this category of open access reveals that scholars in diverse disciplines are adopting open-access practices and being rewarded for it.",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "ba51287d-a2c9-409b-8129-060b693a7570",
-    "attributes": {
-      "key": "dc.publisher",
-      "value": "College & Research Libraries News",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "e5c1c9d4-b4e2-4bdc-9153-6b769742b33f",
-    "attributes": {
-      "key": "dc.subject",
-      "value": "Publishing",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "4c125844-1eca-47aa-98f8-61c51a9c962f",
-    "attributes": {
-      "key": "dc.subject",
-      "value": "Intellectual Property",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "362c753c-a44d-468d-b256-486470b8c1e1",
-    "attributes": {
-      "key": "dc.subject",
-      "value": "Open Access",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": " 69a02355-37bb-479f-9496-c8743fcacf3c",
-    "attributes": {
-      "key": "dc.title",
-      "value": "Do Open-Access Articles Have a Greater Research Impact?",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "ffbd75d5-bf3a-47ff-af22-490240f6fcc6",
-    "attributes": {
-      "key": "dc.type",
-      "value": "(not specified)",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "981c725e-53f3-4749-89ee-ef042f23c3c3",
-    "attributes": {
-      "key": "dc.contributor.author",
-      "value": "John Doe",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "521df61d-c541-4180-beb8-ac0a1bd1e852",
-    "attributes": {
-      "key": "dc.date.accessioned",
-      "value": "2016-05-27T07:45:04Z",
-      "language": null
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "551a216d-5350-4b15-9398-9bc2e95e7a3d",
-    "attributes": {
-      "key": "dc.date.available",
-      "value": "2016-05-27T07:45:04Z",
-      "language": null
-    }
-  },
-  {
-    "type": "metadata",
-    "id": " eb17dce4-3892-47fe-b014-6ff8e17a93ef",
-    "attributes": {
-      "key": "dc.date.issued",
-      "value": "2016-05-27",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "3e840957-cb1b-4521-8f5d-fb5f6956f303",
-    "attributes": {
-      "key": "dc.identifier.uri",
-      "value": "http://hdl.handle.net/123456789/9978",
-      "language": null
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "ae0bc880-481b-4425-aa5b-354b38d24e4f",
-    "attributes": {
-      "key": "dc.description.abstract",
-      "value": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas lacus velit, lacinia eu ultrices nec, auctor in sem. Donec interdum convallis ornare. Aliquam et tortor risus. Praesent ut feugiat eros, eu consequat nibh. Morbi id quam eu mi pellentesque consequat vel vitae sem. Praesent sed velit ullamcorper, efficitur odio non, aliquet urna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Pellentesque eu placerat urna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nulla non aliquet mauris. Nulla quis posuere lorem. Pellentesque tempus maximus ipsum ac pretium. Nunc hendrerit tempus sem, vitae luctus erat consectetur vestibulum. Nulla sodales felis in dictum sagittis.\n\nNullam porta magna quis magna vulputate elementum. Pellentesque dictum lorem id nisl tincidunt condimentum. Sed est dolor, dapibus sit amet augue at, malesuada cursus quam. Pellentesque elit felis, malesuada dictum congue tristique, iaculis euismod ligula. Donec dignissim dolor eu lacus pulvinar porttitor. Sed quis semper augue, dictum sollicitudin eros. \n\nMauris congue lectus at turpis viverra scelerisque. Praesent at urna rhoncus, condimentum odio ac, sagittis libero. Nulla aliquam ornare bibendum. Duis quis ornare urna. Suspendisse semper tincidunt neque nec consequat. Sed enim diam, mollis eu neque vitae, lacinia varius risus. Fusce nec sem tempor, efficitur lectus sed, porta sem. Pellentesque sollicitudin ut dui vitae malesuada.",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "8dc89ac4-d606-4f1a-8524-8f70a6b371de",
-    "attributes": {
-      "key": "dc.title",
-      "value": "Another Test Item",
-      "language": "en"
-    }
-  },
-  {
-    "type": "metadata",
-    "id": "13185eb9-dc05-4bd7-9c2d-5322a2ac5326",
-    "attributes": {
-      "key": "dc.type",
-      "value": "(not specified)",
-      "language": "en"
-    }
-  }
-];
+  ]
+};