diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
index ace748c7de..3e6190ae6d 100644
--- a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
+++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
@@ -18,42 +18,38 @@ describe('SubCommunityList Component', () => {
 
   const subcommunities = [Object.assign(new Community(), {
     id: '123456789-1',
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'SubCommunity 1'
-      }]
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 1' }
+      ]
+    }
   }),
     Object.assign(new Community(), {
       id: '123456789-2',
-      metadata: [
-        {
-          key: 'dc.title',
-          language: 'en_US',
-          value: 'SubCommunity 2'
-        }]
+      metadata: {
+        'dc.title': [
+          { language: 'en_US', value: 'SubCommunity 2' }
+        ]
+      }
     })
   ];
 
   const emptySubCommunitiesCommunity = Object.assign(new Community(), {
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'Test title'
-      }],
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Test title' }
+      ]
+    },
     subcommunities: observableOf(new RemoteData(true, true, true,
       undefined, new PaginatedList(new PageInfo(), [])))
   });
 
   const mockCommunity = Object.assign(new Community(), {
-      metadata: [
-        {
-          key: 'dc.title',
-          language: 'en_US',
-          value: 'Test title'
-        }],
+      metadata: {
+        'dc.title': [
+          { language: 'en_US', value: 'Test title' }
+        ]
+      },
       subcommunities: observableOf(new RemoteData(true, true, true,
         undefined, new PaginatedList(new PageInfo(), subcommunities)))
     })
diff --git a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts b/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
index 942357dc5a..07ad9a347c 100644
--- a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
@@ -11,10 +11,14 @@ const mockItem = Object.assign(new Item(), {
   id: 'fake-id',
   handle: 'fake/handle',
   lastModified: '2018',
-  metadata: [
-    {key: 'dc.title', value: 'Mock item title', language: 'en'},
-    {key: 'dc.contributor.author', value: 'Mayer, Ed', language: ''}
-  ]
+  metadata: {
+    'dc.title': [
+      { value: 'Mock item title', language: 'en' }
+    ],
+    'dc.contributor.author': [
+      { value: 'Mayer, Ed', language: '' }
+    ]
+  }
 });
 
 describe('ModifyItemOverviewComponent', () => {
@@ -37,19 +41,19 @@ describe('ModifyItemOverviewComponent', () => {
     const metadataRows = fixture.debugElement.queryAll(By.css('tr.metadata-row'));
     expect(metadataRows.length).toEqual(2);
 
-    const titleRow = metadataRows[0].queryAll(By.css('td'));
-    expect(titleRow.length).toEqual(3);
-
-    expect(titleRow[0].nativeElement.innerHTML).toContain('dc.title');
-    expect(titleRow[1].nativeElement.innerHTML).toContain('Mock item title');
-    expect(titleRow[2].nativeElement.innerHTML).toContain('en');
-
-    const authorRow = metadataRows[1].queryAll(By.css('td'));
+    const authorRow = metadataRows[0].queryAll(By.css('td'));
     expect(authorRow.length).toEqual(3);
 
     expect(authorRow[0].nativeElement.innerHTML).toContain('dc.contributor.author');
     expect(authorRow[1].nativeElement.innerHTML).toContain('Mayer, Ed');
     expect(authorRow[2].nativeElement.innerHTML).toEqual('');
 
+    const titleRow = metadataRows[1].queryAll(By.css('td'));
+    expect(titleRow.length).toEqual(3);
+
+    expect(titleRow[0].nativeElement.innerHTML).toContain('dc.title');
+    expect(titleRow[1].nativeElement.innerHTML).toContain('Mock item title');
+    expect(titleRow[2].nativeElement.innerHTML).toContain('en');
+
   });
 });
diff --git a/src/app/+item-page/field-components/collections/collections.component.spec.ts b/src/app/+item-page/field-components/collections/collections.component.spec.ts
index 865ce78a39..53fcded9e3 100644
--- a/src/app/+item-page/field-components/collections/collections.component.spec.ts
+++ b/src/app/+item-page/field-components/collections/collections.component.spec.ts
@@ -14,12 +14,14 @@ let collectionsComponent: CollectionsComponent;
 let fixture: ComponentFixture<CollectionsComponent>;
 
 const mockCollection1: Collection = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    }]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const succeededMockItem: Item = Object.assign(new Item(), {owningCollection: observableOf(new RemoteData(false, false, true, null, mockCollection1))});
diff --git a/src/app/+search-page/search-results/search-results.component.spec.ts b/src/app/+search-page/search-results/search-results.component.spec.ts
index b7ac11553a..8d0566d1df 100644
--- a/src/app/+search-page/search-results/search-results.component.spec.ts
+++ b/src/app/+search-page/search-results/search-results.component.spec.ts
@@ -111,33 +111,38 @@ export const objects = [
     id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
     uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
     type: ResourceType.Community,
-    metadata: [
-      {
-        key: 'dc.description',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.description.abstract',
-        language: null,
-        value: 'This is a test community to hold content for the OR2017 demostration'
-      },
-      {
-        key: 'dc.description.tableofcontents',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.rights',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.title',
-        language: null,
-        value: 'OR2017 - Demonstration'
-      }
-    ]
+    metadata: {
+      'dc.description': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.description.abstract': [
+        {
+          language: null,
+          value: 'This is a test community to hold content for the OR2017 demostration'
+        }
+      ],
+      'dc.description.tableofcontents': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.rights': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.title': [
+        {
+          language: null,
+          value: 'OR2017 - Demonstration'
+        }
+      ]
+    }
   }),
   Object.assign(new Community(),
     {
@@ -160,33 +165,38 @@ export const objects = [
       id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
       uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
       type: ResourceType.Community,
-      metadata: [
-        {
-          key: 'dc.description',
-          language: null,
-          value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
-        },
-        {
-          key: 'dc.description.abstract',
-          language: null,
-          value: 'This is a sample top-level community'
-        },
-        {
-          key: 'dc.description.tableofcontents',
-          language: null,
-          value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
-        },
-        {
-          key: 'dc.rights',
-          language: null,
-          value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
-        },
-        {
-          key: 'dc.title',
-          language: null,
-          value: 'Sample Community'
-        }
-      ]
+      metadata: {
+        'dc.description': [
+          {
+            language: null,
+            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
+          }
+        ],
+        'dc.description.abstract': [
+          {
+            language: null,
+            value: 'This is a sample top-level community'
+          }
+        ],
+        'dc.description.tableofcontents': [
+          {
+            language: null,
+            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
+          }
+        ],
+        'dc.rights': [
+          {
+            language: null,
+            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
+          }
+        ],
+        'dc.title': [
+          {
+            language: null,
+            value: 'Sample Community'
+          }
+        ]
+      }
     }
   )
 ];
diff --git a/src/app/core/auth/auth-response-parsing.service.spec.ts b/src/app/core/auth/auth-response-parsing.service.spec.ts
index a4131db489..ee9f2e571b 100644
--- a/src/app/core/auth/auth-response-parsing.service.spec.ts
+++ b/src/app/core/auth/auth-response-parsing.service.spec.ts
@@ -60,23 +60,26 @@ describe('AuthResponseParsingService', () => {
             handle: null,
             id: '4dc70ab5-cd73-492f-b007-3179d2d9296b',
             lastActive: '2018-05-14T17:03:31.277+0000',
-            metadata: [
-              {
-                key: 'eperson.firstname',
-                language: null,
-                value: 'User'
-              },
-              {
-                key: 'eperson.lastname',
-                language: null,
-                value: 'Test'
-              },
-              {
-                key: 'eperson.language',
-                language: null,
-                value: 'en'
-              }
-            ],
+            metadata: {
+              'eperson.firstname': [
+                {
+                  language: null,
+                  value: 'User'
+                }
+              ],
+              'eperson.lastname': [
+                {
+                  language: null,
+                  value: 'Test'
+                }
+              ],
+              'eperson.language': [
+                {
+                  language: null,
+                  value: 'en'
+                }
+              ]
+            },
             name: 'User Test',
             netid: 'myself@testshib.org',
             requireCertificate: false,
diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index da75e1a877..1ce0f6b156 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -219,44 +219,44 @@ describe('BrowseService', () => {
             }}));
       });
 
-      it('should return the URL for the given metadatumKey and linkPath', () => {
-        const metadatumKey = 'dc.date.issued';
+      it('should return the URL for the given metadataKey and linkPath', () => {
+        const metadataKey = 'dc.date.issued';
         const linkPath = 'items';
         const expectedURL = browseDefinitions[0]._links[linkPath];
 
-        const result = service.getBrowseURLFor(metadatumKey, linkPath);
+        const result = service.getBrowseURLFor(metadataKey, linkPath);
         const expected = cold('c-d-', { c: undefined, d: expectedURL });
 
         expect(result).toBeObservable(expected);
       });
 
-      it('should work when the definition uses a wildcard in the metadatumKey', () => {
-        const metadatumKey = 'dc.contributor.author';  // should match dc.contributor.* in the definition
+      it('should work when the definition uses a wildcard in the metadataKey', () => {
+        const metadataKey = 'dc.contributor.author';  // should match dc.contributor.* in the definition
         const linkPath = 'items';
         const expectedURL = browseDefinitions[1]._links[linkPath];
 
-        const result = service.getBrowseURLFor(metadatumKey, linkPath);
+        const result = service.getBrowseURLFor(metadataKey, linkPath);
         const expected = cold('c-d-', { c: undefined, d: expectedURL });
 
         expect(result).toBeObservable(expected);
       });
 
       it('should throw an error when the key doesn\'t match', () => {
-        const metadatumKey = 'dc.title'; // isn't in the definitions
+        const metadataKey = 'dc.title'; // isn't in the definitions
         const linkPath = 'items';
 
-        const result = service.getBrowseURLFor(metadatumKey, linkPath);
-        const expected = cold('c-#-', { c: undefined }, new Error(`A browse endpoint for ${linkPath} on ${metadatumKey} isn't configured`));
+        const result = service.getBrowseURLFor(metadataKey, linkPath);
+        const expected = cold('c-#-', { c: undefined }, new Error(`A browse endpoint for ${linkPath} on ${metadataKey} isn't configured`));
 
         expect(result).toBeObservable(expected);
       });
 
       it('should throw an error when the link doesn\'t match', () => {
-        const metadatumKey = 'dc.date.issued';
+        const metadataKey = 'dc.date.issued';
         const linkPath = 'collections'; // isn't in the definitions
 
-        const result = service.getBrowseURLFor(metadatumKey, linkPath);
-        const expected = cold('c-#-', { c: undefined }, new Error(`A browse endpoint for ${linkPath} on ${metadatumKey} isn't configured`));
+        const result = service.getBrowseURLFor(metadataKey, linkPath);
+        const expected = cold('c-#-', { c: undefined }, new Error(`A browse endpoint for ${linkPath} on ${metadataKey} isn't configured`));
 
         expect(result).toBeObservable(expected);
       });
@@ -271,10 +271,10 @@ describe('BrowseService', () => {
         spyOn(service, 'getBrowseDefinitions').and
           .returnValue(hot('----'));
 
-        const metadatumKey = 'dc.date.issued';
+        const metadataKey = 'dc.date.issued';
         const linkPath = 'items';
 
-        const result = service.getBrowseURLFor(metadatumKey, linkPath);
+        const result = service.getBrowseURLFor(metadataKey, linkPath);
         const expected = cold('b---', { b: undefined });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/core/cache/builders/remote-data-build.service.spec.ts b/src/app/core/cache/builders/remote-data-build.service.spec.ts
index e4444ca803..272969050d 100644
--- a/src/app/core/cache/builders/remote-data-build.service.spec.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.spec.ts
@@ -8,20 +8,24 @@ import { of as observableOf } from 'rxjs';
 const pageInfo = new PageInfo();
 const array = [
   Object.assign(new Item(), {
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'Item nr 1'
-      }]
+    metadata: {
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Item nr 1'
+        }
+      ]
+    }
   }),
   Object.assign(new Item(), {
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'Item nr 2'
-      }]
+    metadata: {
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Item nr 2'
+        }
+      ]
+    }
   })
 ];
 const paginatedList = new PaginatedList(pageInfo, array);
diff --git a/src/app/core/data/browse-items-response-parsing-service.spec.ts b/src/app/core/data/browse-items-response-parsing-service.spec.ts
index 99ea474dc6..f512a9af26 100644
--- a/src/app/core/data/browse-items-response-parsing-service.spec.ts
+++ b/src/app/core/data/browse-items-response-parsing-service.spec.ts
@@ -24,13 +24,14 @@ describe('BrowseItemsResponseParsingService', () => {
               uuid: 'd7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7',
               name: 'Development of Local Supply Chain : A Critical Link for Concentrated Solar Power in India',
               handle: '10986/17472',
-              metadata: [
-                {
-                  key: 'dc.creator',
-                  value: 'World Bank',
-                  language: null
-                }
-              ],
+              metadata: {
+                'dc.creator': [
+                  {
+                    value: 'World Bank',
+                    language: null
+                  }
+                ]
+              },
               inArchive: true,
               discoverable: true,
               withdrawn: false,
@@ -56,13 +57,14 @@ describe('BrowseItemsResponseParsingService', () => {
               uuid: '27c6f976-257c-4ad0-a0ef-c5e34ffe4d5b',
               name: 'Development of Local Supply Chain : The Missing Link for Concentrated Solar Power Projects in India',
               handle: '10986/17475',
-              metadata: [
-                {
-                  key: 'dc.creator',
-                  value: 'World Bank',
-                  language: null
-                }
-              ],
+              metadata: {
+                'dc.creator': [
+                  {
+                    value: 'World Bank',
+                    language: null
+                  }
+                ]
+              },
               inArchive: true,
               discoverable: true,
               withdrawn: false,
@@ -115,13 +117,14 @@ describe('BrowseItemsResponseParsingService', () => {
         uuid: 'd7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7',
         name: 'Development of Local Supply Chain : A Critical Link for Concentrated Solar Power in India',
         handle: '10986/17472',
-        metadata: [
-          {
-            key: 'dc.creator',
-            value: 'World Bank',
-            language: null
-          }
-        ],
+        metadata: {
+          'dc.creator': [
+            {
+              value: 'World Bank',
+              language: null
+            }
+          ]
+        },
         inArchive: true,
         discoverable: true,
         withdrawn: false,
diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 90c811db7a..f2dd0770ed 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -37,6 +37,7 @@ import { HttpClient } from '@angular/common/http';
 import { EmptyError } from 'rxjs/internal-compatibility';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { MetadataValue } from '../shared/metadata.interfaces';
 
 /* tslint:disable:max-classes-per-file */
 @Component({
@@ -152,7 +153,7 @@ describe('MetadataService', () => {
     expect(title.getTitle()).toEqual('Test PowerPoint Document');
     expect(tagStore.get('citation_title')[0].content).toEqual('Test PowerPoint Document');
     expect(tagStore.get('citation_author')[0].content).toEqual('Doe, Jane');
-    expect(tagStore.get('citation_date')[0].content).toEqual('1650-06-26T19:58:25Z');
+    expect(tagStore.get('citation_date')[0].content).toEqual('1650-06-26');
     expect(tagStore.get('citation_issn')[0].content).toEqual('123456789');
     expect(tagStore.get('citation_language')[0].content).toEqual('en');
     expect(tagStore.get('citation_keywords')[0].content).toEqual('keyword1; keyword2; keyword3');
@@ -216,22 +217,18 @@ describe('MetadataService', () => {
 
   const mockType = (mockItem: Item, type: string): Item => {
     const typedMockItem = Object.assign(new Item(), mockItem) as Item;
-    for (const metadatum of typedMockItem.metadata) {
-      if (metadatum.key === 'dc.type') {
-        metadatum.value = type;
-        break;
-      }
-    }
+    typedMockItem.metadata['dc.type'] = [ { value: type } ] as MetadataValue[];
     return typedMockItem;
   }
 
   const mockPublisher = (mockItem: Item): Item => {
     const publishedMockItem = Object.assign(new Item(), mockItem) as Item;
-    publishedMockItem.metadata.push({
-      key: 'dc.publisher',
-      language: 'en_US',
-      value: 'Mock Publisher'
-    });
+    publishedMockItem.metadata['dc.publisher'] = [
+      {
+        language: 'en_US',
+        value: 'Mock Publisher'
+      }
+    ] as MetadataValue[];
     return publishedMockItem;
   }
 
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
index a6f5e0d45a..cc1e2063ff 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
@@ -11,7 +11,6 @@ import { ResourceType } from '../../../core/shared/resource-type';
 import { ComColFormComponent } from './comcol-form.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { hasValue } from '../../empty.util';
-import { Metadatum } from '../../../core/shared/metadatum.model';
 
 describe('ComColFormComponent', () => {
   let comp: ComColFormComponent<DSpaceObject>;
@@ -29,23 +28,24 @@ describe('ComColFormComponent', () => {
       return undefined;
     }
   };
-  const titleMD = { key: 'dc.title', value: 'Community Title' } as Metadatum;
-  const randomMD = { key: 'dc.random', value: 'Random metadata excluded from form' } as Metadatum;
-  const abstractMD = {
-    key: 'dc.description.abstract',
-    value: 'Community description'
-  } as Metadatum;
-  const newTitleMD = { key: 'dc.title', value: 'New Community Title' } as Metadatum;
+  const dcTitle = 'dc.title';
+  const dcRandom = 'dc.random';
+  const dcAbstract = 'dc.description.abstract';
+
+  const titleMD = { [dcTitle]: [ { value: 'Community Title', language: null } ] };
+  const randomMD = { [dcRandom]: [ { value: 'Random metadata excluded from form', language: null } ] };
+  const abstractMD = { [dcAbstract]: [ { value: 'Community description', language: null } ] };
+  const newTitleMD = { [dcTitle]: [ { value: 'New Community Title', language: null } ] };
   const formModel = [
     new DynamicInputModel({
       id: 'title',
-      name: newTitleMD.key,
-      value: 'New Community Title'
+      name: dcTitle,
+      value: newTitleMD[dcTitle][0].value
     }),
     new DynamicInputModel({
       id: 'abstract',
-      name: abstractMD.key,
-      value: abstractMD.value
+      name: dcAbstract,
+      value: abstractMD[dcAbstract][0].value
     })
   ];
 
@@ -87,10 +87,10 @@ describe('ComColFormComponent', () => {
       comp.dso = Object.assign(
         new Community(),
         {
-          metadata: [
-            titleMD,
-            randomMD
-          ]
+          metadata: {
+            ...titleMD,
+            ...randomMD
+          }
         }
       );
 
@@ -101,11 +101,11 @@ describe('ComColFormComponent', () => {
           {},
           new Community(),
           {
-            metadata: [
-              randomMD,
-              newTitleMD,
-              abstractMD
-            ],
+            metadata: {
+              ...newTitleMD,
+              ...randomMD,
+              ...abstractMD
+            },
             type: ResourceType.Community
           },
         )
diff --git a/src/app/shared/mocks/mock-item.ts b/src/app/shared/mocks/mock-item.ts
index 2e5c764ee2..98881436b9 100644
--- a/src/app/shared/mocks/mock-item.ts
+++ b/src/app/shared/mocks/mock-item.ts
@@ -51,13 +51,14 @@ export const MockItem: Item = Object.assign(new Item(), {
           id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
           uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
           type: 'bitstream',
-          metadata: [
-            {
-              key: 'dc.title',
-              language: null,
-              value: 'test_word.docx'
-            }
-          ]
+          metadata: {
+            'dc.title': [
+              {
+                language: null,
+                value: 'test_word.docx'
+              }
+            ]
+          }
         },
         {
           sizeBytes: 31302,
@@ -85,13 +86,14 @@ export const MockItem: Item = Object.assign(new Item(), {
           id: '99b00f3c-1cc6-4689-8158-91965bee6b28',
           uuid: '99b00f3c-1cc6-4689-8158-91965bee6b28',
           type: 'bitstream',
-          metadata: [
-            {
-              key: 'dc.title',
-              language: null,
-              value: 'test_pdf.pdf'
-            }
-          ]
+          metadata: {
+            'dc.title': [
+              {
+                language: null,
+                value: 'test_pdf.pdf'
+              }
+            ]
+          }
         }
       ]
     }
@@ -100,98 +102,106 @@ export const MockItem: Item = Object.assign(new Item(), {
   id: '0ec7ff22-f211-40ab-a69e-c819b0b1f357',
   uuid: '0ec7ff22-f211-40ab-a69e-c819b0b1f357',
   type: 'item',
-  metadata: [
-    {
-      key: 'dc.creator',
-      language: 'en_US',
-      value: 'Doe, Jane'
-    },
-    {
-      key: 'dc.date.accessioned',
-      language: null,
-      value: '1650-06-26T19:58:25Z'
-    },
-    {
-      key: 'dc.date.available',
-      language: null,
-      value: '1650-06-26T19:58:25Z'
-    },
-    {
-      key: 'dc.date.issued',
-      language: null,
-      value: '1650-06-26'
-    },
-    {
-      key: 'dc.identifier.issn',
-      language: 'en_US',
-      value: '123456789'
-    },
-    {
-      key: 'dc.identifier.uri',
-      language: null,
-      value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
-    },
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!'
-    },
-    {
-      key: 'dc.description.provenance',
-      language: 'en',
-      value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)'
-    },
-    {
-      key: 'dc.description.provenance',
-      language: 'en',
-      value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).'
-    },
-    {
-      key: 'dc.description.provenance',
-      language: 'en',
-      value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).'
-    },
-    {
-      key: 'dc.description.provenance',
-      language: 'en',
-      value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).'
-    },
-    {
-      key: 'dc.language',
-      language: 'en_US',
-      value: 'en'
-    },
-    {
-      key: 'dc.rights',
-      language: 'en_US',
-      value: '© Jane Doe'
-    },
-    {
-      key: 'dc.subject',
-      language: 'en_US',
-      value: 'keyword1'
-    },
-    {
-      key: 'dc.subject',
-      language: 'en_US',
-      value: 'keyword2'
-    },
-    {
-      key: 'dc.subject',
-      language: 'en_US',
-      value: 'keyword3'
-    },
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test PowerPoint Document'
-    },
-    {
-      key: 'dc.type',
-      language: 'en_US',
-      value: 'text'
-    }
-  ],
+  metadata: {
+    'dc.creator': [
+      {
+        language: 'en_US',
+        value: 'Doe, Jane'
+      }
+    ],
+    'dc.date.accessioned': [
+      {
+        language: null,
+        value: '1650-06-26T19:58:25Z'
+      }
+    ],
+    'dc.date.available': [
+      {
+        language: null,
+        value: '1650-06-26T19:58:25Z'
+      }
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '1650-06-26'
+      }
+    ],
+    'dc.identifier.issn': [
+      {
+        language: 'en_US',
+        value: '123456789'
+      }
+    ],
+    'dc.identifier.uri': [
+      {
+        language: null,
+        value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+      }
+    ],
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!'
+      }
+    ],
+    'dc.description.provenance': [
+      {
+        language: 'en',
+        value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)'
+      },
+      {
+        language: 'en',
+        value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).'
+      },
+      {
+        language: 'en',
+        value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).'
+      },
+      {
+        language: 'en',
+        value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).'
+      }
+    ],
+    'dc.language': [
+      {
+        language: 'en_US',
+        value: 'en'
+      }
+    ],
+    'dc.rights': [
+      {
+        language: 'en_US',
+        value: '© Jane Doe'
+      }
+    ],
+    'dc.subject': [
+      {
+        language: 'en_US',
+        value: 'keyword1'
+      },
+      {
+        language: 'en_US',
+        value: 'keyword2'
+      },
+      {
+        language: 'en_US',
+        value: 'keyword3'
+      }
+    ],
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test PowerPoint Document'
+      }
+    ],
+    'dc.type': [
+      {
+        language: 'en_US',
+        value: 'text'
+      }
+    ]
+  },
   owningCollection: observableOf({
       self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
       requestPending: false,
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
index cc72ff3043..66807c6b20 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
@@ -8,21 +8,25 @@ let collectionGridElementComponent: CollectionGridElementComponent;
 let fixture: ComponentFixture<CollectionGridElementComponent>;
 
 const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    }]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CollectionGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
index dabb137ea7..bb6c81144a 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
@@ -8,21 +8,25 @@ let communityGridElementComponent: CommunityGridElementComponent;
 let fixture: ComponentFixture<CommunityGridElementComponent>;
 
 const mockCommunityWithAbstract: Community = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    }]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CommunityGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
index f2aa594296..7b286cc415 100644
--- a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
@@ -11,31 +11,37 @@ let fixture: ComponentFixture<ItemGridElementComponent>;
 
 const mockItemWithAuthorAndDate: Item = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.contributor.author',
-      language: 'en_US',
-      value: 'Smith, Donald'
-    },
-    {
-      key: 'dc.date.issued',
-      language: null,
-      value: '2015-06-26'
-    }]
+  metadata: {
+    'dc.contributor.author': [
+      {
+        language: 'en_US',
+        value: 'Smith, Donald'
+      }
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '2015-06-26'
+      }
+    ]
+  }
 });
 const mockItemWithoutAuthorAndDate: Item = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'This is just another title'
-    },
-    {
-      key: 'dc.type',
-      language: null,
-      value: 'Article'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'This is just another title'
+      }
+    ],
+    'dc.type': [
+      {
+        language: null,
+        value: 'Article'
+      }
+    ]
+  }
 });
 
 describe('ItemGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
index 8e6ff0696f..e8f8b1330e 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
@@ -16,25 +16,29 @@ const truncatableServiceStub: any = {
 };
 
 const mockCollectionWithAbstract: CollectionSearchResult = new CollectionSearchResult();
-mockCollectionWithAbstract.hitHighlights = [];
+mockCollectionWithAbstract.hitHighlights = {};
 mockCollectionWithAbstract.dspaceObject = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    } ]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCollectionWithoutAbstract: CollectionSearchResult = new CollectionSearchResult();
-mockCollectionWithoutAbstract.hitHighlights = [];
+mockCollectionWithoutAbstract.hitHighlights = {};
 mockCollectionWithoutAbstract.dspaceObject = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    } ]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CollectionSearchResultGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
index df8fdf026d..e111e624c5 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
@@ -16,25 +16,29 @@ const truncatableServiceStub: any = {
 };
 
 const mockCommunityWithAbstract: CommunitySearchResult = new CommunitySearchResult();
-mockCommunityWithAbstract.hitHighlights = [];
+mockCommunityWithAbstract.hitHighlights = {};
 mockCommunityWithAbstract.dspaceObject = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    } ]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCommunityWithoutAbstract: CommunitySearchResult = new CommunitySearchResult();
-mockCommunityWithoutAbstract.hitHighlights = [];
+mockCommunityWithoutAbstract.hitHighlights = {};
 mockCommunityWithoutAbstract.dspaceObject = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    } ]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CommunitySearchResultGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
index ecc218f11d..0103fa5c49 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
@@ -17,37 +17,43 @@ const truncatableServiceStub: any = {
 };
 
 const mockItemWithAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithAuthorAndDate.hitHighlights = [];
+mockItemWithAuthorAndDate.hitHighlights = {};
 mockItemWithAuthorAndDate.dspaceObject = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.contributor.author',
-      language: 'en_US',
-      value: 'Smith, Donald'
-    },
-    {
-      key: 'dc.date.issued',
-      language: null,
-      value: '2015-06-26'
-    }]
+  metadata: {
+    'dc.contributor.author': [
+      {
+        language: 'en_US',
+        value: 'Smith, Donald'
+      }
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '2015-06-26'
+      }
+    ]
+  }
 });
 
 const mockItemWithoutAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithoutAuthorAndDate.hitHighlights = [];
+mockItemWithoutAuthorAndDate.hitHighlights = {};
 mockItemWithoutAuthorAndDate.dspaceObject = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'This is just another title'
-    },
-    {
-      key: 'dc.type',
-      language: null,
-      value: 'Article'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'This is just another title'
+      }
+    ],
+    'dc.type': [
+      {
+        language: null,
+        value: 'Article'
+      }
+    ]
+  }
 });
 
 describe('ItemSearchResultGridElementComponent', () => {
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
index de53f2e095..54b58e131a 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
@@ -2,7 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { TruncatePipe } from '../../utils/truncate.pipe';
-import { Metadatum } from '../../../core/shared/metadatum.model';
 import { BrowseEntryListElementComponent } from './browse-entry-list-element.component';
 import { BrowseEntry } from '../../../core/shared/browse-entry.model';
 
@@ -33,7 +32,7 @@ describe('MetadataListElementComponent', () => {
     browseEntryListElementComponent = fixture.componentInstance;
   }));
 
-  describe('When the metadatum is loaded', () => {
+  describe('When the metadata is loaded', () => {
     beforeEach(() => {
       browseEntryListElementComponent.object = mockValue;
       fixture.detectChanges();
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
index a31af1e50c..bde6b4b97a 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
@@ -8,21 +8,25 @@ let collectionListElementComponent: CollectionListElementComponent;
 let fixture: ComponentFixture<CollectionListElementComponent>;
 
 const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    }]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CollectionListElementComponent', () => {
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
index 08147d8573..46ba27eb00 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
@@ -8,21 +8,25 @@ let communityListElementComponent: CommunityListElementComponent;
 let fixture: ComponentFixture<CommunityListElementComponent>;
 
 const mockCommunityWithAbstract: Community = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    }]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CommunityListElementComponent', () => {
diff --git a/src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts b/src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
index 64108fd5b0..392d81bee4 100644
--- a/src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
+++ b/src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
@@ -11,31 +11,37 @@ let fixture: ComponentFixture<ItemListElementComponent>;
 
 const mockItemWithAuthorAndDate: Item = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.contributor.author',
-      language: 'en_US',
-      value: 'Smith, Donald'
-    },
-    {
-      key: 'dc.date.issued',
-      language: null,
-      value: '2015-06-26'
-    }]
+  metadata: {
+    'dc.contributor.author': [
+      {
+        language: 'en_US',
+        value: 'Smith, Donald'
+      }
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '2015-06-26'
+      }
+    ]
+  }
 });
 const mockItemWithoutAuthorAndDate: Item = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'This is just another title'
-    },
-    {
-      key: 'dc.type',
-      language: null,
-      value: 'Article'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'This is just another title'
+      }
+    ],
+    'dc.type': [
+      {
+        language: null,
+        value: 'Article'
+      }
+    ]
+  }
 });
 
 describe('ItemListElementComponent', () => {
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
index 2ffaf38b53..e897071a00 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
@@ -16,25 +16,29 @@ const truncatableServiceStub: any = {
 };
 
 const mockCollectionWithAbstract: CollectionSearchResult = new CollectionSearchResult();
-mockCollectionWithAbstract.hitHighlights = [];
+mockCollectionWithAbstract.hitHighlights = {};
 mockCollectionWithAbstract.dspaceObject = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    } ]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCollectionWithoutAbstract: CollectionSearchResult = new CollectionSearchResult();
-mockCollectionWithoutAbstract.hitHighlights = [];
+mockCollectionWithoutAbstract.hitHighlights = {};
 mockCollectionWithoutAbstract.dspaceObject = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    } ]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CollectionSearchResultListElementComponent', () => {
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
index 70877d0744..75d5966767 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
@@ -16,25 +16,29 @@ const truncatableServiceStub: any = {
 };
 
 const mockCommunityWithAbstract: CommunitySearchResult = new CommunitySearchResult();
-mockCommunityWithAbstract.hitHighlights = [];
+mockCommunityWithAbstract.hitHighlights = {};
 mockCommunityWithAbstract.dspaceObject = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    } ]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCommunityWithoutAbstract: CommunitySearchResult = new CommunitySearchResult();
-mockCommunityWithoutAbstract.hitHighlights = [];
+mockCommunityWithoutAbstract.hitHighlights = {};
 mockCommunityWithoutAbstract.dspaceObject = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    } ]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CommunitySearchResultListElementComponent', () => {
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
index bdc8ebcecf..8567fc1782 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
@@ -17,37 +17,43 @@ const truncatableServiceStub: any = {
 };
 
 const mockItemWithAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithAuthorAndDate.hitHighlights = [];
+mockItemWithAuthorAndDate.hitHighlights = {};
 mockItemWithAuthorAndDate.dspaceObject = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.contributor.author',
-      language: 'en_US',
-      value: 'Smith, Donald'
-    },
-    {
-      key: 'dc.date.issued',
-      language: null,
-      value: '2015-06-26'
-    }]
+  metadata: {
+    'dc.contributor.author': [
+      {
+        language: 'en_US',
+        value: 'Smith, Donald'
+      }
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '2015-06-26'
+      }
+    ]
+  }
 });
 
 const mockItemWithoutAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithoutAuthorAndDate.hitHighlights = [];
+mockItemWithoutAuthorAndDate.hitHighlights = {};
 mockItemWithoutAuthorAndDate.dspaceObject = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'This is just another title'
-    },
-    {
-      key: 'dc.type',
-      language: null,
-      value: 'Article'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'This is just another title'
+      }
+    ],
+    'dc.type': [
+      {
+        language: null,
+        value: 'Article'
+      }
+    ]
+  }
 });
 
 describe('ItemSearchResultListElementComponent', () => {
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 004d0c5b21..b164abee1f 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -30,6 +30,7 @@ describe('SearchFormComponent', () => {
   });
 
   it('should display scopes when available with default and all scopes', () => {
+
     comp.scopes = objects;
     fixture.detectChanges();
     const select: HTMLElement = de.query(By.css('select')).nativeElement;
@@ -121,33 +122,38 @@ export const objects: DSpaceObject[] = [
     id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
     uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
     type: ResourceType.Community,
-    metadata: [
-      {
-        key: 'dc.description',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.description.abstract',
-        language: null,
-        value: 'This is a test community to hold content for the OR2017 demostration'
-      },
-      {
-        key: 'dc.description.tableofcontents',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.rights',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.title',
-        language: null,
-        value: 'OR2017 - Demonstration'
-      }
-    ]
+    metadata: {
+      'dc.description': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.description.abstract': [
+        {
+          language: null,
+          value: 'This is a test community to hold content for the OR2017 demostration'
+        }
+      ],
+      'dc.description.tableofcontents': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.rights': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.title': [
+        {
+          language: null,
+          value: 'OR2017 - Demonstration'
+        }
+      ]
+    }
   }),
   Object.assign(new Community(),
     {
@@ -170,33 +176,38 @@ export const objects: DSpaceObject[] = [
       id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
       uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
       type: ResourceType.Community,
-      metadata: [
-        {
-          key: 'dc.description',
-          language: null,
-          value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
-        },
-        {
-          key: 'dc.description.abstract',
-          language: null,
-          value: 'This is a sample top-level community'
-        },
-        {
-          key: 'dc.description.tableofcontents',
-          language: null,
-          value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
-        },
-        {
-          key: 'dc.rights',
-          language: null,
-          value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
-        },
-        {
-          key: 'dc.title',
-          language: null,
-          value: 'Sample Community'
-        }
-      ]
+      metadata: {
+        'dc.description': [
+          {
+            language: null,
+            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
+          }
+        ],
+        'dc.description.abstract': [
+          {
+            language: null,
+            value: 'This is a sample top-level community'
+          }
+        ],
+        'dc.description.tableofcontents': [
+          {
+            language: null,
+            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
+          }
+        ],
+        'dc.rights': [
+          {
+            language: null,
+            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
+          }
+        ],
+        'dc.title': [
+          {
+            language: null,
+            value: 'Sample Community'
+          }
+        ]
+      }
     }
   )
 ];